[slf4j-dev] svn commit: r1017 - in slf4j/trunk: . slf4j-api/src/main/java/org/slf4j slf4j-api/src/main/java/org/slf4j/helpers slf4j-api/src/main/java/org/slf4j/spi slf4j-log4j12/src/main/java/org/slf4j/impl slf4j-site/src/site/pages

[ceki at slf4j.org]

Author: ceki
Date: Tue May 27 20:39:57 2008
New Revision: 1017

Modified:
   slf4j/trunk/pom.xml
   slf4j/trunk/slf4j-api/src/main/java/org/slf4j/MDC.java
   slf4j/trunk/slf4j-api/src/main/java/org/slf4j/helpers/BasicMDCAdapter.java
   slf4j/trunk/slf4j-api/src/main/java/org/slf4j/helpers/NOPMakerAdapter.java
   slf4j/trunk/slf4j-api/src/main/java/org/slf4j/spi/MDCAdapter.java
   slf4j/trunk/slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jMDCAdapter.java
   slf4j/trunk/slf4j-site/src/site/pages/news.html

Log:
- update to logj dependency to 1.2.14
- renamed getCopyOfPropertyMap to getCopyOfContextMap in MDCAdapter and co.

Modified: slf4j/trunk/pom.xml
==============================================================================
--- slf4j/trunk/pom.xml	(original)
+++ slf4j/trunk/pom.xml	Tue May 27 20:39:57 2008
@@ -58,7 +58,7 @@
       <dependency>
         <groupId>log4j</groupId>
         <artifactId>log4j</artifactId>
-        <version>1.2.13</version>
+        <version>1.2.14</version>
       </dependency>
 
    </dependencies>

Modified: slf4j/trunk/slf4j-api/src/main/java/org/slf4j/MDC.java
==============================================================================
--- slf4j/trunk/slf4j-api/src/main/java/org/slf4j/MDC.java	(original)
+++ slf4j/trunk/slf4j-api/src/main/java/org/slf4j/MDC.java	Tue May 27 20:39:57 2008
@@ -168,12 +168,12 @@
    * @return A copy of the current thread's context map. May be null.
    * @since 1.5.1
    */
-  public static Map getCopyOfPropertyMap() {
+  public static Map getCopyOfContextMap() {
     if (mdcAdapter == null) {
       throw new IllegalStateException("MDCAdapter cannot be null. See also "
           + NULL_MDCA_URL);
     }
-    return mdcAdapter.getCopyOfPropertyMap();
+    return mdcAdapter.getCopyOfContextMap();
   }
   
   /**

Modified: slf4j/trunk/slf4j-api/src/main/java/org/slf4j/helpers/BasicMDCAdapter.java
==============================================================================
--- slf4j/trunk/slf4j-api/src/main/java/org/slf4j/helpers/BasicMDCAdapter.java	(original)
+++ slf4j/trunk/slf4j-api/src/main/java/org/slf4j/helpers/BasicMDCAdapter.java	Tue May 27 20:39:57 2008
@@ -122,7 +122,7 @@
    * Returned value may be null.
    * 
    */
-  public Map getCopyOfPropertyMap() {
+  public Map getCopyOfContextMap() {
     HashMap hashMap = (HashMap) inheritableThreadLocal.get();
     if (hashMap != null) {
       return new HashMap(hashMap);

Modified: slf4j/trunk/slf4j-api/src/main/java/org/slf4j/helpers/NOPMakerAdapter.java
==============================================================================
--- slf4j/trunk/slf4j-api/src/main/java/org/slf4j/helpers/NOPMakerAdapter.java	(original)
+++ slf4j/trunk/slf4j-api/src/main/java/org/slf4j/helpers/NOPMakerAdapter.java	Tue May 27 20:39:57 2008
@@ -28,7 +28,7 @@
   public void remove(String key) {
   }
 
-  public Map getCopyOfPropertyMap() {
+  public Map getCopyOfContextMap() {
     return null;
   }
 

Modified: slf4j/trunk/slf4j-api/src/main/java/org/slf4j/spi/MDCAdapter.java
==============================================================================
--- slf4j/trunk/slf4j-api/src/main/java/org/slf4j/spi/MDCAdapter.java	(original)
+++ slf4j/trunk/slf4j-api/src/main/java/org/slf4j/spi/MDCAdapter.java	Tue May 27 20:39:57 2008
@@ -76,5 +76,5 @@
    * @return A copy of the current thread's context map. May be null.
    * @since 1.5.1
    */
-  public Map getCopyOfPropertyMap();
+  public Map getCopyOfContextMap();
 }

Modified: slf4j/trunk/slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jMDCAdapter.java
==============================================================================
--- slf4j/trunk/slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jMDCAdapter.java	(original)
+++ slf4j/trunk/slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jMDCAdapter.java	Tue May 27 20:39:57 2008
@@ -38,7 +38,7 @@
     org.apache.log4j.MDC.remove(key);
   }
 
-  public Map getCopyOfPropertyMap() {
+  public Map getCopyOfContextMap() {
     Map old = org.apache.log4j.MDC.getContext();
     if(old != null) {
       return new HashMap(old);

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	Tue May 27 20:39:57 2008
@@ -41,8 +41,23 @@
   <code>Log4jLoggerAdapter</code> will map the TRACE level as DEBUG.
   </p>
 
-  <p>The <a href="migrator.html">SLF4J Migrator</a> tool has been
-  improved to support migration from JUL to SLF4J.
+  
+  <p>Added the <code>getCopyOfContextMap</code> method to the
+  <code>MDCAdapter</code> and <code>org.sf4j.MDC</code> classes. This
+  was requested in <a
+  href="http://bugzilla.slf4j.org/show_bug.cgi?id=84">bug 84</a> by
+  Anton Tagunov.
+  </p>
+
+  <p>Added the <code>getEffectiveLevel()</code> method to the
+  <code>Category</code> class in log4j-over-slf4j. This addition was
+  requested in <a
+  href="http://bugzilla.slf4j.org/show_bug.cgi?id=74">bug 74</a> by
+  Michael Newcomb.
+  </p>
+
+  <p>The <a href="migrator.html">SLF4J Migrator</a>
+  tool has been improved to support migration from JUL to SLF4J.
   </p>
 
   <p>In <code>MarkerIgnoringBase</code> class, corrected mapping of