[slf4j-dev] svn commit: r828 - in slf4j/trunk: . jcl104-over-slf4j osgi-over-slf4j slf4j-api slf4j-api/src/main/java/org/slf4j slf4j-api/src/main/java/org/slf4j/spi slf4j-archetype slf4j-jcl slf4j-jdk14 slf4j-log4j12 slf4j-nop slf4j-osgi-integration-test slf4j-osgi-test-bundle slf4j-simple slf4j-site
ceki at slf4j.org
ceki at slf4j.org
Mon Jul 2 21:35:02 CEST 2007
Author: ceki
Date: Mon Jul 2 21:35:02 2007
New Revision: 828
Added:
slf4j/trunk/slf4j-api/src/main/java/org/slf4j/MDC.java
slf4j/trunk/slf4j-api/src/main/java/org/slf4j/spi/MappedDiagnosticContext.java
Modified:
slf4j/trunk/jcl104-over-slf4j/pom.xml
slf4j/trunk/osgi-over-slf4j/pom.xml
slf4j/trunk/pom.xml
slf4j/trunk/slf4j-api/pom.xml
slf4j/trunk/slf4j-archetype/pom.xml
slf4j/trunk/slf4j-jcl/pom.xml
slf4j/trunk/slf4j-jdk14/pom.xml
slf4j/trunk/slf4j-log4j12/pom.xml
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
Log:
started work on 1.4.1
Modified: slf4j/trunk/jcl104-over-slf4j/pom.xml
==============================================================================
--- slf4j/trunk/jcl104-over-slf4j/pom.xml (original)
+++ slf4j/trunk/jcl104-over-slf4j/pom.xml Mon Jul 2 21:35:02 2007
@@ -3,7 +3,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.4.0</version>
+ <version>1.4.1-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 Jul 2 21:35:02 2007
@@ -3,7 +3,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.4.0</version>
+ <version>1.4.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: slf4j/trunk/pom.xml
==============================================================================
--- slf4j/trunk/pom.xml (original)
+++ slf4j/trunk/pom.xml Mon Jul 2 21:35:02 2007
@@ -5,7 +5,7 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.4.0</version>
+ <version>1.4.1-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 Jul 2 21:35:02 2007
@@ -5,7 +5,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.4.0</version>
+ <version>1.4.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Added: slf4j/trunk/slf4j-api/src/main/java/org/slf4j/MDC.java
==============================================================================
--- (empty file)
+++ slf4j/trunk/slf4j-api/src/main/java/org/slf4j/MDC.java Mon Jul 2 21:35:02 2007
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2004-2007 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
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * 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. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package org.slf4j;
+
+import org.slf4j.helpers.Util;
+import org.slf4j.impl.StaticMarkerBinder;
+
+/**
+ * MDC class serves as an abstraction for the underlying logging system's
+ * MDC implementation. At this time, only log4j and logback offer MDC
+ * functionality. For other systems, this class defaults to nop (empty)
+ * implemnetation.
+ *
+ * <p>
+ * Please note that all methods in this class are static.
+ *
+ * @author Ceki Gülcü
+ */
+public class MDC {
+ static IMarkerFactory markerFactory;
+
+ private MDC() {
+ }
+
+ static {
+ try {
+ markerFactory = StaticMarkerBinder.SINGLETON.getMarkerFactory();
+ } catch (Exception e) {
+ // we should never get here
+ Util.reportFailure("Could not instantiate instance of class ["
+ + StaticMarkerBinder.SINGLETON.getMarkerFactoryClassStr() + "]", e);
+ }
+ }
+
+ /**
+ * Return a Marker instance as specified by the name parameter using the
+ * previously bound {@link IMarkerFactory}instance.
+ *
+ * @param name
+ * The name of the {@link Marker} object to return.
+ * @return marker
+ */
+ public static Marker getMarker(String name) {
+ return markerFactory.getMarker(name);
+ }
+
+ /**
+ * Return the {@link IMarkerFactory}instance in use.
+ *
+ * <p>The IMarkerFactory instance is usually bound with this class at
+ * compile time.
+ *
+ * @return the IMarkerFactory instance in use
+ */
+ public static IMarkerFactory getIMarkerFactory() {
+ return markerFactory;
+ }
+}
\ No newline at end of file
Added: slf4j/trunk/slf4j-api/src/main/java/org/slf4j/spi/MappedDiagnosticContext.java
==============================================================================
--- (empty file)
+++ slf4j/trunk/slf4j-api/src/main/java/org/slf4j/spi/MappedDiagnosticContext.java Mon Jul 2 21:35:02 2007
@@ -0,0 +1,31 @@
+package org.slf4j.spi;
+
+public interface MappedDiagnosticContext {
+
+ /**
+ * Put a context value (the <code>val</code> parameter) as identified with
+ * the <code>key</code> parameter into the current thread's context map.
+ *
+ * <p>If the current thread does not have a context map it is created as a side
+ * effect of this call.
+ */
+ public void put(String key, String val);
+
+ /**
+ * Get the context identified by the <code>key</code> parameter.
+ *
+ * @return the string value identified by the <code>key</code> parameter.
+ */
+ public String get(String key);
+
+ /**
+ * Remove the the context identified by the <code>key</code> parameter.
+ */
+ public void remove(String key);
+
+ /**
+ * Clear all entries in the MDC.
+ */
+ public void clear();
+
+}
Modified: slf4j/trunk/slf4j-archetype/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-archetype/pom.xml (original)
+++ slf4j/trunk/slf4j-archetype/pom.xml Mon Jul 2 21:35:02 2007
@@ -2,7 +2,7 @@
<parent>
<artifactId>slf4j-parent</artifactId>
<groupId>org.slf4j</groupId>
- <version>1.4.0</version>
+ <version>1.4.1-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 Jul 2 21:35:02 2007
@@ -3,7 +3,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.4.0</version>
+ <version>1.4.1-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 Jul 2 21:35:02 2007
@@ -6,7 +6,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.4.0</version>
+ <version>1.4.1-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 Jul 2 21:35:02 2007
@@ -6,7 +6,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.4.0</version>
+ <version>1.4.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: slf4j/trunk/slf4j-nop/pom.xml
==============================================================================
--- slf4j/trunk/slf4j-nop/pom.xml (original)
+++ slf4j/trunk/slf4j-nop/pom.xml Mon Jul 2 21:35:02 2007
@@ -6,7 +6,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.4.0</version>
+ <version>1.4.1-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 Jul 2 21:35:02 2007
@@ -6,7 +6,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.4.0</version>
+ <version>1.4.1-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 Jul 2 21:35:02 2007
@@ -6,7 +6,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.4.0</version>
+ <version>1.4.1-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 Jul 2 21:35:02 2007
@@ -3,7 +3,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.4.0</version>
+ <version>1.4.1-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 Jul 2 21:35:02 2007
@@ -5,7 +5,7 @@
<parent>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-parent</artifactId>
- <version>1.4.0</version>
+ <version>1.4.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
More information about the slf4j-dev
mailing list