October 2012 - slf4j-dev - mailman3.qos.ch

[qos-ch/slf4j] 42b0e1: news update
by Ceki Gulcu 11 Oct '12

11 Oct '12

Branch: refs/heads/master Home: https://github.com/qos-ch/slf4j Commit: 42b0e19c309cfd0fcf2e695495134e71a289913c https://github.com/qos-ch/slf4j/commit/42b0e19c309cfd0fcf2e695495134e71a289… Author: Ceki Gulcu <ceki(a)qos.ch> Date: 2012-10-11 (Thu, 11 Oct 2012) Changed paths: M slf4j-site/src/site/pages/news.html Log Message: ----------- news update Commit: c06e41788dcd9ce06602d2709ce34261adff4ce9 https://github.com/qos-ch/slf4j/commit/c06e41788dcd9ce06602d2709ce34261adff… Author: Ceki Gulcu <ceki(a)qos.ch> Date: 2012-10-11 (Thu, 11 Oct 2012) Changed paths: M integration/pom.xml M jcl-over-slf4j/pom.xml M jul-to-slf4j/pom.xml M log4j-over-slf4j/pom.xml M osgi-over-slf4j/pom.xml M pom.xml M slf4j-api/pom.xml M slf4j-ext/pom.xml M slf4j-jcl/pom.xml M slf4j-jdk14/pom.xml M slf4j-log4j12/pom.xml M slf4j-migrator/pom.xml M slf4j-nop/pom.xml M slf4j-simple/pom.xml M slf4j-site/pom.xml M slf4j-site/src/site/pages/news.html Log Message: ----------- about to relese 1.7.2 Compare: https://github.com/qos-ch/slf4j/compare/e74da9a73fc9...c06e41788dcd

1 0

[GIT] SLF4J: Simple Logging Facade for Java branch master updated. v_1.7.1-15-ge74da9a
by git-noreply＠pixie.qos.ch 11 Oct '12

