- slf4j-dev - mailman3.qos.ch

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

27 Sep '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 461e0efd24a6875eee7950ad60c9117514fbba29 (commit) via 0047754f0bc10ceebde3b8e50e23a0dc40e93c44 (commit) via 442e90ba5785cba96a620d0b4fa1f1a6ae267051 (commit) from f9eb71c563caa3b4e26fbe4a3a2ea40ef024e4fb (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=461e0efd24a6875eee7950ad60… http://github.com/ceki/slf4j/commit/461e0efd24a6875eee7950ad60c9117514fbba29 commit 461e0efd24a6875eee7950ad60c9117514fbba29 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Thu Sep 27 13:12:05 2012 +0200 forcedLog method should be in the Category class as in the original log4j software diff --git a/log4j-over-slf4j/src/main/java/org/apache/log4j/Category.java b/log4j-over-slf4j/src/main/java/org/apache/log4j/Category.java index 2fd6ccf..2282339 100644 --- a/log4j-over-slf4j/src/main/java/org/apache/log4j/Category.java +++ b/log4j-over-slf4j/src/main/java/org/apache/log4j/Category.java @@ -290,6 +290,10 @@ public class Category { LocationAwareLogger.ERROR_INT, message, t); } + protected void forcedLog(String FQCN, Priority p, Object msg, Throwable t) { + log(FQCN, p, msg, t); + } + // See also http://bugzilla.slf4j.org/show_bug.cgi?id=168 public void log(String FQCN, Priority p, Object msg, Throwable t) { int levelInt = priorityToLevelInt(p); 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 a9e264a..cf9f605 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 @@ -48,10 +48,6 @@ public class Logger extends Category { return getLogger(clazz.getName()); } - protected void forcedLog(String FQCN, Priority p, Object msg, Throwable t) { - log(FQCN, p, msg, t); - } - /** * Does the obvious. * http://git.qos.ch/gitweb/?p=slf4j.git;a=commit;h=0047754f0bc10ceebde3b8e50e… http://github.com/ceki/slf4j/commit/0047754f0bc10ceebde3b8e50e23a0dc40e93c44 commit 0047754f0bc10ceebde3b8e50e23a0dc40e93c44 Merge: 442e90b f9eb71c Author: Christian Trutz <christian.trutz(a)belaso.de> Date: Thu Sep 27 12:19:09 2012 +0200 Merge branch 'master' of https://github.com/qos-ch/slf4j http://git.qos.ch/gitweb/?p=slf4j.git;a=commit;h=442e90ba5785cba96a620d0b4f… http://github.com/ceki/slf4j/commit/442e90ba5785cba96a620d0b4fa1f1a6ae267051 commit 442e90ba5785cba96a620d0b4fa1f1a6ae267051 Author: Christian Trutz <christian.trutz(a)belaso.de> Date: Thu Sep 27 12:17:34 2012 +0200 log4j-over-slf4j works now also with IBM DB2 Content Manager 8. Signed-off-by: Christian Trutz <christian.trutz(a)belaso.de> diff --git a/log4j-over-slf4j/src/main/java/org/apache/log4j/Layout.java b/log4j-over-slf4j/src/main/java/org/apache/log4j/Layout.java new file mode 100644 index 0000000..4ea3d99 --- /dev/null +++ b/log4j-over-slf4j/src/main/java/org/apache/log4j/Layout.java @@ -0,0 +1,27 @@ +/* + * 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. + */ + +// Contributors: Christian Trutz <christian.trutz(a)belaso.de> +package org.apache.log4j; + +/** + * This class is a minimal implementation of the original Log4J class. + * + * @author Christian Trutz <christian.trutz(a)belaso.de> + * */ +public class Layout { + +} 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 aff7c04..5ce8a99 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,66 +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.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; - } - } - -} +/* + * 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 98c1d64..a9e264a 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,79 +1,88 @@ -/* - * 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.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(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()); + } + + protected void forcedLog(String FQCN, Priority p, Object msg, Throwable t) { + log(FQCN, p, msg, t); + } + + /** + * 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); + } + +} diff --git a/log4j-over-slf4j/src/main/java/org/apache/log4j/PatternLayout.java b/log4j-over-slf4j/src/main/java/org/apache/log4j/PatternLayout.java new file mode 100644 index 0000000..3f65f44 --- /dev/null +++ b/log4j-over-slf4j/src/main/java/org/apache/log4j/PatternLayout.java @@ -0,0 +1,27 @@ +/* + * 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. + */ + +// Contributors: Christian Trutz <christian.trutz(a)belaso.de> +package org.apache.log4j; + +/** + * This class is a minimal implementation of the original Log4J class. + * + * @author Christian Trutz <christian.trutz(a)belaso.de> + * */ +public class PatternLayout extends Layout { + +} ----------------------------------------------------------------------- Summary of changes: .../src/main/java/org/apache/log4j/Category.java | 4 + .../java/org/apache/log4j/{spi => }/Layout.java | 9 +- .../java/org/apache/log4j/Log4jLoggerFactory.java | 144 ++++++++++-------- .../src/main/java/org/apache/log4j/Logger.java | 163 ++++++++++---------- .../{BasicConfigurator.java => PatternLayout.java} | 16 +-- 5 files changed, 180 insertions(+), 156 deletions(-) copy log4j-over-slf4j/src/main/java/org/apache/log4j/{spi => }/Layout.java (73%) copy log4j-over-slf4j/src/main/java/org/apache/log4j/{BasicConfigurator.java => PatternLayout.java} (73%) hooks/post-receive -- SLF4J: Simple Logging Facade for Java

