[slf4j-dev] svn commit: r870 - in slf4j/trunk: . jcl104-over-slf4j log4j-over-slf4j osgi-over-slf4j slf4j-api slf4j-converter slf4j-jcl slf4j-jdk14 slf4j-log4j12 slf4j-log4j12/src/test/java/org/slf4j slf4j-nop slf4j-osgi-integration-test slf4j-osgi-test-bundle slf4j-simple slf4j-site slf4j-site/src/site/pages slf4j-site/src/site/pages/templates
ceki at slf4j.org
ceki at slf4j.org
Mon Aug 20 21:22:47 CEST 2007
Author: ceki
Date: Mon Aug 20 21:22:46 2007
New Revision: 870
Modified:
slf4j/trunk/jcl104-over-slf4j/pom.xml
slf4j/trunk/log4j-over-slf4j/pom.xml
slf4j/trunk/osgi-over-slf4j/pom.xml
slf4j/trunk/pom.xml
slf4j/trunk/slf4j-api/pom.xml
slf4j/trunk/slf4j-converter/pom.xml
slf4j/trunk/slf4j-jcl/pom.xml
slf4j/trunk/slf4j-jdk14/pom.xml
slf4j/trunk/slf4j-log4j12/pom.xml
slf4j/trunk/slf4j-log4j12/src/test/java/org/slf4j/InvocationTest.java
slf4j/trunk/slf4j-nop/pom.xml
slf4j/trunk/slf4j-osgi-integration-test/pom.xml
slf4j/trunk/slf4j-osgi-test-bundle/pom.xml
slf4j/trunk/slf4j-simple/pom.xml
slf4j/trunk/slf4j-site/pom.xml
slf4j/trunk/slf4j-site/src/site/pages/docs.html
slf4j/trunk/slf4j-site/src/site/pages/index.html
slf4j/trunk/slf4j-site/src/site/pages/news.html
slf4j/trunk/slf4j-site/src/site/pages/templates/right.js
Log:
- preparing 1.4.3
-
Modified: slf4j/trunk/jcl104-over-slf4j/pom.xml
==============================================================================
--- slf4j/trunk/jcl104-over-slf4j/pom.xml (original)
+++ slf4j/trunk/jcl104-over-slf4j/pom.xml Mon Aug 20 21:22:46 2007
@@ -3,7 +3,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.4.2</version>
+ <version>1.4.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: slf4j/trunk/log4j-over-slf4j/pom.xml
==============================================================================
--- slf4j/trunk/log4j-over-slf4j/pom.xml (original)
+++ slf4j/trunk/log4j-over-slf4j/pom.xml Mon Aug 20 21:22:46 2007
@@ -5,7 +5,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.4.2</version>
+ <version>1.4.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: slf4j/trunk/osgi-over-slf4j/pom.xml
==============================================================================
--- slf4j/trunk/osgi-over-slf4j/pom.xml (original)
+++ slf4j/trunk/osgi-over-slf4j/pom.xml Mon Aug 20 21:22:46 2007
@@ -3,7 +3,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.4.2</version>
+ <version>1.4.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: slf4j/trunk/pom.xml
==============================================================================
--- slf4j/trunk/pom.xml (original)
+++ slf4j/trunk/pom.xml Mon Aug 20 21:22:46 2007
@@ -5,7 +5,7 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.4.2</version>
+ <version>1.4.3-SNAPSHOT</version>
<packaging>pom</packaging>
<name>SLF4J</name>
Modified: slf4j/trunk/slf4j-api/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-api/pom.xml (original)
+++ slf4j/trunk/slf4j-api/pom.xml Mon Aug 20 21:22:46 2007
@@ -5,7 +5,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.4.2</version>
+ <version>1.4.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: slf4j/trunk/slf4j-converter/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-converter/pom.xml (original)
+++ slf4j/trunk/slf4j-converter/pom.xml Mon Aug 20 21:22:46 2007
@@ -7,7 +7,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.4.2</version>
+ <version>1.4.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: slf4j/trunk/slf4j-jcl/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-jcl/pom.xml (original)
+++ slf4j/trunk/slf4j-jcl/pom.xml Mon Aug 20 21:22:46 2007
@@ -3,7 +3,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.4.2</version>
+ <version>1.4.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: slf4j/trunk/slf4j-jdk14/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-jdk14/pom.xml (original)
+++ slf4j/trunk/slf4j-jdk14/pom.xml Mon Aug 20 21:22:46 2007
@@ -6,7 +6,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.4.2</version>
+ <version>1.4.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: slf4j/trunk/slf4j-log4j12/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-log4j12/pom.xml (original)
+++ slf4j/trunk/slf4j-log4j12/pom.xml Mon Aug 20 21:22:46 2007
@@ -6,7 +6,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.4.2</version>
+ <version>1.4.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: slf4j/trunk/slf4j-log4j12/src/test/java/org/slf4j/InvocationTest.java
==============================================================================
--- slf4j/trunk/slf4j-log4j12/src/test/java/org/slf4j/InvocationTest.java (original)
+++ slf4j/trunk/slf4j-log4j12/src/test/java/org/slf4j/InvocationTest.java Mon Aug 20 21:22:46 2007
@@ -35,16 +35,15 @@
import junit.framework.TestCase;
-
/**
* Test whether invoking the SLF4J API causes problems or not.
*
* @author Ceki Gulcu
- *
+ *
*/
public class InvocationTest extends TestCase {
- public InvocationTest (String arg0) {
+ public InvocationTest(String arg0) {
super(arg0);
}
@@ -55,51 +54,49 @@
protected void tearDown() throws Exception {
super.tearDown();
}
-
+
public void test1() {
Logger logger = LoggerFactory.getLogger("test1");
logger.debug("Hello world.");
}
-
+
public void test2() {
Integer i1 = new Integer(1);
Integer i2 = new Integer(2);
Integer i3 = new Integer(3);
Exception e = new Exception("This is a test exception.");
Logger logger = LoggerFactory.getLogger("test2");
-
+
logger.debug("Hello world 1.");
logger.debug("Hello world {}", i1);
logger.debug("val={} val={}", i1, i2);
- logger.debug("val={} val={} val={}", new Object[]{i1, i2, i3});
-
+ logger.debug("val={} val={} val={}", new Object[] { i1, i2, i3 });
+
logger.debug("Hello world 2", e);
logger.info("Hello world 2.");
-
-
+
logger.warn("Hello world 3.");
logger.warn("Hello world 3", e);
-
-
+
logger.error("Hello world 4.");
- logger.error("Hello world {}", new Integer(3));
+ logger.error("Hello world {}", new Integer(3));
logger.error("Hello world 4.", e);
}
-
+
public void testNull() {
Logger logger = LoggerFactory.getLogger("testNull");
logger.debug(null);
logger.info(null);
logger.warn(null);
logger.error(null);
-
+
Exception e = new Exception("This is a test exception.");
logger.debug(null, e);
logger.info(null, e);
logger.warn(null, e);
logger.error(null, e);
}
-
+
public void testMarker() {
Logger logger = LoggerFactory.getLogger("testMarker");
Marker blue = MarkerFactory.getMarker("BLUE");
@@ -107,7 +104,7 @@
logger.info(blue, "hello");
logger.warn(blue, "hello");
logger.error(blue, "hello");
-
+
logger.debug(blue, "hello {}", "world");
logger.info(blue, "hello {}", "world");
logger.warn(blue, "hello {}", "world");
@@ -118,18 +115,24 @@
logger.warn(blue, "hello {} and {} ", "world", "universe");
logger.error(blue, "hello {} and {} ", "world", "universe");
}
-
+
public void testMDC() {
MDC.put("k", "v");
assertNotNull(MDC.get("k"));
assertEquals("v", MDC.get("k"));
-
+
MDC.remove("k");
assertNull(MDC.get("k"));
-
+
MDC.put("k1", "v1");
assertEquals("v1", MDC.get("k1"));
MDC.clear();
assertNull(MDC.get("k1"));
+
+ try {
+ MDC.put(null, "x");
+ fail("null keys are invalid");
+ } catch (IllegalArgumentException e) {
+ }
}
}
Modified: slf4j/trunk/slf4j-nop/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-nop/pom.xml (original)
+++ slf4j/trunk/slf4j-nop/pom.xml Mon Aug 20 21:22:46 2007
@@ -6,7 +6,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.4.2</version>
+ <version>1.4.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: slf4j/trunk/slf4j-osgi-integration-test/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-osgi-integration-test/pom.xml (original)
+++ slf4j/trunk/slf4j-osgi-integration-test/pom.xml Mon Aug 20 21:22:46 2007
@@ -6,7 +6,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.4.2</version>
+ <version>1.4.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: slf4j/trunk/slf4j-osgi-test-bundle/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-osgi-test-bundle/pom.xml (original)
+++ slf4j/trunk/slf4j-osgi-test-bundle/pom.xml Mon Aug 20 21:22:46 2007
@@ -6,7 +6,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.4.2</version>
+ <version>1.4.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: slf4j/trunk/slf4j-simple/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-simple/pom.xml (original)
+++ slf4j/trunk/slf4j-simple/pom.xml Mon Aug 20 21:22:46 2007
@@ -3,7 +3,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.4.2</version>
+ <version>1.4.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: slf4j/trunk/slf4j-site/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-site/pom.xml (original)
+++ slf4j/trunk/slf4j-site/pom.xml Mon Aug 20 21:22:46 2007
@@ -5,7 +5,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.4.2</version>
+ <version>1.4.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: slf4j/trunk/slf4j-site/src/site/pages/docs.html
==============================================================================
--- slf4j/trunk/slf4j-site/src/site/pages/docs.html (original)
+++ slf4j/trunk/slf4j-site/src/site/pages/docs.html Mon Aug 20 21:22:46 2007
@@ -34,13 +34,20 @@
<h2>Articles</h2>
+
+
<ul>
<li><a
- href="http://eclipsezone.com/articles/franey-logging/?source=archives">Universal
- Logger Plug-ins for RCP Applications</a>, by John J. Franey
+ href="http://day-to-day-stuff.blogspot.com/2007/07/no-more-commons-logging.html">No
+ more commons-logging</a>, by Erik van Oosten
+ </li>
+
+ <li>
+ <a href="http://eclipsezone.com/articles/franey-logging/?source=archives">Universal
+ Logger Plug-ins for RCP Applications</a>, by John J. Franey
</li>
</ul>
-</h2>
+
</div>
</body>
Modified: slf4j/trunk/slf4j-site/src/site/pages/index.html
==============================================================================
--- slf4j/trunk/slf4j-site/src/site/pages/index.html (original)
+++ slf4j/trunk/slf4j-site/src/site/pages/index.html Mon Aug 20 21:22:46 2007
@@ -102,6 +102,7 @@
<td valign="top">
<ul>
<li><a href="http://ha-jdbc.sourceforge.net/">HA-JDBC</a></li>
+ <li><a href="http://www.hibernate.org/">Hibernate</a></li>
<li><a href="http://jetty.mortbay.org/">Jetty v6</a></li>
<li><a href="http://www.topmind.biz/html/index.php">jLynx</a></li>
<li><a href="http://code.google.com/p/jmesa/">JMesa</a></li>
@@ -110,13 +111,13 @@
<li><a href="http://jwebunit.sourceforge.net/2.x/">JWebUnit 2.x</a></li>
<li><a href="http://www.liferay.com/web/guest/home">LIFERAY</a></li>
<li><a href="http://log4jdbc.sourceforge.net">log4jdbc</a></li>
- <li><a href="http://mrcp4j.sourceforge.net/">MRCP4J</a></li>
</ul>
</td>
<td valign="top">
<ul>
+ <li><a href="http://mrcp4j.sourceforge.net/">MRCP4J</a></li>
<li><a href="http://mule.codehaus.org/display/MULE/Home">Mule</a></li>
<li><a href="http://www.unidata.ucar.edu/software/netcdf-java/">NetCDF</a></li>
<li><a href="http://proximity.abstracthorizon.org/index.html">Proximity</a></li>
@@ -126,13 +127,12 @@
<li><a href="http://www.openrdf.org/doc/sesame2/users/ch03.html">Sesame</a></li>
<li><a href="http://smsj.sourceforge.net/dependencies.html">SMSJ</a></li>
<li><a href="http://www.springframework.org/osgi">Spring-OSGi</a></li>
- <li><a href="http://www.wtfigo.org/index.html">WTFIGO</a></li>
</ul>
</td>
<td valign="top">
<ul>
-
+ <li><a href="http://www.wtfigo.org/index.html">WTFIGO</a></li>
<li><a href="http://yaslibrary.sourceforge.net/index.shtml">YASL</a></li>
</ul>
</td>
Modified: slf4j/trunk/slf4j-site/src/site/pages/news.html
==============================================================================
--- slf4j/trunk/slf4j-site/src/site/pages/news.html (original)
+++ slf4j/trunk/slf4j-site/src/site/pages/news.html Mon Aug 20 21:22:46 2007
@@ -30,6 +30,16 @@
<hr noshade="noshade" size="1"/>
+ <h3>August 20th, 2007 - Release of SLF4J 1.4.3</h3>
+
+ <p>Fixed <a href="http://bugzilla.slf4j.org/show_bug.cgi?id=60">bug
+ 60</a> as reported by Costin Leau. OSGI manifest entries now declare
+ the correct SLF4J version.
+ </p>
+
+
+
+
<h3>July 12th, 2007 - Release of SLF4J 1.4.2</h3>
<p>The <a href="log4j-over-slf4j.html">log4j-over-slf4j</a> module
Modified: slf4j/trunk/slf4j-site/src/site/pages/templates/right.js
==============================================================================
--- slf4j/trunk/slf4j-site/src/site/pages/templates/right.js (original)
+++ slf4j/trunk/slf4j-site/src/site/pages/templates/right.js Mon Aug 20 21:22:46 2007
@@ -1,6 +1,10 @@
document.write('<p class="menu_header">SLF4J-related buzz</p>');
+document.write('<p class="rm small"><a href="http://blog.emmanuelbernard.com/2007/08/innovation-in-log-space-yawn.html">Innovation in the Log space</a>');
+document.write('</p>');
+
+
document.write('<p class="rm small"><a href="http://thecodist.com/fiche/thecodist/article/the-open-source-frameworks-i-use">Frameworks I use</a>');
document.write('</p>');
More information about the slf4j-dev
mailing list