From d75c39666137e1fe6bc3304a3fd4437b755d2341 Mon Sep 17 00:00:00 2001
From: Ceki Gulcu <ceki@qos.ch>
Date: Tue, 27 May 2008 18:39:57 +0000
Subject: [PATCH] - update to logj dependency to 1.2.14 - renamed
 getCopyOfPropertyMap to getCopyOfContextMap in MDCAdapter and co.

---
 pom.xml                                       |  2 +-
 slf4j-api/src/main/java/org/slf4j/MDC.java    |  4 ++--
 .../org/slf4j/helpers/BasicMDCAdapter.java    |  2 +-
 .../org/slf4j/helpers/NOPMakerAdapter.java    |  2 +-
 .../main/java/org/slf4j/spi/MDCAdapter.java   |  2 +-
 .../java/org/slf4j/impl/Log4jMDCAdapter.java  |  2 +-
 slf4j-site/src/site/pages/news.html           | 19 +++++++++++++++++--
 7 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 596c1f7a..1c0c19da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
       <dependency>
         <groupId>log4j</groupId>
         <artifactId>log4j</artifactId>
-        <version>1.2.13</version>
+        <version>1.2.14</version>
       </dependency>
 
    </dependencies>
diff --git a/slf4j-api/src/main/java/org/slf4j/MDC.java b/slf4j-api/src/main/java/org/slf4j/MDC.java
index 71cf2197..ae1bd841 100644
--- a/slf4j-api/src/main/java/org/slf4j/MDC.java
+++ b/slf4j-api/src/main/java/org/slf4j/MDC.java
@@ -168,12 +168,12 @@ public class MDC {
    * @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();
   }
   
   /**
diff --git a/slf4j-api/src/main/java/org/slf4j/helpers/BasicMDCAdapter.java b/slf4j-api/src/main/java/org/slf4j/helpers/BasicMDCAdapter.java
index f31f8686..83df376a 100644
--- a/slf4j-api/src/main/java/org/slf4j/helpers/BasicMDCAdapter.java
+++ b/slf4j-api/src/main/java/org/slf4j/helpers/BasicMDCAdapter.java
@@ -122,7 +122,7 @@ public class BasicMDCAdapter implements MDCAdapter {
    * Returned value may be null.
    * 
    */
-  public Map getCopyOfPropertyMap() {
+  public Map getCopyOfContextMap() {
     HashMap hashMap = (HashMap) inheritableThreadLocal.get();
     if (hashMap != null) {
       return new HashMap(hashMap);
diff --git a/slf4j-api/src/main/java/org/slf4j/helpers/NOPMakerAdapter.java b/slf4j-api/src/main/java/org/slf4j/helpers/NOPMakerAdapter.java
index 3325f9ce..fca3b614 100644
--- a/slf4j-api/src/main/java/org/slf4j/helpers/NOPMakerAdapter.java
+++ b/slf4j-api/src/main/java/org/slf4j/helpers/NOPMakerAdapter.java
@@ -28,7 +28,7 @@ public class NOPMakerAdapter implements MDCAdapter {
   public void remove(String key) {
   }
 
-  public Map getCopyOfPropertyMap() {
+  public Map getCopyOfContextMap() {
     return null;
   }
 
diff --git a/slf4j-api/src/main/java/org/slf4j/spi/MDCAdapter.java b/slf4j-api/src/main/java/org/slf4j/spi/MDCAdapter.java
index 267252d9..413f0851 100644
--- a/slf4j-api/src/main/java/org/slf4j/spi/MDCAdapter.java
+++ b/slf4j-api/src/main/java/org/slf4j/spi/MDCAdapter.java
@@ -76,5 +76,5 @@ public interface MDCAdapter {
    * @return A copy of the current thread's context map. May be null.
    * @since 1.5.1
    */
-  public Map getCopyOfPropertyMap();
+  public Map getCopyOfContextMap();
 }
diff --git a/slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jMDCAdapter.java b/slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jMDCAdapter.java
index fbd4d0d6..76fe12d5 100644
--- a/slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jMDCAdapter.java
+++ b/slf4j-log4j12/src/main/java/org/slf4j/impl/Log4jMDCAdapter.java
@@ -38,7 +38,7 @@ public class Log4jMDCAdapter implements MDCAdapter {
     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);
diff --git a/slf4j-site/src/site/pages/news.html b/slf4j-site/src/site/pages/news.html
index e2be2d44..00f971b9 100644
--- a/slf4j-site/src/site/pages/news.html
+++ b/slf4j-site/src/site/pages/news.html
@@ -41,8 +41,23 @@ prefix='';
   <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