1 0

[qos-ch/slf4j] 461e0e: forcedLog method should be in the Category class a...
by Ceki Gulcu 27 Sep '12

27 Sep '12

Branch: refs/heads/master Home: https://github.com/qos-ch/slf4j Commit: 461e0efd24a6875eee7950ad60c9117514fbba29 https://github.com/qos-ch/slf4j/commit/461e0efd24a6875eee7950ad60c9117514fb… Author: Ceki Gulcu <ceki(a)qos.ch> Date: 2012-09-27 (Thu, 27 Sep 2012) Changed paths: M log4j-over-slf4j/src/main/java/org/apache/log4j/Category.java M log4j-over-slf4j/src/main/java/org/apache/log4j/Logger.java Log Message: ----------- forcedLog method should be in the Category class as in the original log4j software

1 0

[Bug 273] New: Missing method org.apache.log4j.Logger#getLogger(String, LoggerFactory)
by bugzilla-daemon＠qos.ch 27 Sep '12

27 Sep '12

http://bugzilla.slf4j.org/show_bug.cgi?id=273 Summary: Missing method org.apache.log4j.Logger#getLogger(String,LoggerFactory ) Product: SLF4J Version: unspecified Platform: All OS/Version: All Status: NEW Severity: major Priority: P1 Component: log4j-over-slf4j AssignedTo: slf4j-dev(a)qos.ch ReportedBy: christian.trutz(a)gmail.com Hi, i want to use log4j-over-slf4j to replace the logging via original Log4J from IBM Content Manager 8. Unfortunatelly IBM CM8 has a very nasty way of using Log4J: it inherits from org.apache.log4j.Logger and use the method getLogger(String,LoggerFactory) but this method is not implemented in log4j-over-slf4j => NoSuchMethodException. Could you please implement org.apache.log4j.Logger#getLogger(String,LoggerFactory) ... my target is to log IBM CM8 messages via SLF4J / lb-beagle. Christian -- Configure bugmail: http://bugzilla.slf4j.org/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug.

1 3

[qos-ch/slf4j] 442e90: log4j-over-slf4j works now also with IBM DB2 Conte...
by Christian Trutz 27 Sep '12

27 Sep '12