11 Oct '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "SLF4J: Simple Logging Facade for Java". The branch, master has been updated via e74da9a73fc96401f39e00604fb4ad83ac31ffaf (commit) from 73af0c60de69cf37fabaded3a635e1751250c4e8 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=slf4j.git;a=commit;h=e74da9a73fc96401f39e00604f… http://github.com/ceki/slf4j/commit/e74da9a73fc96401f39e00604fb4ad83ac31ffaf commit e74da9a73fc96401f39e00604fb4ad83ac31ffaf Author: Ceki Gulcu <ceki(a)qos.ch> Date: Thu Oct 11 18:13:16 2012 +0200 added warnLevelString property diff --git a/log4j-over-slf4j/src/main/java/org/apache/log4j/Appender.java b/log4j-over-slf4j/src/main/java/org/apache/log4j/Appender.java index 5b0c571..7623309 100644 --- a/log4j-over-slf4j/src/main/java/org/apache/log4j/Appender.java +++ b/log4j-over-slf4j/src/main/java/org/apache/log4j/Appender.java @@ -29,106 +29,106 @@ import org.apache.log4j.spi.LoggingEvent; */ public interface Appender { - /** - * Add a filter to the end of the filter list. - * - * @since 0.9.0 - */ - void addFilter(Filter newFilter); + /** + * Add a filter to the end of the filter list. + * + * @since 0.9.0 + */ + void addFilter(Filter newFilter); - /** - * Returns the head Filter. The Filters are organized in a linked list - * and so all Filters on this Appender are available through the result. - * - * @return the head Filter or null, if no Filters are present - * @since 1.1 - */ - public Filter getFilter(); + /** + * Returns the head Filter. The Filters are organized in a linked list + * and so all Filters on this Appender are available through the result. + * + * @return the head Filter or null, if no Filters are present + * @since 1.1 + */ + public Filter getFilter(); - /** - * Clear the list of filters by removing all the filters in it. - * - * @since 0.9.0 - */ - public void clearFilters(); + /** + * Clear the list of filters by removing all the filters in it. + * + * @since 0.9.0 + */ + public void clearFilters(); - /** - * Release any resources allocated within the appender such as file - * handles, network connections, etc. - * - * It is a programming error to append to a closed appender. - * - * @since 0.8.4 - */ - public void close(); + /** + * Release any resources allocated within the appender such as file + * handles, network connections, etc. + * + * It is a programming error to append to a closed appender. + * + * @since 0.8.4 + */ + public void close(); - /** - * Log in <code>Appender</code> specific way. When appropriate, - * Loggers will call the <code>doAppend</code> method of appender - * implementations in order to log. - */ - public void doAppend(LoggingEvent event); + /** + * Log in <code>Appender</code> specific way. When appropriate, + * Loggers will call the <code>doAppend</code> method of appender + * implementations in order to log. + */ + public void doAppend(LoggingEvent event); - /** - * Get the name of this appender. The name uniquely identifies the - * appender. - */ - public String getName(); + /** + * Get the name of this appender. The name uniquely identifies the + * appender. + */ + public String getName(); - /** - * Set the {@link ErrorHandler} for this appender. - * - * @since 0.9.0 - */ - public void setErrorHandler(ErrorHandler errorHandler); + /** + * Set the {@link ErrorHandler} for this appender. + * + * @since 0.9.0 + */ + public void setErrorHandler(ErrorHandler errorHandler); - /** - * Returns the {@link ErrorHandler} for this appender. - * - * @since 1.1 - */ - public ErrorHandler getErrorHandler(); + /** + * Returns the {@link ErrorHandler} for this appender. + * + * @since 1.1 + */ + public ErrorHandler getErrorHandler(); - /** - * Set the {@link Layout} for this appender. - * - * @since 0.8.1 - */ - public void setLayout(Layout layout); + /** + * Set the {@link Layout} for this appender. + * + * @since 0.8.1 + */ + public void setLayout(Layout layout); - /** - * Returns this appenders layout. - * - * @since 1.1 - */ - public Layout getLayout(); + /** + * Returns this appenders layout. + * + * @since 1.1 + */ + public Layout getLayout(); - /** - * Set the name of this appender. The name is used by other - * components to identify this appender. - * - * @since 0.8.1 - */ - public void setName(String name); + /** + * Set the name of this appender. The name is used by other + * components to identify this appender. + * + * @since 0.8.1 + */ + public void setName(String name); - /** - * Configurators call this method to determine if the appender - * requires a layout. If this method returns <code>true</code>, - * meaning that layout is required, then the configurator will - * configure an layout using the configuration information at its - * disposal. If this method returns <code>false</code>, meaning that - * a layout is not required, then layout configuration will be - * skipped even if there is available layout configuration - * information at the disposal of the configurator.. - * - * In the rather exceptional case, where the appender - * implementation admits a layout but can also work without it, then - * the appender should return <code>true</code>. - * - * @since 0.8.4 - */ - public boolean requiresLayout(); + /** + * Configurators call this method to determine if the appender + * requires a layout. If this method returns <code>true</code>, + * meaning that layout is required, then the configurator will + * configure an layout using the configuration information at its + * disposal. If this method returns <code>false</code>, meaning that + * a layout is not required, then layout configuration will be + * skipped even if there is available layout configuration + * information at the disposal of the configurator.. + * + * In the rather exceptional case, where the appender + * implementation admits a layout but can also work without it, then + * the appender should return <code>true</code>. + * + * @since 0.8.4 + */ + public boolean requiresLayout(); } diff --git a/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java b/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java index 6f4493b..6a70ec5 100644 --- a/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java +++ b/slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java @@ -79,6 +79,10 @@ import org.slf4j.spi.LocationAwareLogger; * * <li><code>org.slf4j.simpleLogger.levelInBrackets</code> - Should the level string be output in brackets? Defaults * to <code>false</code>.</li> + * + * <li><code>org.slf4j.simpleLogger.warnLevelString</code> - The string value output for the warn level. Defaults + * to <code>WARN</code>.</li> + * </ul> * * In addition to looking for system properties with the names specified above, this implementation also checks for @@ -137,6 +141,7 @@ public class SimpleLogger extends MarkerIgnoringBase { private static String LOG_FILE = "System.err"; private static PrintStream TARGET_STREAM = null; private static boolean LEVEL_IN_BRACKETS = false; + private static String WARN_LEVEL_STRING = "WARN"; /** All system properties used by <code>SimpleLogger</code> start with this prefix */ @@ -150,6 +155,8 @@ public class SimpleLogger extends MarkerIgnoringBase { public static final String SHOW_SHORT_LOG_NAME_KEY = SYSTEM_PREFIX + "showShortLogName"; public static final String LOG_FILE_KEY = SYSTEM_PREFIX + "logFile"; public static final String LEVEL_IN_BRACKETS_KEY = SYSTEM_PREFIX + "levelInBrackets"; + public static final String WARN_LEVEL_STRING_KEY = SYSTEM_PREFIX + "warnLevelString"; + public static final String LOG_KEY_PREFIX = SYSTEM_PREFIX + "log."; @@ -192,6 +199,7 @@ public class SimpleLogger extends MarkerIgnoringBase { SHOW_THREAD_NAME = getBooleanProperty(SHOW_THREAD_NAME_KEY, SHOW_THREAD_NAME); DATE_TIME_FORMAT_STR = getStringProperty(DATE_TIME_FORMAT_KEY, DATE_TIME_FORMAT_STR); LEVEL_IN_BRACKETS = getBooleanProperty(LEVEL_IN_BRACKETS_KEY, LEVEL_IN_BRACKETS); + WARN_LEVEL_STRING = getStringProperty(WARN_LEVEL_STRING_KEY, WARN_LEVEL_STRING); LOG_FILE = getStringProperty(LOG_FILE_KEY, LOG_FILE); TARGET_STREAM = computeTargetStream(LOG_FILE); @@ -345,7 +353,7 @@ public class SimpleLogger extends MarkerIgnoringBase { buf.append("INFO"); break; case LOG_LEVEL_WARN: - buf.append("WARN"); + buf.append(WARN_LEVEL_STRING); break; case LOG_LEVEL_ERROR: buf.append("ERROR"); ----------------------------------------------------------------------- Summary of changes: .../src/main/java/org/apache/log4j/Appender.java | 176 ++++++++++---------- .../src/main/java/org/slf4j/impl/SimpleLogger.java | 10 +- 2 files changed, 97 insertions(+), 89 deletions(-) hooks/post-receive -- SLF4J: Simple Logging Facade for Java

