
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 9ac7d3a3ab05275e5e5cbe4e45a6f6bf8100e3f5 (commit) from 4e9748b4696e1ca6c80ce6be7fe2096e9639ba04 (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=9ac7d3a3ab05275e5e5cbe4e45a... http://github.com/ceki/slf4j/commit/9ac7d3a3ab05275e5e5cbe4e45a6f6bf8100e3f5 commit 9ac7d3a3ab05275e5e5cbe4e45a6f6bf8100e3f5 Author: Ceki Gulcu <ceki@qos.ch> Date: Wed Apr 21 23:06:22 2010 +0200 - instead of 'rc' using 'alpha' prefix for releases to emphasize the experimental nature of the code - added a paragraph on defaulting to nop in the absence of a binding - minor code refactoring in LoggerFactory (url constants to codes.html) - added link to AVLS from the site menu diff --git a/integration/pom.xml b/integration/pom.xml index 0a6ff39..542ddf7 100644 --- a/integration/pom.xml +++ b/integration/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.6.0-RC0</version> + <version>1.6.0-alpha2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/jcl-over-slf4j/pom.xml b/jcl-over-slf4j/pom.xml index 42dbc0a..9405726 100644 --- a/jcl-over-slf4j/pom.xml +++ b/jcl-over-slf4j/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.6.0-RC0</version> + <version>1.6.0-alpha2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/jul-to-slf4j/pom.xml b/jul-to-slf4j/pom.xml index 9e6bb96..3852718 100644 --- a/jul-to-slf4j/pom.xml +++ b/jul-to-slf4j/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.6.0-RC0</version> + <version>1.6.0-alpha2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/log4j-over-slf4j/pom.xml b/log4j-over-slf4j/pom.xml index a26cabe..5e97a9c 100644 --- a/log4j-over-slf4j/pom.xml +++ b/log4j-over-slf4j/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.6.0-RC0</version> + <version>1.6.0-alpha2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/osgi-over-slf4j/pom.xml b/osgi-over-slf4j/pom.xml index 8bd23cc..8246c1d 100644 --- a/osgi-over-slf4j/pom.xml +++ b/osgi-over-slf4j/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.6.0-RC0</version> + <version>1.6.0-alpha2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/pom.xml b/pom.xml index ce53b6b..2158dfa 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.6.0-RC0</version> + <version>1.6.0-alpha2</version> <packaging>pom</packaging> <name>SLF4J</name> diff --git a/slf4j-api/pom.xml b/slf4j-api/pom.xml index 1876635..64d3dee 100644 --- a/slf4j-api/pom.xml +++ b/slf4j-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.6.0-RC0</version> + <version>1.6.0-alpha2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java b/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java index 7d59d13..e618e8a 100644 --- a/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java +++ b/slf4j-api/src/main/java/org/slf4j/LoggerFactory.java @@ -55,13 +55,15 @@ import org.slf4j.impl.StaticLoggerBinder; */ public final class LoggerFactory { - static final String NO_STATICLOGGERBINDER_URL = "http://www.slf4j.org/codes.html#StaticLoggerBinder"; - static final String MULTIPLE_BINDINGS_URL = "http://www.slf4j.org/codes.html#multiple_bindings"; - static final String NULL_LF_URL = "http://www.slf4j.org/codes.html#null_LF"; - static final String VERSION_MISMATCH = "http://www.slf4j.org/codes.html#version_mismatch"; - static final String SUBSTITUTE_LOGGER_URL = "http://www.slf4j.org/codes.html#substituteLogger"; + static final String CODES_PREFIX = "http://www.slf4j.org/codes.html"; + + static final String NO_STATICLOGGERBINDER_URL = CODES_PREFIX+"#StaticLoggerBinder"; + static final String MULTIPLE_BINDINGS_URL = CODES_PREFIX+"#multiple_bindings"; + static final String NULL_LF_URL = CODES_PREFIX+"#null_LF"; + static final String VERSION_MISMATCH = CODES_PREFIX+"#version_mismatch"; + static final String SUBSTITUTE_LOGGER_URL = CODES_PREFIX+"#substituteLogger"; - static final String UNSUCCESSFUL_INIT_URL = "http://www.slf4j.org/codes.html#unsuccessfulInit"; + static final String UNSUCCESSFUL_INIT_URL = CODES_PREFIX+"#unsuccessfulInit"; static final String UNSUCCESSFUL_INIT_MSG = "org.slf4j.LoggerFactory could not be successfully initialized. See also " + UNSUCCESSFUL_INIT_URL; diff --git a/slf4j-ext/pom.xml b/slf4j-ext/pom.xml index 9392550..3531e0b 100644 --- a/slf4j-ext/pom.xml +++ b/slf4j-ext/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.6.0-RC0</version> + <version>1.6.0-alpha2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/slf4j-jcl/pom.xml b/slf4j-jcl/pom.xml index a4a460f..6ec742a 100644 --- a/slf4j-jcl/pom.xml +++ b/slf4j-jcl/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.6.0-RC0</version> + <version>1.6.0-alpha2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/slf4j-jdk14/pom.xml b/slf4j-jdk14/pom.xml index de8b16f..095ab13 100644 --- a/slf4j-jdk14/pom.xml +++ b/slf4j-jdk14/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.6.0-RC0</version> + <version>1.6.0-alpha2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/slf4j-log4j12/pom.xml b/slf4j-log4j12/pom.xml index 7db6199..bf78754 100644 --- a/slf4j-log4j12/pom.xml +++ b/slf4j-log4j12/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.6.0-RC0</version> + <version>1.6.0-alpha2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/slf4j-migrator/pom.xml b/slf4j-migrator/pom.xml index 357e13b..3bd4caf 100644 --- a/slf4j-migrator/pom.xml +++ b/slf4j-migrator/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.6.0-RC0</version> + <version>1.6.0-alpha2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/slf4j-nop/pom.xml b/slf4j-nop/pom.xml index 7f68ce0..d0382ee 100644 --- a/slf4j-nop/pom.xml +++ b/slf4j-nop/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.6.0-RC0</version> + <version>1.6.0-alpha2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/slf4j-osgi-integration-test/pom.xml b/slf4j-osgi-integration-test/pom.xml index ccb165e..0705ec2 100644 --- a/slf4j-osgi-integration-test/pom.xml +++ b/slf4j-osgi-integration-test/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.6.0-RC0</version> + <version>1.6.0-alpha2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/slf4j-osgi-test-bundle/pom.xml b/slf4j-osgi-test-bundle/pom.xml index 1e5ad78..27d5548 100644 --- a/slf4j-osgi-test-bundle/pom.xml +++ b/slf4j-osgi-test-bundle/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.6.0-RC0</version> + <version>1.6.0-alpha2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/slf4j-simple/pom.xml b/slf4j-simple/pom.xml index 3bf74e2..7d1a69b 100644 --- a/slf4j-simple/pom.xml +++ b/slf4j-simple/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.6.0-RC0</version> + <version>1.6.0-alpha2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/slf4j-site/pom.xml b/slf4j-site/pom.xml index f0cec49..d76ddd7 100644 --- a/slf4j-site/pom.xml +++ b/slf4j-site/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.slf4j</groupId> <artifactId>slf4j-parent</artifactId> - <version>1.6.0-RC0</version> + <version>1.6.0-alpha2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/slf4j-site/src/site/pages/download.html b/slf4j-site/src/site/pages/download.html index de0fe1a..dae0a7b 100644 --- a/slf4j-site/src/site/pages/download.html +++ b/slf4j-site/src/site/pages/download.html @@ -53,7 +53,7 @@ <li><a href="dist/slf4j-1.5.11.zip"><b>slf4j-1.5.11.zip</b></a> </li> </ul> - <h4>Experimental</h4> + <h4 class="red">Experimental</h4> <ul> <li><a href="dist/slf4j-${project.version}.tar.gz"><b>slf4j-${project.version}.tar.gz</b></a> </li> diff --git a/slf4j-site/src/site/pages/manual.html b/slf4j-site/src/site/pages/manual.html index aebe651..0f51f00 100644 --- a/slf4j-site/src/site/pages/manual.html +++ b/slf4j-site/src/site/pages/manual.html @@ -102,18 +102,29 @@ public class HelloWorld { <h3><a name="swapping" href="#binding">Binding with a logging framework at deployment time</a></h3> - <p>As mentioned previously, SLF4J supports multiple logging + <p>As mentioned previously, SLF4J supports various logging frameworks. The SLF4J distribution ships with several jar files - referred to as "SLF4J bindings". </p> + referred to as "SLF4J bindings", with each binding corresponding + to a supported framework. </p> <dl> + <dt><em>slf4j-log4j12-${project.version}.jar</em> + </dt> + <dd>Binding for <a + href="http://logging.apache.org/log4j/1.2/index.html">log4j + version 1.2</a>, a widely used logging framework. You also + need to place <em>log4j.jar</em> on your class path.<p/></dd> + + <dt><em>slf4j-jdk14-${project.version}.jar</em> </dt> + <dd>Binding for java.util.logging, also referred to as JDK 1.4 + logging <p/></dd> + <dt><em>slf4j-nop-${project.version}.jar</em></dt> <dd>Binding for <a href="http://www.slf4j.org/api/org/slf4j/helpers/NOPLogger.html">NOP</a>, silently discarding all logging.<p/></dd> - <dt><em>slf4j-simple-${project.version}.jar</em></dt> <dd>Binding for <a href="http://www.slf4j.org/apidocs/org/slf4j/impl/SimpleLogger.html">Simple @@ -121,17 +132,6 @@ public class HelloWorld { System.err. Only messages of level INFO and higher are printed. This binding may be useful in the context of small applications.<p/></dd> - - <dt><em>slf4j-log4j12-${project.version}.jar</em> - </dt> - <dd>Binding for <a - href="http://logging.apache.org/log4j/1.2/index.html">log4j - version 1.2</a>, a widely used logging framework. You also - need to place <em>log4j.jar</em> on your class path.<p/></dd> - - <dt><em>slf4j-jdk14-${project.version}.jar</em> </dt> - <dd>Binding for java.util.logging, also referred to as JDK 1.4 - logging <p/></dd> <dt><em>slf4j-jcl-${project.version}.jar</em></dt> @@ -181,7 +181,6 @@ public class HelloWorld { <p> </p> - <p>The SLF4J interfaces and their various adapters are extremely simple. Most developers familiar with the Java language should be able to read and fully understand the code in less than one @@ -209,6 +208,21 @@ public class HelloWorld { approach has proven to be simple and very robust. </p> + <p><b>As of SLF4J version 1.6.0</b>, if no binding is found on + the class path, then slf4j-api will default to a no-operation + implementation discarding all log requests. Thus, instead of + throwing an exception, SLF4J will emit a single warning message + about the absence of a binding and proceed to discard all log + requests without further protest. For example, let Wombat be + some biology-related framework depending on SLF4J for + logging. In order to avoid imposing a logging framework on the + end-user, Wombat's distribution includes <em>slf4j-api.jar</em> + but no binding. Even in the absence of any SLF4J binding on the + class path, Wombat's distribution will still work + out-of-the-box, and without requiring the end-user to download a + binding from SLF4J's web-site. Only when the end-user wishes to + enable logging will she need to install a binding. + </p> <h3><a name="consolidate" href="#consolidate">Consolidate logging via SLF4J</a></h3> diff --git a/slf4j-site/src/site/pages/news.html b/slf4j-site/src/site/pages/news.html index 45da6cc..8d6659f 100644 --- a/slf4j-site/src/site/pages/news.html +++ b/slf4j-site/src/site/pages/news.html @@ -29,19 +29,18 @@ <hr noshade="noshade" size="1"/> - <h3>April 21st, 2010 - Release of SLF4J 1.6.0-RC0</h3> + <h3>April 26th, 2010 - Release of SLF4J 1.6.0-alpha2</h3> <p>It is expected that <em>all</em> SLF4J releases in the 1.6.x and 2.0.x series will be mutually compatible. Note that the 2.0.x series is expected to require JDK 1.5 or later. </p> - <p>Note that as of SLF4J version 1.6.0, in the absence of an SLF4J - binding, slf4j-api will default to a no-operation implementation - discarding all log requests. Thus, instead of throwing an - exception, SLF4J will emit a single warning message about the - absence of a binding and proceed to discard all log requests - without further protest. + <p>As of SLF4J version 1.6.0, in the absence of an SLF4J binding, + slf4j-api will default to a no-operation implementation discarding + all log requests. Thus, instead of throwing an exception, SLF4J + will emit a single warning message about the absence of a binding + and proceed to discard all log requests without further protest. </p> <p>In the presence of multiple parameters and if the last argument diff --git a/slf4j-site/src/site/pages/templates/left.js b/slf4j-site/src/site/pages/templates/left.js index 77cbc6e..e0dd594 100644 --- a/slf4j-site/src/site/pages/templates/left.js +++ b/slf4j-site/src/site/pages/templates/left.js @@ -16,7 +16,9 @@ document.write(' <a href="http://www.qos.ch/shop/products/professionalSupport document.write(' <a href="http://www.qos.ch/shop/products/training">Training</a>'); document.write(' <p class="menu_header">Native implementations</p>'); +document.write(' <a href="http://bmc.github.com/avsl/">AVSL</a>'); document.write(' <a href="http://logback.qos.ch/">Logback</a>'); + document.write(' <p class="menu_header">Wrapped implementations</p>'); document.write(' <a href="api/org/slf4j/impl/JDK14LoggerAdapter.html">JDK14</a>'); document.write(' <a href="api/org/slf4j/impl/Log4jLoggerAdapter.html">Log4j</a>'); ----------------------------------------------------------------------- Summary of changes: integration/pom.xml | 2 +- jcl-over-slf4j/pom.xml | 2 +- jul-to-slf4j/pom.xml | 2 +- log4j-over-slf4j/pom.xml | 2 +- osgi-over-slf4j/pom.xml | 2 +- pom.xml | 2 +- slf4j-api/pom.xml | 2 +- .../src/main/java/org/slf4j/LoggerFactory.java | 14 ++++--- slf4j-ext/pom.xml | 2 +- slf4j-jcl/pom.xml | 2 +- slf4j-jdk14/pom.xml | 2 +- slf4j-log4j12/pom.xml | 2 +- slf4j-migrator/pom.xml | 2 +- slf4j-nop/pom.xml | 2 +- slf4j-osgi-integration-test/pom.xml | 2 +- slf4j-osgi-test-bundle/pom.xml | 2 +- slf4j-simple/pom.xml | 2 +- slf4j-site/pom.xml | 2 +- slf4j-site/src/site/pages/download.html | 2 +- slf4j-site/src/site/pages/manual.html | 44 +++++++++++++------- slf4j-site/src/site/pages/news.html | 13 +++--- slf4j-site/src/site/pages/templates/left.js | 2 + 22 files changed, 63 insertions(+), 46 deletions(-) hooks/post-receive -- SLF4J: Simple Logging Facade for Java