Branch: refs/heads/master Home: https://github.com/qos-ch/slf4j Commit: 442e90ba5785cba96a620d0b4fa1f1a6ae267051 https://github.com/qos-ch/slf4j/commit/442e90ba5785cba96a620d0b4fa1f1a6ae26… Author: Christian Trutz <christian.trutz(a)belaso.de> Date: 2012-09-27 (Thu, 27 Sep 2012) Changed paths: A log4j-over-slf4j/src/main/java/org/apache/log4j/Layout.java M log4j-over-slf4j/src/main/java/org/apache/log4j/Log4jLoggerFactory.java M log4j-over-slf4j/src/main/java/org/apache/log4j/Logger.java A log4j-over-slf4j/src/main/java/org/apache/log4j/PatternLayout.java Log Message: ----------- log4j-over-slf4j works now also with IBM DB2 Content Manager 8. Signed-off-by: Christian Trutz <christian.trutz(a)belaso.de> Commit: 0047754f0bc10ceebde3b8e50e23a0dc40e93c44 https://github.com/qos-ch/slf4j/commit/0047754f0bc10ceebde3b8e50e23a0dc40e9… Author: Christian Trutz <christian.trutz(a)belaso.de> Date: 2012-09-27 (Thu, 27 Sep 2012) Changed paths: M slf4j-site/src/site/pages/css/site.css M slf4j-site/src/site/pages/templates/footer.js A slf4j-site/src/site/resources/images/twitter-bird-light-bgs.png Log Message: ----------- Merge branch 'master' of https://github.com/qos-ch/slf4j Compare: https://github.com/qos-ch/slf4j/compare/f9eb71c563ca...0047754f0bc1

1 0

[GIT] SLF4J: Simple Logging Facade for Java branch master updated. v_1.7.1-8-gf9eb71c
by git-noreply＠pixie.qos.ch 27 Sep '12

27 Sep '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 f9eb71c563caa3b4e26fbe4a3a2ea40ef024e4fb (commit) from 8888edb033f7f6c36efc84d522fcb84a17a0b863 (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=f9eb71c563caa3b4e26fbe4a3a… http://github.com/ceki/slf4j/commit/f9eb71c563caa3b4e26fbe4a3a2ea40ef024e4fb commit f9eb71c563caa3b4e26fbe4a3a2ea40ef024e4fb Author: Ceki Gulcu <ceki(a)qos.ch> Date: Thu Sep 27 12:06:01 2012 +0200 added follow @qos_ch link diff --git a/slf4j-site/src/site/pages/css/site.css b/slf4j-site/src/site/pages/css/site.css index 79ec598..1ae4943 100644 --- a/slf4j-site/src/site/pages/css/site.css +++ b/slf4j-site/src/site/pages/css/site.css @@ -386,4 +386,26 @@ td:hover .anchor, dt:hover .anchor { display: inline-block; text-decoration: none; -} \ No newline at end of file +} + + +/* ------------ twitter botton ------- */ +.twitter_button { + vertical-align: text-bottom; + padding-top: 3px; + padding-right: 16px; + float: left; + height: 18px; + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); + white-space: nowrap; + background-color: white; + background-image: -moz-linear-gradient(top, #ffffff, #dedede); + background-image: -webkit-gradient(linear, left top, left bottom, from(#ffffff), to(#dedede)); + background-image: -ms-linear-gradient(top, #ffffff, #dedede); + background-image: linear-gradient(top, #ffffff, #dedede); + background-image: -o-linear-gradient(top, #ffffff, #dedede); + border: #CCC solid 1px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; +} diff --git a/slf4j-site/src/site/pages/templates/footer.js b/slf4j-site/src/site/pages/templates/footer.js index b6817a9..fd9ddb8 100644 --- a/slf4j-site/src/site/pages/templates/footer.js +++ b/slf4j-site/src/site/pages/templates/footer.js @@ -4,6 +4,14 @@ document.write('<table class="footer" border="0">') document.write('<tr>') document.write(' <td valign="top" align="left">Copyright © 2004-2012 <a href="http://www.qos.ch/">QOS.ch</a></td>') + +document.write(' <td>'); +document.write(' <a class="twitter_button" href="http://twitter.com/qos_ch">'); +document.write(' <img style="float:left;" src="images/twitter-bird-light-bgs.png" height="16" alt=""/> Follow @qos_ch'); +document.write(' </a>'); +document.write(' </td>'); + + document.write('</tr>') AAT = '@' diff --git a/slf4j-site/src/site/resources/images/twitter-bird-light-bgs.png b/slf4j-site/src/site/resources/images/twitter-bird-light-bgs.png new file mode 100644 index 0000000..188597e Binary files /dev/null and b/slf4j-site/src/site/resources/images/twitter-bird-light-bgs.png differ ----------------------------------------------------------------------- Summary of changes: slf4j-site/src/site/pages/css/site.css | 24 +++++++++++++++++++- slf4j-site/src/site/pages/templates/footer.js | 8 ++++++ .../resources/images/twitter-bird-light-bgs.png | Bin 0 -> 4392 bytes 3 files changed, 31 insertions(+), 1 deletions(-) create mode 100644 slf4j-site/src/site/resources/images/twitter-bird-light-bgs.png hooks/post-receive -- SLF4J: Simple Logging Facade for Java