1 0

[qos-ch/slf4j] e74da9: added warnLevelString property
by Ceki Gulcu 11 Oct '12

11 Oct '12

Branch: refs/heads/master Home: https://github.com/qos-ch/slf4j Commit: e74da9a73fc96401f39e00604fb4ad83ac31ffaf https://github.com/qos-ch/slf4j/commit/e74da9a73fc96401f39e00604fb4ad83ac31… Author: Ceki Gulcu <ceki(a)qos.ch> Date: 2012-10-11 (Thu, 11 Oct 2012) Changed paths: M log4j-over-slf4j/src/main/java/org/apache/log4j/Appender.java M slf4j-simple/src/main/java/org/slf4j/impl/SimpleLogger.java Log Message: ----------- added warnLevelString property

1 0

[GIT] SLF4J: Simple Logging Facade for Java branch master updated. v_1.7.1-14-g73af0c6
by git-noreply＠pixie.qos.ch 04 Oct '12

04 Oct '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "SLF4J: Simple Logging Facade for Java". The branch, master has been updated via 73af0c60de69cf37fabaded3a635e1751250c4e8 (commit) via 6e7442f58fdd2165b676154b324b9e8d90aaee35 (commit) via b1a5d650f4f78a0a2181c7883456fcf8054b623e (commit) from 461e0efd24a6875eee7950ad60c9117514fbba29 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=slf4j.git;a=commit;h=73af0c60de69cf37fabaded3a6… http://github.com/ceki/slf4j/commit/73af0c60de69cf37fabaded3a635e1751250c4e8 commit 73af0c60de69cf37fabaded3a635e1751250c4e8 Author: Christian Trutz <christian.trutz(a)belaso.de> Date: Thu Oct 4 14:58:32 2012 +0200 Convert line delimiters to unix style (\n) and recover the ability to show useful diffs with older commits. Signed-off-by: Christian Trutz <christian.trutz(a)belaso.de> diff --git a/log4j-over-slf4j/src/main/java/org/apache/log4j/Log4jLoggerFactory.java b/log4j-over-slf4j/src/main/java/org/apache/log4j/Log4jLoggerFactory.java index 5ce8a99..a0e38c5 100644 --- a/log4j-over-slf4j/src/main/java/org/apache/log4j/Log4jLoggerFactory.java +++ b/log4j-over-slf4j/src/main/java/org/apache/log4j/Log4jLoggerFactory.java @@ -1,78 +1,78 @@ -/* - * Copyright 2001-2004 The Apache Software Foundation. - * - * 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.apache.log4j; - -import java.util.Hashtable; - -import org.apache.log4j.spi.LoggerFactory; -import org.slf4j.helpers.Util; - -/** - * This class is a factory that creates and maintains org.apache.log4j.Loggers - * wrapping org.slf4j.Loggers. - * - * It keeps a hashtable of all created org.apache.log4j.Logger instances so that - * all newly created instances are not dulpicates of existing loggers. - * - * @author Sébastien Pennec - */ -class Log4jLoggerFactory { - - // String, Logger - private static Hashtable log4jLoggers = new Hashtable(); - - private static final String LOG4J_DELEGATION_LOOP_URL = "http://www.slf4j.org/codes.html#log4jDelegationLoop"; - - // check for delegation loops - static { - try { - Class.forName("org.slf4j.impl.Log4jLoggerFactory"); - String part1 = "Detected both log4j-over-slf4j.jar AND slf4j-log4j12.jar on the class path, preempting StackOverflowError. "; - String part2 = "See also " + LOG4J_DELEGATION_LOOP_URL - + " for more details."; - - Util.report(part1); - Util.report(part2); - throw new IllegalStateException(part1 + part2); - } catch (ClassNotFoundException e) { - // this is the good case - } - } - - public static synchronized Logger getLogger(String name) { - if (log4jLoggers.containsKey(name)) { - return (org.apache.log4j.Logger) log4jLoggers.get(name); - } else { - Logger log4jLogger = new Logger(name); - - log4jLoggers.put(name, log4jLogger); - return log4jLogger; - } - } - - public static synchronized Logger getLogger(String name, LoggerFactory loggerFactory) { - if (log4jLoggers.containsKey(name)) { - return (org.apache.log4j.Logger) log4jLoggers.get(name); - } else { - Logger log4jLogger = loggerFactory.makeNewLoggerInstance(name); - - log4jLoggers.put(name, log4jLogger); - return log4jLogger; - } - } - -} +/* + * Copyright 2001-2004 The Apache Software Foundation. + * + * 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.apache.log4j; + +import java.util.Hashtable; + +import org.apache.log4j.spi.LoggerFactory; +import org.slf4j.helpers.Util; + +/** + * This class is a factory that creates and maintains org.apache.log4j.Loggers + * wrapping org.slf4j.Loggers. + * + * It keeps a hashtable of all created org.apache.log4j.Logger instances so that + * all newly created instances are not dulpicates of existing loggers. + * + * @author Sébastien Pennec + */ +class Log4jLoggerFactory { + + // String, Logger + private static Hashtable log4jLoggers = new Hashtable(); + + private static final String LOG4J_DELEGATION_LOOP_URL = "http://www.slf4j.org/codes.html#log4jDelegationLoop"; + + // check for delegation loops + static { + try { + Class.forName("org.slf4j.impl.Log4jLoggerFactory"); + String part1 = "Detected both log4j-over-slf4j.jar AND slf4j-log4j12.jar on the class path, preempting StackOverflowError. "; + String part2 = "See also " + LOG4J_DELEGATION_LOOP_URL + + " for more details."; + + Util.report(part1); + Util.report(part2); + throw new IllegalStateException(part1 + part2); + } catch (ClassNotFoundException e) { + // this is the good case + } + } + + public static synchronized Logger getLogger(String name) { + if (log4jLoggers.containsKey(name)) { + return (org.apache.log4j.Logger) log4jLoggers.get(name); + } else { + Logger log4jLogger = new Logger(name); + + log4jLoggers.put(name, log4jLogger); + return log4jLogger; + } + } + + public static synchronized Logger getLogger(String name, LoggerFactory loggerFactory) { + if (log4jLoggers.containsKey(name)) { + return (org.apache.log4j.Logger) log4jLoggers.get(name); + } else { + Logger log4jLogger = loggerFactory.makeNewLoggerInstance(name); + + log4jLoggers.put(name, log4jLogger); + return log4jLogger; + } + } + +} diff --git a/log4j-over-slf4j/src/main/java/org/apache/log4j/Logger.java b/log4j-over-slf4j/src/main/java/org/apache/log4j/Logger.java index cf9f605..6be9d24 100644 --- a/log4j-over-slf4j/src/main/java/org/apache/log4j/Logger.java +++ b/log4j-over-slf4j/src/main/java/org/apache/log4j/Logger.java @@ -1,84 +1,84 @@ -/* - * Copyright 2001-2004 The Apache Software Foundation. - * - * 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.apache.log4j; - -import org.apache.log4j.spi.LoggerFactory; -import org.slf4j.spi.LocationAwareLogger; - -/** - * - * This class is a minimal implementation of the original - * <code>org.apache.log4j.Logger</code> class (as found in log4j 1.2) - * delegating all calls to a {@link org.slf4j.Logger} instance. - * - * - * @author Ceki Gülcü - * */ -public class Logger extends Category { - - private static final String LOGGER_FQCN = Logger.class.getName(); - - protected Logger(String name) { - super(name); - } - - public static Logger getLogger(String name) { - return Log4jLoggerFactory.getLogger(name); - } - - public static Logger getLogger(String name, LoggerFactory loggerFactory) { - return Log4jLoggerFactory.getLogger(name,loggerFactory); - } - - public static Logger getLogger(Class clazz) { - return getLogger(clazz.getName()); - } - - /** - * Does the obvious. - * - * @return - */ - public static Logger getRootLogger() { - return Log4jLoggerFactory.getLogger(org.slf4j.Logger.ROOT_LOGGER_NAME); - } - - - /** - * Delegates to {@link org.slf4j.Logger#isTraceEnabled} - * method of SLF4J. - */ - public boolean isTraceEnabled() { - return slf4jLogger.isTraceEnabled(); - } - - /** - * Delegates to {@link org.slf4j.Logger#trace(String)} method in SLF4J. - */ - public void trace(Object message) { - differentiatedLog(null, LOGGER_FQCN, LocationAwareLogger.TRACE_INT, message, null); - } - - /** - * Delegates to {@link org.slf4j.Logger#trace(String,Throwable)} - * method in SLF4J. - */ - public void trace(Object message, Throwable t) { - differentiatedLog(null, LOGGER_FQCN, LocationAwareLogger.TRACE_INT, message, null); - } - -} +/* + * Copyright 2001-2004 The Apache Software Foundation. + * + * 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.apache.log4j; + +import org.apache.log4j.spi.LoggerFactory; +import org.slf4j.spi.LocationAwareLogger; + +/** + * + * This class is a minimal implementation of the original + * <code>org.apache.log4j.Logger</code> class (as found in log4j 1.2) + * delegating all calls to a {@link org.slf4j.Logger} instance. + * + * + * @author Ceki Gülcü + * */ +public class Logger extends Category { + + private static final String LOGGER_FQCN = Logger.class.getName(); + + protected Logger(String name) { + super(name); + } + + public static Logger getLogger(String name) { + return Log4jLoggerFactory.getLogger(name); + } + + public static Logger getLogger(String name, LoggerFactory loggerFactory) { + return Log4jLoggerFactory.getLogger(name,loggerFactory); + } + + public static Logger getLogger(Class clazz) { + return getLogger(clazz.getName()); + } + + /** + * Does the obvious. + * + * @return + */ + public static Logger getRootLogger() { + return Log4jLoggerFactory.getLogger(org.slf4j.Logger.ROOT_LOGGER_NAME); + } + + + /** + * Delegates to {@link org.slf4j.Logger#isTraceEnabled} + * method of SLF4J. + */ + public boolean isTraceEnabled() { + return slf4jLogger.isTraceEnabled(); + } + + /** + * Delegates to {@link org.slf4j.Logger#trace(String)} method in SLF4J. + */ + public void trace(Object message) { + differentiatedLog(null, LOGGER_FQCN, LocationAwareLogger.TRACE_INT, message, null); + } + + /** + * Delegates to {@link org.slf4j.Logger#trace(String,Throwable)} + * method in SLF4J. + */ + public void trace(Object message, Throwable t) { + differentiatedLog(null, LOGGER_FQCN, LocationAwareLogger.TRACE_INT, message, null); + } + +} http://git.qos.ch/gitweb/?p=slf4j.git;a=commit;h=6e7442f58fdd2165b676154b32… http://github.com/ceki/slf4j/commit/6e7442f58fdd2165b676154b324b9e8d90aaee35 commit 6e7442f58fdd2165b676154b324b9e8d90aaee35 Merge: 461e0ef b1a5d65 Author: Matt Bishop <matt(a)thebishops.org> Date: Sun Sep 30 07:37:40 2012 -0700 Merge pull request #26 from mattbishop/master Fix for Bugzilla #274 http://git.qos.ch/gitweb/?p=slf4j.git;a=commit;h=b1a5d650f4f78a0a2181c78834… http://github.com/ceki/slf4j/commit/b1a5d650f4f78a0a2181c7883456fcf8054b623e commit b1a5d650f4f78a0a2181c7883456fcf8054b623e Author: mbishop <matthew.bishop(a)elasticpath.com> Date: Fri Sep 28 11:20:04 2012 -0700 Bugzilla #274. diff --git a/osgi-over-slf4j/src/main/java/org/slf4j/osgi/logservice/impl/Activator.java b/osgi-over-slf4j/src/main/java/org/slf4j/osgi/logservice/impl/Activator.java index c824f80..06d19f9 100644 --- a/osgi-over-slf4j/src/main/java/org/slf4j/osgi/logservice/impl/Activator.java +++ b/osgi-over-slf4j/src/main/java/org/slf4j/osgi/logservice/impl/Activator.java @@ -42,7 +42,10 @@ import org.osgi.service.log.LogService; /** * <code>Activator</code> implements a simple bundle that registers a * {@link LogServiceFactory} for the creation of {@link LogService} implementations. -**/ + * + * @author John Conlon + * @author Matt Bishop + **/ public class Activator implements BundleActivator { /** * @@ -53,8 +56,9 @@ public class Activator implements BundleActivator { * @throws Exception */ public void start(BundleContext bundleContext) throws Exception { + Properties props = new Properties(); - props.put("description", "An slf4j implementation."); + props.put("description", "An SLF4J LogService implementation."); ServiceFactory factory = new LogServiceFactory(); bundleContext.registerService(LogService.class.getName(), factory, props); } @@ -69,6 +73,6 @@ public class Activator implements BundleActivator { public void stop(BundleContext bundleContext) throws Exception { // Note: It is not required that we remove the service here, since - // the framework will do it automatically anyway. + // the framework will do it automatically. } } diff --git a/osgi-over-slf4j/src/main/java/org/slf4j/osgi/logservice/impl/LogServiceFactory.java b/osgi-over-slf4j/src/main/java/org/slf4j/osgi/logservice/impl/LogServiceFactory.java index 66b1051..3de2e1c 100644 --- a/osgi-over-slf4j/src/main/java/org/slf4j/osgi/logservice/impl/LogServiceFactory.java +++ b/osgi-over-slf4j/src/main/java/org/slf4j/osgi/logservice/impl/LogServiceFactory.java @@ -42,13 +42,11 @@ import org.osgi.framework.ServiceRegistration; * @author John Conlon * @version $Rev$, $Date$ */ -public class LogServiceFactory implements ServiceFactory -{ +public class LogServiceFactory implements ServiceFactory { /* (non-Javadoc) * @see org.osgi.framework.ServiceFactory#getService(org.osgi.framework.Bundle, org.osgi.framework.ServiceRegistration) */ - public Object getService( Bundle bundle, ServiceRegistration arg1 ) - { + public Object getService(Bundle bundle, ServiceRegistration arg1) { return new LogServiceImpl(bundle); } @@ -56,8 +54,7 @@ public class LogServiceFactory implements ServiceFactory /* (non-Javadoc) * @see org.osgi.framework.ServiceFactory#ungetService(org.osgi.framework.Bundle, org.osgi.framework.ServiceRegistration, java.lang.Object) */ - public void ungetService( Bundle bundle, ServiceRegistration arg1, Object arg2 ) - { + public void ungetService(Bundle bundle, ServiceRegistration arg1, Object arg2) { //nothing to do. } } diff --git a/osgi-over-slf4j/src/main/java/org/slf4j/osgi/logservice/impl/LogServiceImpl.java b/osgi-over-slf4j/src/main/java/org/slf4j/osgi/logservice/impl/LogServiceImpl.java index 4765575..30d5257 100644 --- a/osgi-over-slf4j/src/main/java/org/slf4j/osgi/logservice/impl/LogServiceImpl.java +++ b/osgi-over-slf4j/src/main/java/org/slf4j/osgi/logservice/impl/LogServiceImpl.java @@ -33,8 +33,8 @@ package org.slf4j.osgi.logservice.impl; import org.osgi.framework.Bundle; -import org.osgi.framework.Constants; import org.osgi.framework.ServiceReference; +import org.osgi.framework.Version; import org.osgi.service.log.LogService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -44,6 +44,7 @@ import org.slf4j.LoggerFactory; * Logger. * * @author John Conlon + * @author Matt Bishop */ public class LogServiceImpl implements LogService { @@ -51,15 +52,19 @@ public class LogServiceImpl implements LogService { private final Logger delegate; + /** * Creates a new instance of LogServiceImpl. * + * @param bundle The bundle to create a new LogService for. */ public LogServiceImpl(Bundle bundle) { - String name = (String) bundle.getHeaders().get( - Constants.BUNDLE_SYMBOLICNAME); - String version = (String) bundle.getHeaders().get( - Constants.BUNDLE_VERSION); + + String name = bundle.getSymbolicName(); + Version version = bundle.getVersion(); + if (version == null) { + version = Version.emptyVersion; + } delegate = LoggerFactory.getLogger(name + '.' + version); } @@ -69,6 +74,7 @@ public class LogServiceImpl implements LogService { * @see org.osgi.service.log.LogService#log(int, java.lang.String) */ public void log(int level, String message) { + switch (level) { case LOG_DEBUG: delegate.debug(message); @@ -94,6 +100,7 @@ public class LogServiceImpl implements LogService { * java.lang.Throwable) */ public void log(int level, String message, Throwable exception) { + switch (level) { case LOG_DEBUG: delegate.debug(message, exception); @@ -154,6 +161,7 @@ public class LogServiceImpl implements LogService { * @return The formatted log message. */ private String createMessage(ServiceReference sr, String message) { + StringBuilder output = new StringBuilder(); if (sr != null) { output.append('[').append(sr.toString()).append(']'); @@ -171,8 +179,7 @@ public class LogServiceImpl implements LogService { * @see org.osgi.service.log.LogService#log(org.osgi.framework.ServiceReference, * int, java.lang.String, java.lang.Throwable) */ - public void log(ServiceReference sr, int level, String message, - Throwable exception) { + public void log(ServiceReference sr, int level, String message, Throwable exception) { switch (level) { case LOG_DEBUG: ----------------------------------------------------------------------- Summary of changes: .../java/org/apache/log4j/Log4jLoggerFactory.java | 156 +++++++++--------- .../src/main/java/org/apache/log4j/Logger.java | 168 ++++++++++---------- .../org/slf4j/osgi/logservice/impl/Activator.java | 10 +- .../osgi/logservice/impl/LogServiceFactory.java | 9 +- .../slf4j/osgi/logservice/impl/LogServiceImpl.java | 21 ++- 5 files changed, 186 insertions(+), 178 deletions(-) hooks/post-receive -- SLF4J: Simple Logging Facade for Java

1 0

[qos-ch/slf4j] 73af0c: Convert line delimiters to unix style (\n) and rec...
by Christian Trutz 04 Oct '12

04 Oct '12

Branch: refs/heads/master Home: https://github.com/qos-ch/slf4j Commit: 73af0c60de69cf37fabaded3a635e1751250c4e8 https://github.com/qos-ch/slf4j/commit/73af0c60de69cf37fabaded3a635e1751250… Author: Christian Trutz <christian.trutz(a)belaso.de> Date: 2012-10-04 (Thu, 04 Oct 2012) Changed paths: M log4j-over-slf4j/src/main/java/org/apache/log4j/Log4jLoggerFactory.java M log4j-over-slf4j/src/main/java/org/apache/log4j/Logger.java Log Message: ----------- Convert line delimiters to unix style (\n) and recover the ability to show useful diffs with older commits. Signed-off-by: Christian Trutz <christian.trutz(a)belaso.de>

1 0