1 0

[qos-ch/slf4j] f9eb71: added follow @qos_ch link
by Ceki Gulcu 27 Sep '12

27 Sep '12

Branch: refs/heads/master Home: https://github.com/qos-ch/slf4j Commit: f9eb71c563caa3b4e26fbe4a3a2ea40ef024e4fb https://github.com/qos-ch/slf4j/commit/f9eb71c563caa3b4e26fbe4a3a2ea40ef024… Author: Ceki Gulcu <ceki(a)qos.ch> Date: 2012-09-27 (Thu, 27 Sep 2012) Changed paths: M slf4j-site/src/site/pages/css/site.css M slf4j-site/src/site/pages/templates/footer.js A slf4j-site/src/site/resources/images/twitter-bird-light-bgs.png Log Message: ----------- added follow @qos_ch link

1 0

Some name restrictions for logger name?
by Libor Jelinek 26 Sep '12

26 Sep '12

Hello all (Ceki), are there some naming restrictions for looger name? I would like to ("POKUSY" is Czech word for "experiments" :-)) LoggerFactory.getLogger("_POKUSY_osgi-over-slf4j_1.0.0.qualifier") but obtained logger is named _1.0.0.qualifier Libor

2 3

[qos-ch/slf4j] e701a4: Updated broken links on mailinglists archives on N...
by Ceki Gulcu 24 Sep '12

24 Sep '12

Branch: refs/heads/master Home: https://github.com/qos-ch/slf4j Commit: e701a43563b875c2491addcf6950aa7d1b9ea7aa https://github.com/qos-ch/slf4j/commit/e701a43563b875c2491addcf6950aa7d1b9e… Author: Libor Jelinek <ljelinek(a)virtage.com> Date: 2012-09-21 (Fri, 21 Sep 2012) Changed paths: M slf4j-site/src/site/pages/mailing-lists.html Log Message: ----------- Updated broken links on mailinglists archives on Nabble (http://bugzilla.slf4j.org/show_bug.cgi?id=218) Commit: d6205bf3bd83b55c0cb1d6da0edaab093a4eb1f0 https://github.com/qos-ch/slf4j/commit/d6205bf3bd83b55c0cb1d6da0edaab093a4e… Author: Libor Jelinek <ljelinek(a)virtage.com> Date: 2012-09-21 (Fri, 21 Sep 2012) Changed paths: M osgi-over-slf4j/pom.xml M osgi-over-slf4j/src/main/java/org/slf4j/osgi/logservice/impl/Activator.java M osgi-over-slf4j/src/main/java/org/slf4j/osgi/logservice/impl/LogServiceFactory.java M osgi-over-slf4j/src/main/java/org/slf4j/osgi/logservice/impl/LogServiceImpl.java M pom.xml Log Message: ----------- Merge remote-tracking branch 'upstream/master' Commit: 8888edb033f7f6c36efc84d522fcb84a17a0b863 https://github.com/qos-ch/slf4j/commit/8888edb033f7f6c36efc84d522fcb84a17a0… Author: Ceki Gulcu <ceki(a)qos.ch> Date: 2012-09-22 (Sat, 22 Sep 2012) Changed paths: M slf4j-site/src/site/pages/mailing-lists.html Log Message: ----------- Merge pull request #23 from bircow/master Website: updated broken links on mailinglists archives for Nabble (http://bugzilla.slf4j.org/show_bug.cgi?id=218) Compare: https://github.com/qos-ch/slf4j/compare/3e121c2cac6a...8888edb033f7

3 3

[GIT] SLF4J: Simple Logging Facade for Java branch master updated. v_1.7.1-7-g8888edb
by git-noreply＠pixie.qos.ch 22 Sep '12

22 Sep '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 8888edb033f7f6c36efc84d522fcb84a17a0b863 (commit) via d6205bf3bd83b55c0cb1d6da0edaab093a4eb1f0 (commit) via e701a43563b875c2491addcf6950aa7d1b9ea7aa (commit) via 3e121c2cac6a20edfa16a0c85c328c085a08e129 (commit) via c2f277a5357901e6856bec38a41ecde8c37dce0b (commit) from 3b040e36ff55b7e98fe16e09a4c813d3dab524d6 (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=8888edb033f7f6c36efc84d522… http://github.com/ceki/slf4j/commit/8888edb033f7f6c36efc84d522fcb84a17a0b863 commit 8888edb033f7f6c36efc84d522fcb84a17a0b863 Merge: 3e121c2 d6205bf Author: Ceki Gulcu <ceki(a)qos.ch> Date: Sat Sep 22 01:08:50 2012 -0700 Merge pull request #23 from bircow/master Website: updated broken links on mailinglists archives for Nabble (http://bugzilla.slf4j.org/show_bug.cgi?id=218) http://git.qos.ch/gitweb/?p=slf4j.git;a=commit;h=d6205bf3bd83b55c0cb1d6da0e… http://github.com/ceki/slf4j/commit/d6205bf3bd83b55c0cb1d6da0edaab093a4eb1f0 commit d6205bf3bd83b55c0cb1d6da0edaab093a4eb1f0 Merge: e701a43 3e121c2 Author: Libor Jelinek <ljelinek(a)virtage.com> Date: Fri Sep 21 20:59:40 2012 +0200 Merge remote-tracking branch 'upstream/master' http://git.qos.ch/gitweb/?p=slf4j.git;a=commit;h=e701a43563b875c2491addcf69… http://github.com/ceki/slf4j/commit/e701a43563b875c2491addcf6950aa7d1b9ea7aa commit e701a43563b875c2491addcf6950aa7d1b9ea7aa Author: Libor Jelinek <ljelinek(a)virtage.com> Date: Fri Sep 21 17:17:04 2012 +0200 Updated broken links on mailinglists archives on Nabble (http://bugzilla.slf4j.org/show_bug.cgi?id=218) diff --git a/slf4j-site/src/site/pages/mailing-lists.html b/slf4j-site/src/site/pages/mailing-lists.html index 8576db4..b56f736 100644 --- a/slf4j-site/src/site/pages/mailing-lists.html +++ b/slf4j-site/src/site/pages/mailing-lists.html @@ -70,7 +70,8 @@ Archives: <a href="http://www.qos.ch/pipermail/announce/">Pipermail</a> | - <a href="http://marc.theaimsgroup.com/?l=slf4j-announce">MARC</a> + <a href="http://marc.theaimsgroup.com/?l=slf4j-announce">MARC</a> | + <a href="http://slf4j.42922.n3.nabble.com/Slf4J-announce-f46208.html">Nabble</a> The announcements list is reserved for important SLF4J API related announcements. As such, the traffic on this list is @@ -93,7 +94,7 @@ <a href="http://www.qos.ch/pipermail/slf4j-user/">Pipermail</a> | <a href="http://news.gmane.org/gmane.comp.java.slf4j.user">Gmane</a> | <a href="http://marc.theaimsgroup.com/?l=slf4j-user">MARC</a> | - <a href="http://www.nabble.com/Slf4J---user-f13203.html">Nabble</a> | + <a href="http://slf4j.42922.n3.nabble.com/slf4j-user-f41810.html">Nabble</a> | <a href="http://www.mail-archive.com/user%40slf4j.org/">MailArchive</a> @@ -116,7 +117,7 @@ <a href="http://www.qos.ch/pipermail/slf4j-dev/">Pipermail</a> | <a href="http://news.gmane.org/gmane.comp.java.slf4j.devel">Gmane</a> | <a href="http://marc.theaimsgroup.com/?l=slf4j-dev">MARC</a> | - <a href="http://www.nabble.com/Slf4J---dev-f13200.html">Nabble</a> | + <a href="http://slf4j.42922.n3.nabble.com/slf4j-dev-f41812.html">Nabble</a> | <a href="http://www.mail-archive.com/dev%40slf4j.org/">MailArchive</a>   http://git.qos.ch/gitweb/?p=slf4j.git;a=commit;h=3e121c2cac6a20edfa16a0c85c… http://github.com/ceki/slf4j/commit/3e121c2cac6a20edfa16a0c85c328c085a08e129 commit 3e121c2cac6a20edfa16a0c85c328c085a08e129 Merge: c2f277a 3b040e3 Author: mbishop <matthew.bishop(a)elasticpath.com> Date: Thu Sep 20 17:27:55 2012 -0700 Merge remote-tracking branch 'upstream/master' diff --cc osgi-over-slf4j/pom.xml index 0183f4b,788ae3b..201eec4 --- a/osgi-over-slf4j/pom.xml +++ b/osgi-over-slf4j/pom.xml @@@ -3,11 -3,11 +3,11 @@@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.6.7-SNAPSHOT</version> + <version>1.7.2-SNAPSHOT</version> </parent> - + <modelVersion>4.0.0</modelVersion> - + <groupId>org.slf4j</groupId> <artifactId>osgi-over-slf4j</artifactId> <packaging>bundle</packaging> @@@ -54,5 -56,5 +54,5 @@@ </configuration> </plugin> </plugins> - </build> -</project> + </build> - </project> ++</project> http://git.qos.ch/gitweb/?p=slf4j.git;a=commit;h=c2f277a5357901e6856bec38a4… http://github.com/ceki/slf4j/commit/c2f277a5357901e6856bec38a41ecde8c37dce0b commit c2f277a5357901e6856bec38a41ecde8c37dce0b Author: mbishop <matthew.bishop(a)elasticpath.com> Date: Thu Aug 9 11:24:32 2012 -0700 Bugzilla #269. diff --git a/osgi-over-slf4j/pom.xml b/osgi-over-slf4j/pom.xml index dbd7316..0183f4b 100644 --- a/osgi-over-slf4j/pom.xml +++ b/osgi-over-slf4j/pom.xml @@ -1,37 +1,37 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - + <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> <version>1.6.7-SNAPSHOT</version> </parent> - + <modelVersion>4.0.0</modelVersion> - + <groupId>org.slf4j</groupId> <artifactId>osgi-over-slf4j</artifactId> <packaging>bundle</packaging> - <name>OSGi LogService Implemented Over SLF4J</name> - + <name>OSGi LogService implemented over SLF4J</name> + <url>http://www.slf4j.org</url> <description> OSGi LogService implementation over SLF4J </description> - + <dependencies> <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.core</artifactId> - <version>4.0</version> + <version>4.2.0</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> - <artifactId>org.osgi.compendium</artifactId> - <version>4.0</version> + <artifactId>org.osgi.enterprise</artifactId> + <version>4.2.0</version> <scope>provided</scope> </dependency> - + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> @@ -40,21 +40,19 @@ </dependency> </dependencies> <build> - <plugins> + <plugins> <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - <version>0.9.0-incubator-SNAPSHOT</version> + <version>2.3.7</version> <extensions>true</extensions> <configuration> <instructions> <Export-Package>org.osgi.service.log</Export-Package> - <Import-Package>org.slf4j;version=${project.version},*</Import-Package> - <Private-Package>org.slf4j.osgi.logservice.impl</Private-Package> <Bundle-Activator>org.slf4j.osgi.logservice.impl.Activator</Bundle-Activator> </instructions> </configuration> </plugin> </plugins> - </build> -</project> \ No newline at end of file + </build> +</project> \ No newline at end of file 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 06e31e9..c824f80 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 @@ -1,8 +1,8 @@ -/* +/* * Copyright (c) 2004-2005 QOS.ch - * + * * All rights reserved. - * + * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including @@ -12,7 +12,7 @@ * copyright notice(s) and this permission notice appear in all copies of * the Software and that both the above copyright notice(s) and this * permission notice appear in supporting documentation. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT @@ -22,7 +22,7 @@ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * + * * Except as contained in this notice, the name of a copyright holder * shall not be used in advertising or otherwise to promote the sale, use * or other dealings in this Software without prior written authorization @@ -32,7 +32,7 @@ package org.slf4j.osgi.logservice.impl; -import java.util.Hashtable; +import java.util.Properties; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; @@ -40,38 +40,35 @@ import org.osgi.framework.ServiceFactory; import org.osgi.service.log.LogService; /** - * <code>Activator</code> implements a simple bundle that registers a + * <code>Activator</code> implements a simple bundle that registers a * {@link LogServiceFactory} for the creation of {@link LogService} implementations. **/ public class Activator implements BundleActivator { - /** - * - * Implements <code>BundleActivator.start()</code> to register a + * + * Implements <code>BundleActivator.start()</code> to register a * LogServiceFactory. * * @param bundleContext the framework context for the bundle * @throws Exception */ public void start(BundleContext bundleContext) throws Exception { - Hashtable props = new Hashtable(); + Properties props = new Properties(); props.put("description", "An slf4j implementation."); ServiceFactory factory = new LogServiceFactory(); - bundleContext.registerService(LogService.class.getName(), factory, props); + bundleContext.registerService(LogService.class.getName(), factory, props); } /** - * - * Implements <code>BundleActivator.stop()</code>. - * + * + * Implements <code>BundleActivator.stop()</code>. + * * @param bundleContext the framework context for the bundle * @throws Exception */ 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. } - - } 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 babba09..66b1051 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 @@ -1,8 +1,8 @@ -/* +/* * Copyright (c) 2004-2005 QOS.ch - * + * * All rights reserved. - * + * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including @@ -12,7 +12,7 @@ * copyright notice(s) and this permission notice appear in all copies of * the Software and that both the above copyright notice(s) and this * permission notice appear in supporting documentation. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT @@ -22,7 +22,7 @@ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * + * * Except as contained in this notice, the name of a copyright holder * shall not be used in advertising or otherwise to promote the sale, use * or other dealings in this Software without prior written authorization @@ -37,21 +37,18 @@ import org.osgi.framework.ServiceFactory; import org.osgi.framework.ServiceRegistration; /** - * <code>LogServiceFactory</code> creates LogService implemenations. + * <code>LogServiceFactory</code> creates LogService implementations. * * @author John Conlon * @version $Rev$, $Date$ */ 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 ) { - return new LogServiceImpl(bundle); } @@ -61,8 +58,6 @@ public class LogServiceFactory implements ServiceFactory */ public void ungetService( Bundle bundle, ServiceRegistration arg1, Object arg2 ) { - // Ignore for now - + //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 9253f08..4765575 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 @@ -1,8 +1,8 @@ -/* +/* * Copyright (c) 2004-2005 QOS.ch - * + * * All rights reserved. - * + * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including @@ -12,7 +12,7 @@ * copyright notice(s) and this permission notice appear in all copies of * the Software and that both the above copyright notice(s) and this * permission notice appear in supporting documentation. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT @@ -22,7 +22,7 @@ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * + * * Except as contained in this notice, the name of a copyright holder * shall not be used in advertising or otherwise to promote the sale, use * or other dealings in this Software without prior written authorization @@ -40,9 +40,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * <code>LogServiceImpl</code> is a simple OSGi LogService implemenation that delegates to a slf4j + * <code>LogServiceImpl</code> is a simple OSGi LogService implementation that delegates to a slf4j * Logger. - * + * * @author John Conlon */ public class LogServiceImpl implements LogService { @@ -53,7 +53,7 @@ public class LogServiceImpl implements LogService { /** * Creates a new instance of LogServiceImpl. - * + * */ public LogServiceImpl(Bundle bundle) { String name = (String) bundle.getHeaders().get( @@ -65,7 +65,7 @@ public class LogServiceImpl implements LogService { /* * (non-Javadoc) - * + * * @see org.osgi.service.log.LogService#log(int, java.lang.String) */ public void log(int level, String message) { @@ -85,12 +85,11 @@ public class LogServiceImpl implements LogService { default: break; } - } /* * (non-Javadoc) - * + * * @see org.osgi.service.log.LogService#log(int, java.lang.String, * java.lang.Throwable) */ @@ -115,12 +114,12 @@ public class LogServiceImpl implements LogService { /* * (non-Javadoc) - * + * * @see org.osgi.service.log.LogService#log(org.osgi.framework.ServiceReference, * int, java.lang.String) */ public void log(ServiceReference sr, int level, String message) { - + switch (level) { case LOG_DEBUG: if(delegate.isDebugEnabled()){ @@ -148,26 +147,27 @@ public class LogServiceImpl implements LogService { } /** - * createMessage. + * Formats the log message to indicate the service sending it, if known. * - * @param sr - * @param message - * @return + * @param sr the ServiceReference sending the message. + * @param message The message to log. + * @return The formatted log message. */ private String createMessage(ServiceReference sr, String message) { - StringBuffer output = new StringBuffer(); + StringBuilder output = new StringBuilder(); if (sr != null) { - output.append('[').append(sr.toString()).append(']') - .append(message); + output.append('[').append(sr.toString()).append(']'); } else { - output.append(UNKNOWN).append(message); + output.append(UNKNOWN); } + output.append(message); + return output.toString(); } /* * (non-Javadoc) - * + * * @see org.osgi.service.log.LogService#log(org.osgi.framework.ServiceReference, * int, java.lang.String, java.lang.Throwable) */ @@ -199,5 +199,4 @@ public class LogServiceImpl implements LogService { break; } } - } diff --git a/pom.xml b/pom.xml index bb7470e..ea576e5 100644 --- a/pom.xml +++ b/pom.xml @@ -61,6 +61,7 @@ <module>jcl-over-slf4j</module> <module>log4j-over-slf4j</module> <module>jul-to-slf4j</module> + <module>osgi-over-slf4j</module> <module>integration</module> <module>slf4j-site</module> <module>slf4j-migrator</module> ----------------------------------------------------------------------- Summary of changes: osgi-over-slf4j/pom.xml | 30 ++++++------- .../org/slf4j/osgi/logservice/impl/Activator.java | 33 +++++++-------- .../osgi/logservice/impl/LogServiceFactory.java | 19 +++----- .../slf4j/osgi/logservice/impl/LogServiceImpl.java | 45 ++++++++++---------- pom.xml | 1 + slf4j-site/src/site/pages/mailing-lists.html | 7 ++- 6 files changed, 63 insertions(+), 72 deletions(-) hooks/post-receive -- SLF4J: Simple Logging Facade for Java

1 0

SLF4J "versioning habits"
by Libor Jelinek 21 Sep '12

21 Sep '12

Hello to everybody, what is this project git conventions? 1) Fork & pull way, or directly on main slf4j repo? 2) Branching. I'm used to make a heave use of branching. Every above-trivial change goes to own branch with a some naming convention like "bug/title-of-bug" and "enh/new-feature-prosal". It seems that branches have not been not too much used so far. Thanks in advance for my these newcomers questions Libor

3 3