Index: maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirMailboxManagerTest.java
===================================================================
--- maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirMailboxManagerTest.java	(revision 1074479)
+++ maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirMailboxManagerTest.java	(working copy)
@@ -29,7 +29,6 @@
 import javax.mail.Flags;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.logging.impl.SimpleLog;
 import org.apache.james.mailbox.MailboxConstants;
 import org.apache.james.mailbox.MailboxException;
 import org.apache.james.mailbox.MailboxExistsException;
@@ -39,6 +38,7 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.slf4j.LoggerFactory;
 
 /**
  * MaildirMailboxManagerTest that extends the StoreMailboxManagerTest.
@@ -116,7 +116,7 @@
             manager.init();
     
             String user = "test@localhost";
-            MailboxSession session = manager.createSystemSession(user, new SimpleLog("Test"));
+            MailboxSession session = manager.createSystemSession(user, LoggerFactory.getLogger("Test"));
             manager.createMailbox(new MailboxPath(MailboxConstants.USER_NAMESPACE, user, "Trash"), session);
             manager.createMailbox(new MailboxPath(MailboxConstants.USER_NAMESPACE, user, "INBOX.testfolder"), session);
             
Index: maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirFolder.java
===================================================================
--- maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirFolder.java	(revision 1074479)
+++ maildir/src/main/java/org/apache/james/mailbox/maildir/MaildirFolder.java	(working copy)
@@ -38,15 +38,15 @@
 import java.util.TreeMap;
 
 import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class MaildirFolder {
 
     /**
      * The logger.
      */
-    private Log log = LogFactory.getLog(MaildirFolder.class.getName());
+    private Logger log = LoggerFactory.getLogger(MaildirFolder.class.getName());
 
     public static final String VALIDITY_FILE = "james-uidvalidity";
     public static final String UIDLIST_FILE = "james-uidlist";
Index: maildir/pom.xml
===================================================================
--- maildir/pom.xml	(revision 1075120)
+++ maildir/pom.xml	(working copy)
@@ -62,6 +62,15 @@
       <artifactId>commons-io</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>${javax.mail.groupId}</groupId>
       <artifactId>${javax.mail.artifactId}</artifactId>
     </dependency>
Index: memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManagerTest.java
===================================================================
--- memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManagerTest.java	(revision 1074479)
+++ memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManagerTest.java	(working copy)
@@ -18,7 +18,6 @@
  ****************************************************************/
 package org.apache.james.mailbox.inmemory;
 
-import org.apache.commons.logging.impl.SimpleLog;
 import org.apache.james.mailbox.BadCredentialsException;
 import org.apache.james.mailbox.MailboxException;
 import org.apache.james.mailbox.MailboxManagerTest;
@@ -27,6 +26,7 @@
 import org.apache.james.mailbox.store.MockAuthenticator;
 import org.junit.After;
 import org.junit.Before;
+import org.slf4j.LoggerFactory;
 
 /**
  * InMemoryMailboxManagerTest that extends the MailboxManagerTest.
@@ -51,7 +51,7 @@
      */
     @After
     public void tearDown() throws BadCredentialsException, MailboxException {
-        MailboxSession session = getMailboxManager().createSystemSession("test", new SimpleLog("Test"));
+        MailboxSession session = getMailboxManager().createSystemSession("test", LoggerFactory.getLogger("Test"));
         session.close();
     }
 
Index: memory/pom.xml
===================================================================
--- memory/pom.xml	(revision 1075120)
+++ memory/pom.xml	(working copy)
@@ -41,6 +41,16 @@
       <artifactId>apache-james-mailbox-store</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>apache-james-mailbox-api</artifactId>
       <scope>test</scope>
Index: api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java
===================================================================
--- api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java	(revision 1074479)
+++ api/src/test/java/org/apache/james/mailbox/MailboxManagerTest.java	(working copy)
@@ -22,9 +22,9 @@
 
 import junit.framework.Assert;
 
-import org.apache.commons.logging.impl.SimpleLog;
 import org.apache.james.mailbox.mock.MockMailboxManager;
 import org.junit.Test;
+import org.slf4j.LoggerFactory;
 
 /**
  * Test the {@link StoreMailboxManager} methods that 
@@ -54,7 +54,7 @@
 
         setMailboxManager(new MockMailboxManager(getMailboxManager()).getMockMailboxManager());
 
-        MailboxSession mailboxSession = getMailboxManager().createSystemSession("manager", new SimpleLog("testList"));
+        MailboxSession mailboxSession = getMailboxManager().createSystemSession("manager", LoggerFactory.getLogger("testList"));
         getMailboxManager().startProcessingRequest(mailboxSession);
         Assert.assertEquals(MockMailboxManager.EXPECTED_MAILBOXES_COUNT, getMailboxManager().list(mailboxSession).size());
 
Index: api/src/test/java/org/apache/james/mailbox/AbstractStressTest.java
===================================================================
--- api/src/test/java/org/apache/james/mailbox/AbstractStressTest.java	(revision 1074479)
+++ api/src/test/java/org/apache/james/mailbox/AbstractStressTest.java	(working copy)
@@ -27,7 +27,6 @@
 
 import javax.mail.Flags;
 
-import org.apache.commons.logging.impl.SimpleLog;
 import org.apache.james.mailbox.MailboxConstants;
 import org.apache.james.mailbox.MailboxException;
 import org.apache.james.mailbox.MailboxManager;
@@ -35,6 +34,7 @@
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.MessageManager;
 import org.junit.Test;
+import org.slf4j.LoggerFactory;
 
 public abstract class AbstractStressTest {
 
@@ -49,7 +49,7 @@
         final CountDownLatch latch = new CountDownLatch(APPEND_OPERATIONS);
         final ExecutorService pool = Executors.newFixedThreadPool(APPEND_OPERATIONS/2);
         
-        MailboxSession session = getMailboxManager().createSystemSession("test", new SimpleLog("Test"));
+        MailboxSession session = getMailboxManager().createSystemSession("test", LoggerFactory.getLogger("Test"));
         getMailboxManager().startProcessingRequest(session);
         final MailboxPath path = new MailboxPath(MailboxConstants.USER_NAMESPACE, "username", "INBOX");
         getMailboxManager().createMailbox(path, session);
@@ -69,7 +69,7 @@
                     
 
                     try {
-                        MailboxSession session = getMailboxManager().createSystemSession("test", new SimpleLog("Test"));
+                        MailboxSession session = getMailboxManager().createSystemSession("test", LoggerFactory.getLogger("Test"));
 
                         getMailboxManager().startProcessingRequest(session);
                         MessageManager m = getMailboxManager().getMailbox(path, session);
Index: api/src/test/java/org/apache/james/mailbox/mock/MockMailboxManager.java
===================================================================
--- api/src/test/java/org/apache/james/mailbox/mock/MockMailboxManager.java	(revision 1074479)
+++ api/src/test/java/org/apache/james/mailbox/mock/MockMailboxManager.java	(working copy)
@@ -24,12 +24,12 @@
 
 import javax.mail.Flags;
 
-import org.apache.commons.logging.impl.SimpleLog;
 import org.apache.james.mailbox.MailboxException;
 import org.apache.james.mailbox.MailboxManager;
 import org.apache.james.mailbox.MailboxPath;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.MessageManager;
+import org.slf4j.LoggerFactory;
 
 /**
  * A mock mailbox manager.
@@ -114,7 +114,7 @@
                 
                 String folderName = "INBOX";
 
-                MailboxSession mailboxSession = getMockMailboxManager().createSystemSession(user, new SimpleLog("mailboxmanager-test"));
+                MailboxSession mailboxSession = getMockMailboxManager().createSystemSession(user, LoggerFactory.getLogger("mailboxmanager-test"));
                 mailboxPath = new MailboxPath("#private", user, folderName);
                 createMailbox(mailboxSession, mailboxPath);
                 
Index: api/src/test/java/org/apache/james/mailbox/mock/MockMailboxSession.java
===================================================================
--- api/src/test/java/org/apache/james/mailbox/mock/MockMailboxSession.java	(revision 1074479)
+++ api/src/test/java/org/apache/james/mailbox/mock/MockMailboxSession.java	(working copy)
@@ -26,18 +26,18 @@
 import java.util.Map;
 import java.util.Random;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.impl.SimpleLog;
 import org.apache.james.mailbox.MailboxConstants;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.MailboxSession.User;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class MockMailboxSession implements MailboxSession{
 
     private User user;
     private boolean close;
     private Map<Object, Object> attrs = new HashMap<Object, Object>();
-    private SimpleLog log = new SimpleLog("MockLog");
+    private Logger log = LoggerFactory.getLogger("MockLog");
     private final static Random RANDOM = new Random();
 
     private long sessionId = RANDOM.nextLong();
@@ -67,7 +67,7 @@
         return attrs;
     }
 
-    public Log getLog() {
+    public Logger getLog() {
         return log;
     }
 
Index: api/src/test/java/org/apache/james/mailbox/AbstractMailboxManagerTest.java
===================================================================
--- api/src/test/java/org/apache/james/mailbox/AbstractMailboxManagerTest.java	(revision 1074479)
+++ api/src/test/java/org/apache/james/mailbox/AbstractMailboxManagerTest.java	(working copy)
@@ -18,9 +18,9 @@
  ****************************************************************/
 package org.apache.james.mailbox;
 
-import org.apache.commons.logging.impl.SimpleLog;
 import org.junit.Assert;
 import org.junit.Test;
+import org.slf4j.LoggerFactory;
 
 
 /**
@@ -37,7 +37,7 @@
     public void testBasicOperations() throws BadCredentialsException, MailboxException {
         MailboxManager manager = createMailboxManager();
         
-        MailboxSession session = manager.createSystemSession(USER1, new SimpleLog("Mock"));
+        MailboxSession session = manager.createSystemSession(USER1, LoggerFactory.getLogger("Mock"));
         Assert.assertEquals(USER1, session.getUser().getUserName());
         
         manager.startProcessingRequest(session);
Index: api/src/main/java/org/apache/james/mailbox/MailboxSession.java
===================================================================
--- api/src/main/java/org/apache/james/mailbox/MailboxSession.java	(revision 1074479)
+++ api/src/main/java/org/apache/james/mailbox/MailboxSession.java	(working copy)
@@ -24,7 +24,7 @@
 import java.util.Locale;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
 
 /**
  * Mailbox session.
@@ -54,7 +54,7 @@
      * Gets the logger for this session context.
      * @return not null
      */
-    public Log getLog();
+    public Logger getLog();
     
     /**
      * Gets the user executing this session.
Index: api/src/main/java/org/apache/james/mailbox/MailboxManager.java
===================================================================
--- api/src/main/java/org/apache/james/mailbox/MailboxManager.java	(revision 1074479)
+++ api/src/main/java/org/apache/james/mailbox/MailboxManager.java	(working copy)
@@ -21,7 +21,7 @@
 
 import java.util.List;
 
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
 
 
 /**
@@ -158,7 +158,7 @@
      * @throws BadCredentialsException when system access is not allowed for the given user
      * @throws MailboxException when the creation fails for other reasons
      */
-    public MailboxSession createSystemSession(String userName, Log log) throws BadCredentialsException, MailboxException;
+    public MailboxSession createSystemSession(String userName, Logger log) throws BadCredentialsException, MailboxException;
 
     /**
      * Autenticates the given user against the given password.
@@ -172,7 +172,7 @@
      * @throws BadCredentialsException when system access is denighed for the given user
      * @throws MailboxException when the creation fails for other reasons
      */
-    MailboxSession login(String userid, String passwd, Log log) throws BadCredentialsException, MailboxException;
+    MailboxSession login(String userid, String passwd, Logger log) throws BadCredentialsException, MailboxException;
     
     /**
      * <p>Logs the session out, freeing any resources.
Index: api/pom.xml
===================================================================
--- api/pom.xml	(revision 1075120)
+++ api/pom.xml	(working copy)
@@ -33,10 +33,15 @@
       <artifactId>${javax.mail.artifactId}</artifactId>
     </dependency>
     <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit-dep</artifactId>
       <scope>test</scope>
Index: jpa/src/test/java/org/apache/james/mailbox/jpa/JPAMailboxManagerTest.java
===================================================================
--- jpa/src/test/java/org/apache/james/mailbox/jpa/JPAMailboxManagerTest.java	(revision 1074479)
+++ jpa/src/test/java/org/apache/james/mailbox/jpa/JPAMailboxManagerTest.java	(working copy)
@@ -22,7 +22,6 @@
 
 import javax.persistence.EntityManagerFactory;
 
-import org.apache.commons.logging.impl.SimpleLog;
 import org.apache.james.mailbox.BadCredentialsException;
 import org.apache.james.mailbox.MailboxException;
 import org.apache.james.mailbox.MailboxManagerTest;
@@ -40,6 +39,7 @@
 import org.apache.openjpa.persistence.OpenJPAPersistence;
 import org.junit.After;
 import org.junit.Before;
+import org.slf4j.LoggerFactory;
 
 /**
  * JPAMailboxManagerTest that extends the StoreMailboxManagerTest.
@@ -70,7 +70,7 @@
     @After
     public void tearDown() throws BadCredentialsException, MailboxException {
         deleteAllMailboxes();
-        MailboxSession session = getMailboxManager().createSystemSession("test", new SimpleLog("Test"));
+        MailboxSession session = getMailboxManager().createSystemSession("test", LoggerFactory.getLogger("Test"));
         session.close();
         entityManagerFactory.close();
     }
@@ -111,7 +111,7 @@
     }
     
     private void deleteAllMailboxes() throws BadCredentialsException, MailboxException {
-        MailboxSession session = getMailboxManager().createSystemSession("test", new SimpleLog("Test"));
+        MailboxSession session = getMailboxManager().createSystemSession("test", LoggerFactory.getLogger("Test"));
         try {
             ((OpenJPAMailboxManager) mailboxManager).deleteEverything(session);
         } catch (MailboxException e) {
Index: jpa/src/test/java/org/apache/james/mailbox/jpa/JPAStressTest.java
===================================================================
--- jpa/src/test/java/org/apache/james/mailbox/jpa/JPAStressTest.java	(revision 1074479)
+++ jpa/src/test/java/org/apache/james/mailbox/jpa/JPAStressTest.java	(working copy)
@@ -23,7 +23,6 @@
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 
-import org.apache.commons.logging.impl.SimpleLog;
 import org.apache.james.mailbox.AbstractStressTest;
 import org.apache.james.mailbox.MailboxException;
 import org.apache.james.mailbox.MailboxManager;
@@ -41,6 +40,7 @@
 import org.apache.openjpa.persistence.OpenJPAPersistence;
 import org.junit.After;
 import org.junit.Before;
+import org.slf4j.LoggerFactory;
 
 /**
  * Proof of bug https://issues.apache.org/jira/browse/IMAP-137
@@ -95,7 +95,7 @@
     
     @After
     public void tearDown() {
-        MailboxSession session = mailboxManager.createSystemSession("test", new SimpleLog("Test"));
+        MailboxSession session = mailboxManager.createSystemSession("test", LoggerFactory.getLogger("Test"));
         try {
             mailboxManager.deleteEverything(session);
         } catch (MailboxException e) {
Index: jpa/pom.xml
===================================================================
--- jpa/pom.xml	(revision 1075120)
+++ jpa/pom.xml	(working copy)
@@ -77,10 +77,15 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <plugins>
Index: pom.xml
===================================================================
--- pom.xml	(revision 1075101)
+++ pom.xml	(working copy)
@@ -347,6 +347,24 @@
         </exclusions>
       </dependency>
 
+      <!-- 
+        START Logging
+      -->
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+        <version>1.6.1</version>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-simple</artifactId>
+        <version>1.6.1</version>
+        <scope>test</scope>
+      </dependency>
+      <!-- 
+        START Logging
+      -->
+       
       <!--
         Start Commons
       -->
@@ -356,29 +374,6 @@
         <version>${version.commons-collections}</version>
       </dependency>
       <dependency>
-        <groupId>commons-logging</groupId>
-        <artifactId>commons-logging</artifactId>
-        <version>${version.commons-logging}</version>
-        <exclusions>
-          <exclusion>
-            <artifactId>logkit</artifactId>
-            <groupId>logkit</groupId>
-          </exclusion>
-          <exclusion>
-            <artifactId>avalon-framework</artifactId>
-            <groupId>avalon-framework</groupId>
-          </exclusion>
-          <exclusion>
-            <artifactId>log4j</artifactId>
-            <groupId>log4j</groupId>
-          </exclusion>
-          <exclusion>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
         <groupId>commons-lang</groupId>
         <artifactId>commons-lang</artifactId>
         <version>${version.commons-lang}</version>
@@ -531,12 +526,6 @@
         <version>${version.jackrabbit}</version>
         <scope>test</scope>
       </dependency>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-log4j12</artifactId>
-        <version>1.5.7</version>
-        <scope>test</scope>
-      </dependency>
 
       <dependency>
         <groupId>xerces</groupId>
@@ -596,7 +585,6 @@
     <version.javax.persistence>1.0.2</version.javax.persistence>
     <version.commons-lang>2.4</version.commons-lang>
     <version.commons-collections>3.2.1</version.commons-collections>
-    <version.commons-logging>1.1.1</version.commons-logging>
     <version.apache-mime4j>0.6.1</version.apache-mime4j>
     <version.javax.mail>1.4.3</version.javax.mail>
     <version.activation>1.1.1</version.activation>
Index: store/src/main/java/org/apache/james/mailbox/store/MessageSearcher.java
===================================================================
--- store/src/main/java/org/apache/james/mailbox/store/MessageSearcher.java	(revision 1074479)
+++ store/src/main/java/org/apache/james/mailbox/store/MessageSearcher.java	(working copy)
@@ -27,12 +27,12 @@
 import java.nio.charset.IllegalCharsetNameException;
 import java.nio.charset.UnsupportedCharsetException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.james.mailbox.store.streaming.ConfigurableMimeTokenStream;
 import org.apache.james.mime4j.MimeException;
 import org.apache.james.mime4j.parser.MimeEntityConfig;
 import org.apache.james.mime4j.parser.MimeTokenStream;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Searches an email for content. This class should be safe for use by
@@ -40,7 +40,7 @@
  */
 public class MessageSearcher {
 
-    private Log logger;
+    private Logger logger;
 
     private CharSequence searchContent = null;
 
@@ -138,7 +138,7 @@
         }
         final boolean result;
         if (searchContent == null || "".equals(searchContent)) {
-            final Log logger = getLogger();
+            final Logger logger = getLogger();
             logger.debug("Nothing to search for. ");
             result = false;
         } else {
@@ -226,7 +226,7 @@
     }
 
     protected void handle(Exception e) throws IOException, MimeException {
-        final Log logger = getLogger();
+        final Logger logger = getLogger();
         logger.warn("Cannot read MIME body.");
         logger.debug("Failed to read body.", e);
     }
@@ -264,14 +264,14 @@
         return result;
     }
 
-    public final Log getLogger() {
+    public final Logger getLogger() {
         if (logger == null) {
-            logger = LogFactory.getLog(MessageSearcher.class);
+            logger = LoggerFactory.getLogger(MessageSearcher.class);
         }
         return logger;
     }
 
-    public final void setLogger(Log logger) {
+    public final void setLogger(Logger logger) {
         this.logger = logger;
     }
 }
Index: store/src/main/java/org/apache/james/mailbox/store/MessageSearches.java
===================================================================
--- store/src/main/java/org/apache/james/mailbox/store/MessageSearches.java	(revision 1074479)
+++ store/src/main/java/org/apache/james/mailbox/store/MessageSearches.java	(working copy)
@@ -32,8 +32,6 @@
 
 import javax.mail.Flags;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.james.mailbox.MailboxException;
 import org.apache.james.mailbox.SearchQuery;
 import org.apache.james.mailbox.UnsupportedSearchException;
@@ -44,24 +42,26 @@
 import org.apache.james.mime4j.field.datetime.DateTime;
 import org.apache.james.mime4j.field.datetime.parser.DateTimeParser;
 import org.apache.james.mime4j.field.datetime.parser.ParseException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Uility methods to help perform search operations.
  */
 public class MessageSearches {
 
-    private Log log;
+    private Logger log;
 
     private boolean isCustomLog = false;
 
-    public final Log getLog() {
+    public final Logger getLog() {
         if (log == null) {
-            log = LogFactory.getLog(MessageSearches.class);
+            log = LoggerFactory.getLogger(MessageSearches.class);
         }
         return log;
     }
 
-    public final void setLog(Log log) {
+    public final void setLog(Logger log) {
         isCustomLog = true;
         this.log = log;
     }
Index: store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java
===================================================================
--- store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java	(revision 1074479)
+++ store/src/main/java/org/apache/james/mailbox/store/StoreMailboxManager.java	(working copy)
@@ -25,8 +25,6 @@
 import java.util.Locale;
 import java.util.Random;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.james.mailbox.BadCredentialsException;
 import org.apache.james.mailbox.MailboxConstants;
 import org.apache.james.mailbox.MailboxException;
@@ -52,6 +50,8 @@
 import org.apache.james.mailbox.store.transaction.TransactionalMapper;
 import org.apache.james.mailbox.util.MailboxEventDispatcher;
 import org.apache.james.mailbox.util.SimpleMailboxMetaData;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This abstract base class of an {@link MailboxManager} implementation provides a high-level api for writing your own
@@ -73,7 +73,7 @@
     private final Authenticator authenticator;
     private final static Random RANDOM = new Random();
     
-    private Log log = LogFactory.getLog("org.apache.james.mailbox");
+    private Logger log = LoggerFactory.getLogger("org.apache.james.mailbox");
 
     private MailboxPathLocker locker;
 
@@ -118,11 +118,11 @@
     }
     
     
-    protected Log getLog() {
+    protected Logger getLog() {
         return log;
     }
 
-    public void setLog(Log log) {
+    public void setLog(Logger log) {
         this.log = log;
     }
 
@@ -137,9 +137,9 @@
     
     /*
      * (non-Javadoc)
-     * @see org.apache.james.mailbox.MailboxManager#createSystemSession(java.lang.String, org.apache.commons.logging.Log)
+     * @see org.apache.james.mailbox.MailboxManager#createSystemSession(java.lang.String, org.slf4j.Logger)
      */
-    public MailboxSession createSystemSession(String userName, Log log) {
+    public MailboxSession createSystemSession(String userName, Logger log) {
         return createSession(userName, null, log);
     }
 
@@ -150,7 +150,7 @@
      * @param log
      * @return session
      */
-    private MailboxSession createSession(String userName, String password, Log log) {
+    private MailboxSession createSession(String userName, String password, Logger log) {
         return new SimpleMailboxSession(randomId(), userName, password, log, new ArrayList<Locale>(), getDelimiter());
     }
 
@@ -184,9 +184,9 @@
     
     /*
      * (non-Javadoc)
-     * @see org.apache.james.mailbox.MailboxManager#login(java.lang.String, java.lang.String, org.apache.commons.logging.Log)
+     * @see org.apache.james.mailbox.MailboxManager#login(java.lang.String, java.lang.String, org.slf4j.Logger)
      */
-    public MailboxSession login(String userid, String passwd, Log log) throws BadCredentialsException, MailboxException {
+    public MailboxSession login(String userid, String passwd, Logger log) throws BadCredentialsException, MailboxException {
         if (login(userid, passwd)) {
             return createSession(userid, passwd, log);
         } else {
@@ -314,7 +314,7 @@
      * @see org.apache.james.mailbox.MailboxManager#renameMailbox(org.apache.james.imap.api.MailboxPath, org.apache.james.imap.api.MailboxPath, org.apache.james.mailbox.MailboxSession)
      */
     public void renameMailbox(final MailboxPath from, final MailboxPath to, final MailboxSession session) throws MailboxException {
-        final Log log = getLog();
+        final Logger log = getLog();
         if (log.isDebugEnabled())
             log.debug("renameMailbox " + from + " to " + to);
         if (mailboxExists(to, session)) {
Index: store/src/main/java/org/apache/james/mailbox/store/SearchQueryIterator.java
===================================================================
--- store/src/main/java/org/apache/james/mailbox/store/SearchQueryIterator.java	(revision 1074479)
+++ store/src/main/java/org/apache/james/mailbox/store/SearchQueryIterator.java	(working copy)
@@ -21,10 +21,10 @@
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
-import org.apache.commons.logging.Log;
 import org.apache.james.mailbox.MailboxException;
 import org.apache.james.mailbox.SearchQuery;
 import org.apache.james.mailbox.store.mail.model.MailboxMembership;
+import org.slf4j.Logger;
 
 /**
  * {@link Iterator} implementation which use a {@link MessageSearches} instance to lazy 
@@ -44,7 +44,7 @@
         this(it, query, null);
     }
 
-    public SearchQueryIterator(Iterator<MailboxMembership<?>> it, SearchQuery query, Log log) {
+    public SearchQueryIterator(Iterator<MailboxMembership<?>> it, SearchQuery query, Logger log) {
         this.it = it;
         this.query = query;
         if (log != null) {
Index: store/src/main/java/org/apache/james/mailbox/store/SimpleMailboxSession.java
===================================================================
--- store/src/main/java/org/apache/james/mailbox/store/SimpleMailboxSession.java	(revision 1074479)
+++ store/src/main/java/org/apache/james/mailbox/store/SimpleMailboxSession.java	(working copy)
@@ -26,9 +26,9 @@
 import java.util.Locale;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
 import org.apache.james.mailbox.MailboxConstants;
 import org.apache.james.mailbox.MailboxSession;
+import org.slf4j.Logger;
 
 /**
  * Describes a mailbox session.
@@ -43,7 +43,7 @@
     
     private final long sessionId;
     
-    private final Log log;
+    private final Logger log;
 
     private final String userName;
     
@@ -58,12 +58,12 @@
     private final char pathSeparator;
 
     public SimpleMailboxSession(final long sessionId, final String userName, final String password,
-            final Log log, final List<Locale> localePreferences, char pathSeparator) {
+            final Logger log, final List<Locale> localePreferences, char pathSeparator) {
         this(sessionId, userName, password, log, localePreferences, new ArrayList<String>(), null, pathSeparator);
     }
 
     public SimpleMailboxSession(final long sessionId, final String userName, final String password,
-            final Log log, final List<Locale> localePreferences, List<String> sharedSpaces, String otherUsersSpace, char pathSeparator) {
+            final Logger log, final List<Locale> localePreferences, List<String> sharedSpaces, String otherUsersSpace, char pathSeparator) {
         this.sessionId = sessionId;
         this.log = log;
         this.userName = userName;
@@ -86,7 +86,7 @@
      * (non-Javadoc)
      * @see org.apache.james.mailbox.MailboxSession#getLog()
      */
-    public Log getLog() {
+    public Logger getLog() {
         return log;
     }
 
Index: store/pom.xml
===================================================================
--- store/pom.xml	(revision 1075120)
+++ store/pom.xml	(working copy)
@@ -37,8 +37,8 @@
       <artifactId>apache-mime4j</artifactId>
     </dependency>
     <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
     </dependency>
     <dependency>
       <groupId>${javax.mail.groupId}</groupId>
Index: tool/src/test/java/org/apache/james/mailbox/copier/MailboxCopierTest.java
===================================================================
--- tool/src/test/java/org/apache/james/mailbox/copier/MailboxCopierTest.java	(revision 1074479)
+++ tool/src/test/java/org/apache/james/mailbox/copier/MailboxCopierTest.java	(working copy)
@@ -28,7 +28,6 @@
 
 import junit.framework.Assert;
 
-import org.apache.commons.logging.impl.SimpleLog;
 import org.apache.james.mailbox.BadCredentialsException;
 import org.apache.james.mailbox.MailboxException;
 import org.apache.james.mailbox.MailboxManager;
@@ -43,6 +42,7 @@
 import org.apache.james.mailbox.store.Authenticator;
 import org.junit.Before;
 import org.junit.Test;
+import org.slf4j.LoggerFactory;
 
 /**
  * Test class for the {@link MailboxCopierImpl} implementation.
@@ -81,7 +81,7 @@
     public void setup() throws BadCredentialsException, MailboxException {
         
         mailboxCopier = new MailboxCopierImpl();
-        mailboxCopier.setLog(new SimpleLog(MailboxCopierTest.class.getName()));
+        mailboxCopier.setLog(LoggerFactory.getLogger(MailboxCopierTest.class.getName()));
         
         srcMemMailboxManager = newInMemoryMailboxManager();
         dstMemMailboxManager = newInMemoryMailboxManager();
@@ -123,7 +123,7 @@
      */
     private void assertMailboxManagerSize(MailboxManager mailboxManager, int multiplicationFactor) throws BadCredentialsException, MailboxException {
         
-        MailboxSession mailboxSession = mailboxManager.createSystemSession("manager", new SimpleLog("src-mailbox-copier"));        
+        MailboxSession mailboxSession = mailboxManager.createSystemSession("manager", LoggerFactory.getLogger("src-mailbox-copier"));        
         mailboxManager.startProcessingRequest(mailboxSession);
 
         List<MailboxPath> mailboxPathList = mailboxManager.list(mailboxSession);
Index: tool/src/main/java/org/apache/james/mailbox/copier/MailboxCopierImpl.java
===================================================================
--- tool/src/main/java/org/apache/james/mailbox/copier/MailboxCopierImpl.java	(revision 1074479)
+++ tool/src/main/java/org/apache/james/mailbox/copier/MailboxCopierImpl.java	(working copy)
@@ -25,8 +25,6 @@
 
 import javax.mail.Flags.Flag;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.james.mailbox.MailboxException;
 import org.apache.james.mailbox.MailboxExistsException;
 import org.apache.james.mailbox.MailboxManager;
@@ -37,6 +35,8 @@
 import org.apache.james.mailbox.MessageResult;
 import org.apache.james.mailbox.store.streaming.InputStreamContent;
 import org.apache.james.mailbox.util.FetchGroupImpl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Implementation of the {@link MailboxCopier} interface.
@@ -47,7 +47,7 @@
     /**
      * The logger.
      */
-    private Log log = LogFactory.getLog(MailboxCopierImpl.class.getName());
+    private Logger log = LoggerFactory.getLogger(MailboxCopierImpl.class.getName());
 
     /*
      * (non-Javadoc)
@@ -141,7 +141,7 @@
      * 
      * @param log
      */
-    public void setLog(Log log) {
+    public void setLog(Logger log) {
         this.log = log;
     }
 
Index: tool/src/main/java/org/apache/james/mailbox/jpa/migrator/JpaMigrator.java
===================================================================
--- tool/src/main/java/org/apache/james/mailbox/jpa/migrator/JpaMigrator.java	(revision 1074479)
+++ tool/src/main/java/org/apache/james/mailbox/jpa/migrator/JpaMigrator.java	(working copy)
@@ -42,7 +42,7 @@
      * You can also invoke with many JIRA at once. They will be all serially executed.</p>
      * 
      * TODO Extract the SQL in JAVA classes to XML file.
-     * TODO Log with log4j.
+     * TODO Log with slf4j.
      * 
      * @param the JIRAs numbers
      * @throws JpaMigrateException 
Index: tool/pom.xml
===================================================================
--- tool/pom.xml	(revision 1075120)
+++ tool/pom.xml	(working copy)
@@ -41,10 +41,14 @@
       <artifactId>apache-james-mailbox-memory</artifactId>
     </dependency>
     <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>apache-james-mailbox-api</artifactId>
       <scope>test</scope>
Index: jcr/src/test/java/org/apache/james/mailbox/jcr/JCRStressTest.java
===================================================================
--- jcr/src/test/java/org/apache/james/mailbox/jcr/JCRStressTest.java	(revision 1074479)
+++ jcr/src/test/java/org/apache/james/mailbox/jcr/JCRStressTest.java	(working copy)
@@ -22,7 +22,6 @@
 
 import javax.jcr.RepositoryException;
 
-import org.apache.commons.logging.impl.SimpleLog;
 import org.apache.jackrabbit.core.RepositoryImpl;
 import org.apache.jackrabbit.core.config.RepositoryConfig;
 import org.apache.james.mailbox.AbstractStressTest;
@@ -32,6 +31,7 @@
 import org.apache.james.mailbox.jcr.mail.JCRCachingUidProvider;
 import org.junit.After;
 import org.junit.Before;
+import org.slf4j.LoggerFactory;
 import org.xml.sax.InputSource;
 
 public class JCRStressTest extends AbstractStressTest {
@@ -65,7 +65,7 @@
     
     @After
     public void tearDown() {
-        MailboxSession session = mailboxManager.createSystemSession("test", new SimpleLog("Test"));
+        MailboxSession session = mailboxManager.createSystemSession("test", LoggerFactory.getLogger("Test"));
         session.close();
         repository.shutdown();
         new File(JACKRABBIT_HOME).delete();
Index: jcr/src/test/java/org/apache/james/mailbox/jcr/JCRMailboxManagerTest.java
===================================================================
--- jcr/src/test/java/org/apache/james/mailbox/jcr/JCRMailboxManagerTest.java	(revision 1074479)
+++ jcr/src/test/java/org/apache/james/mailbox/jcr/JCRMailboxManagerTest.java	(working copy)
@@ -24,7 +24,6 @@
 
 import junit.framework.Assert;
 
-import org.apache.commons.logging.impl.SimpleLog;
 import org.apache.jackrabbit.core.RepositoryImpl;
 import org.apache.jackrabbit.core.config.ConfigurationException;
 import org.apache.jackrabbit.core.config.RepositoryConfig;
@@ -35,6 +34,7 @@
 import org.apache.james.mailbox.jcr.mail.JCRCachingUidProvider;
 import org.junit.After;
 import org.junit.Before;
+import org.slf4j.LoggerFactory;
 import org.xml.sax.InputSource;
 
 /**
@@ -64,7 +64,7 @@
      */
     @After
     public void tearDown() throws BadCredentialsException, MailboxException {
-        MailboxSession session = getMailboxManager().createSystemSession("test", new SimpleLog("Test"));
+        MailboxSession session = getMailboxManager().createSystemSession("test", LoggerFactory.getLogger("Test"));
         session.close();
         repository.shutdown();
         new File(JACKRABBIT_HOME).delete();
Index: jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMailboxMapper.java
===================================================================
--- jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMailboxMapper.java	(revision 1074479)
+++ jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMailboxMapper.java	(working copy)
@@ -29,7 +29,6 @@
 import javax.jcr.query.QueryManager;
 import javax.jcr.query.QueryResult;
 
-import org.apache.commons.logging.Log;
 import org.apache.jackrabbit.JcrConstants;
 import org.apache.jackrabbit.commons.JcrUtils;
 import org.apache.jackrabbit.util.ISO9075;
@@ -43,6 +42,7 @@
 import org.apache.james.mailbox.jcr.mail.model.JCRMailbox;
 import org.apache.james.mailbox.store.mail.MailboxMapper;
 import org.apache.james.mailbox.store.mail.model.Mailbox;
+import org.slf4j.Logger;
 
 /**
  * JCR implementation of a MailboxMapper
@@ -52,7 +52,7 @@
 public class JCRMailboxMapper extends AbstractJCRScalingMapper implements MailboxMapper<String> {
 
 
-	public JCRMailboxMapper(final MailboxSessionJCRRepository repos, MailboxSession session, final int scaling, final Log logger) {
+	public JCRMailboxMapper(final MailboxSessionJCRRepository repos, MailboxSession session, final int scaling, final Logger logger) {
         super(repos, session, scaling, logger);
     }
 
Index: jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMessage.java
===================================================================
--- jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMessage.java	(revision 1074479)
+++ jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMessage.java	(working copy)
@@ -32,7 +32,6 @@
 import javax.jcr.RepositoryException;
 import javax.mail.Flags;
 
-import org.apache.commons.logging.Log;
 import org.apache.jackrabbit.JcrConstants;
 import org.apache.jackrabbit.commons.JcrUtils;
 import org.apache.james.mailbox.MailboxException;
@@ -46,6 +45,7 @@
 import org.apache.james.mailbox.store.mail.model.PropertyBuilder;
 import org.apache.james.mailbox.store.streaming.LazySkippingInputStream;
 import org.apache.james.mailbox.store.streaming.StreamUtils;
+import org.slf4j.Logger;
 
 /**
  * JCR implementation of {@link Message}
@@ -54,7 +54,7 @@
 public class JCRMessage extends AbstractMessage implements MailboxMembership<String>, JCRImapConstants, Persistent{
 
     private Node node;
-    private final Log logger;
+    private final Logger logger;
     private InputStream content;
     private List<JCRHeader> headers;
     private String mediaType;
@@ -94,14 +94,14 @@
     public final static String TEXTUAL_LINE_COUNT_PROPERTY  = "jamesMailbox:messageTextualLineCount";
     public final static String SUBTYPE_PROPERTY  = "jamesMailbox:messageSubType";
 
-    public JCRMessage(Node node, Log logger) {
+    public JCRMessage(Node node, Logger logger) {
         this.logger= logger;
         this.node = node;
     }
     
     public JCRMessage(String mailboxUUID, long uid, Date internalDate, int size, Flags flags, InputStream content,
             int bodyStartOctet, final List<JCRHeader> headers,
-            final PropertyBuilder propertyBuilder, Log logger) {
+            final PropertyBuilder propertyBuilder, Logger logger) {
         super();
         this.mailboxUUID = mailboxUUID;
         this.internalDate = internalDate;
@@ -132,7 +132,7 @@
      * @param message
      * @throws IOException 
      */
-    public JCRMessage(String mailboxUUID, long uid,  JCRMessage message, Log logger) throws MailboxException {
+    public JCRMessage(String mailboxUUID, long uid,  JCRMessage message, Logger logger) throws MailboxException {
         this.mailboxUUID = mailboxUUID;
         this.internalDate = message.getInternalDate();
         this.size = message.getFullContentOctets();
Index: jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRProperty.java
===================================================================
--- jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRProperty.java	(revision 1074479)
+++ jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRProperty.java	(working copy)
@@ -21,12 +21,11 @@
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
-import org.apache.commons.logging.Log;
-
 import org.apache.james.mailbox.jcr.JCRImapConstants;
 import org.apache.james.mailbox.jcr.Persistent;
 import org.apache.james.mailbox.store.mail.model.AbstractComparableProperty;
 import org.apache.james.mailbox.store.mail.model.Property;
+import org.slf4j.Logger;
 
 /**
  * JCR implementation of {@link Property}
@@ -35,7 +34,7 @@
 public class JCRProperty extends AbstractComparableProperty<JCRProperty> implements JCRImapConstants, Persistent {
 
     private Node node;
-    private final Log logger;
+    private final Logger logger;
     private String namespace;
     private String localName;
     private String value;
@@ -46,12 +45,12 @@
     public final static String VALUE_PROPERTY =  "jamesMailbox:propertyValue";
     public final static String ORDER_PROPERTY =  "jamesMailbox:propertyOrder";
 
-    public JCRProperty(final Node node, final Log logger) {
+    public JCRProperty(final Node node, final Logger logger) {
         this.node = node;
         this.logger = logger;
     }
 
-    public JCRProperty(final String namespace, final String localName, final String value, final int order, Log logger) {
+    public JCRProperty(final String namespace, final String localName, final String value, final int order, Logger logger) {
         this.namespace = namespace;
         this.localName = localName;
         this.value = value;
@@ -59,7 +58,7 @@
         this.logger = logger;
     }
 
-    public JCRProperty(Property property, int order, Log logger) {
+    public JCRProperty(Property property, int order, Logger logger) {
         this(property.getNamespace(), property.getLocalName(), property.getValue(), order, logger);
     }
     /*
Index: jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRHeader.java
===================================================================
--- jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRHeader.java	(revision 1074479)
+++ jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRHeader.java	(working copy)
@@ -21,11 +21,11 @@
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
-import org.apache.commons.logging.Log;
 import org.apache.james.mailbox.jcr.JCRImapConstants;
 import org.apache.james.mailbox.jcr.Persistent;
 import org.apache.james.mailbox.store.mail.model.AbstractComparableHeader;
 import org.apache.james.mailbox.store.mail.model.Header;
+import org.slf4j.Logger;
 
 /**
  * JCR implementation of a {@link Header}
@@ -42,25 +42,25 @@
     private String fieldName;
     private String value;
     private int lineNumber;
-    private Log logger;
+    private Logger logger;
     private Node node;
     
     /**
      * Copies the content of an existing header.
      * @param header
      */
-    public JCRHeader(Header header, Log logger) {
+    public JCRHeader(Header header, Logger logger) {
         this(header.getLineNumber(), header.getFieldName(), header.getValue(), logger);
     }
     
-    public JCRHeader(Node node, Log logger) {
+    public JCRHeader(Node node, Logger logger) {
         this.node = node;
         this.logger = logger;
     }
     
     
     
-    public JCRHeader(final int lineNumber, final String fieldName, final String value, Log logger) {
+    public JCRHeader(final int lineNumber, final String fieldName, final String value, Logger logger) {
         this.fieldName = fieldName;
         this.value = value;
         this.lineNumber = lineNumber;
Index: jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailbox.java
===================================================================
--- jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailbox.java	(revision 1074479)
+++ jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMailbox.java	(working copy)
@@ -21,13 +21,13 @@
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
-import org.apache.commons.logging.Log;
 import org.apache.jackrabbit.JcrConstants;
 import org.apache.jackrabbit.util.Text;
 import org.apache.james.mailbox.MailboxPath;
 import org.apache.james.mailbox.jcr.JCRImapConstants;
 import org.apache.james.mailbox.jcr.Persistent;
 import org.apache.james.mailbox.store.mail.model.Mailbox;
+import org.slf4j.Logger;
 
 
 /**
@@ -45,7 +45,7 @@
 
     private String name;
     private long uidValidity;
-    private final Log logger;
+    private final Logger logger;
     private Node node;
 
 
@@ -53,7 +53,7 @@
     private String user;
     
     
-    public JCRMailbox( final MailboxPath path, final long uidValidity, Log logger) {
+    public JCRMailbox( final MailboxPath path, final long uidValidity, Logger logger) {
         this.name = path.getName();
         this.namespace = path.getNamespace();
         this.user = path.getUser();
@@ -61,12 +61,12 @@
         this.logger = logger;
     }
     
-    public JCRMailbox( final Node node, final Log logger) {
+    public JCRMailbox( final Node node, final Logger logger) {
         this.node = node;
         this.logger = logger;
     }
     
-    public Log getLog() {
+    public Logger getLog() {
         return logger;
     }
 
Index: jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.java
===================================================================
--- jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.java	(revision 1074479)
+++ jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMessageMapper.java	(working copy)
@@ -34,7 +34,6 @@
 import javax.jcr.query.QueryResult;
 import javax.mail.Flags;
 
-import org.apache.commons.logging.Log;
 import org.apache.jackrabbit.commons.JcrUtils;
 import org.apache.jackrabbit.util.ISO9075;
 import org.apache.james.mailbox.MailboxException;
@@ -52,6 +51,7 @@
 import org.apache.james.mailbox.store.mail.model.Mailbox;
 import org.apache.james.mailbox.store.mail.model.MailboxMembership;
 import org.apache.james.mailbox.store.mail.model.UpdatedFlags;
+import org.slf4j.Logger;
 
 /**
  * JCR implementation of a {@link MessageMapper}. The implementation store each message as 
@@ -104,12 +104,12 @@
      * @param session {@link MailboxSession} to which the mapper is bound
      * @param logger Log
      */
-    public JCRMessageMapper(final MailboxSessionJCRRepository repos, MailboxSession session, final Log logger, int scaleType) {
+    public JCRMessageMapper(final MailboxSessionJCRRepository repos, MailboxSession session, final Logger logger, int scaleType) {
         super(repos, session, logger);
         this.scaleType = scaleType;
     }
     
-    public JCRMessageMapper(final MailboxSessionJCRRepository repos, MailboxSession session, final Log logger) {
+    public JCRMessageMapper(final MailboxSessionJCRRepository repos, MailboxSession session, final Logger logger) {
         this(repos, session, logger, MESSAGE_SCALE_DAY);
     }
     
Index: jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxManager.java
===================================================================
--- jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxManager.java	(revision 1074479)
+++ jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxManager.java	(working copy)
@@ -18,8 +18,6 @@
  ****************************************************************/
 package org.apache.james.mailbox.jcr;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.james.mailbox.MailboxException;
 import org.apache.james.mailbox.MailboxPath;
 import org.apache.james.mailbox.MailboxPathLocker;
@@ -32,6 +30,8 @@
 import org.apache.james.mailbox.store.mail.UidProvider;
 import org.apache.james.mailbox.store.mail.model.Mailbox;
 import org.apache.james.mailbox.util.MailboxEventDispatcher;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * JCR implementation of a MailboxManager
@@ -40,7 +40,7 @@
 public class JCRMailboxManager extends StoreMailboxManager<String> implements JCRImapConstants {
 
     private final JCRMailboxSessionMapperFactory mapperFactory;
-    private final Log logger = LogFactory.getLog(JCRMailboxManager.class);
+    private final Logger logger = LoggerFactory.getLogger(JCRMailboxManager.class);
     
     public JCRMailboxManager(JCRMailboxSessionMapperFactory mapperFactory, final Authenticator authenticator, final UidProvider<String> uidProvider) {
 	    this(mapperFactory, authenticator, uidProvider, new JVMMailboxPathLocker());
Index: jcr/src/main/java/org/apache/james/mailbox/jcr/AbstractJCRMapper.java
===================================================================
--- jcr/src/main/java/org/apache/james/mailbox/jcr/AbstractJCRMapper.java	(revision 1074479)
+++ jcr/src/main/java/org/apache/james/mailbox/jcr/AbstractJCRMapper.java	(working copy)
@@ -21,10 +21,10 @@
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
-import org.apache.commons.logging.Log;
 import org.apache.james.mailbox.MailboxException;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.store.transaction.TransactionalMapper;
+import org.slf4j.Logger;
 
 /**
  * Abstract Mapper base class for Level 1 Implementations of JCR. So no real transaction management is used. 
@@ -35,12 +35,12 @@
 public abstract class AbstractJCRMapper extends TransactionalMapper implements JCRImapConstants {
     public final static String MAILBOXES_PATH =  "mailboxes";
 
-    private final Log logger;
+    private final Logger logger;
     private final MailboxSessionJCRRepository repository;
     protected final MailboxSession mSession;
 
     
-    public AbstractJCRMapper(final MailboxSessionJCRRepository repository, MailboxSession mSession, Log logger) {
+    public AbstractJCRMapper(final MailboxSessionJCRRepository repository, MailboxSession mSession, Logger logger) {
         this.repository = repository;
         this.mSession = mSession;
         this.logger = logger;
@@ -51,7 +51,7 @@
      * 
      * @return logger
      */
-    protected Log getLogger() {
+    protected Logger getLogger() {
         return logger;
     }
     
Index: jcr/src/main/java/org/apache/james/mailbox/jcr/AbstractJCRScalingMapper.java
===================================================================
--- jcr/src/main/java/org/apache/james/mailbox/jcr/AbstractJCRScalingMapper.java	(revision 1074479)
+++ jcr/src/main/java/org/apache/james/mailbox/jcr/AbstractJCRScalingMapper.java	(working copy)
@@ -21,9 +21,9 @@
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
-import org.apache.commons.logging.Log;
 import org.apache.jackrabbit.commons.JcrUtils;
 import org.apache.james.mailbox.MailboxSession;
+import org.slf4j.Logger;
 
 /**
  * Abstract base class for Mapper's which support scaling 
@@ -34,7 +34,7 @@
     private final int scaling;
     private final static char PAD ='_';
     
-    public AbstractJCRScalingMapper(MailboxSessionJCRRepository repository, MailboxSession mSession, int scaling, Log logger) {
+    public AbstractJCRScalingMapper(MailboxSessionJCRRepository repository, MailboxSession mSession, int scaling, Logger logger) {
         super(repository, mSession, logger);
         this.scaling = scaling;
     }
Index: jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxSessionMapperFactory.java
===================================================================
--- jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxSessionMapperFactory.java	(revision 1074479)
+++ jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxSessionMapperFactory.java	(working copy)
@@ -18,9 +18,6 @@
  ****************************************************************/
 package org.apache.james.mailbox.jcr;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
 import org.apache.james.mailbox.MailboxException;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.SubscriptionException;
@@ -31,6 +28,8 @@
 import org.apache.james.mailbox.store.mail.MailboxMapper;
 import org.apache.james.mailbox.store.mail.MessageMapper;
 import org.apache.james.mailbox.store.user.SubscriptionMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * JCR implementation of a {@link MailboxSessionMapperFactory}
@@ -40,7 +39,7 @@
 public class JCRMailboxSessionMapperFactory extends MailboxSessionMapperFactory<String> {
 
     private final MailboxSessionJCRRepository repository;
-    private final Log logger;
+    private final Logger logger;
     private final static int DEFAULT_SCALING = 2;
     private final int scaling;
     private int messageScaling;
@@ -51,7 +50,7 @@
 
     public JCRMailboxSessionMapperFactory(final MailboxSessionJCRRepository repository, final int scaling, final int messageScaling) {
         this.repository = repository;
-        this.logger = LogFactory.getLog(JCRMailboxSessionMapperFactory.class);
+        this.logger = LoggerFactory.getLogger(JCRMailboxSessionMapperFactory.class);
         this.scaling = scaling;
         this.messageScaling = messageScaling;
     }
Index: jcr/src/main/java/org/apache/james/mailbox/jcr/user/model/JCRSubscription.java
===================================================================
--- jcr/src/main/java/org/apache/james/mailbox/jcr/user/model/JCRSubscription.java	(revision 1074479)
+++ jcr/src/main/java/org/apache/james/mailbox/jcr/user/model/JCRSubscription.java	(working copy)
@@ -27,10 +27,10 @@
 import javax.jcr.RepositoryException;
 import javax.jcr.Value;
 
-import org.apache.commons.logging.Log;
 import org.apache.james.mailbox.jcr.JCRImapConstants;
 import org.apache.james.mailbox.jcr.Persistent;
 import org.apache.james.mailbox.store.user.model.Subscription;
+import org.slf4j.Logger;
 
 /**
  * JCR implementation of a {@link Subscription}.
@@ -42,18 +42,18 @@
     public final static String MAILBOXES_PROPERTY =  "jamesMailbox:subscriptionMailboxes";
     
     private Node node;
-    private final Log log;
+    private final Logger log;
     private String mailbox;
     private String username;
 
     
-    public JCRSubscription(Node node, String mailbox, Log log) {
+    public JCRSubscription(Node node, String mailbox, Logger log) {
         this.node = node;
         this.log = log;
         this.mailbox = mailbox;
     }
 
-    public JCRSubscription(String username, String mailbox, Log log) {
+    public JCRSubscription(String username, String mailbox, Logger log) {
         this.username = username;
         this.mailbox = mailbox;
         this.log = log;
Index: jcr/src/main/java/org/apache/james/mailbox/jcr/user/JCRSubscriptionMapper.java
===================================================================
--- jcr/src/main/java/org/apache/james/mailbox/jcr/user/JCRSubscriptionMapper.java	(revision 1074479)
+++ jcr/src/main/java/org/apache/james/mailbox/jcr/user/JCRSubscriptionMapper.java	(working copy)
@@ -31,7 +31,6 @@
 import javax.jcr.query.QueryManager;
 import javax.jcr.query.QueryResult;
 
-import org.apache.commons.logging.Log;
 import org.apache.jackrabbit.commons.JcrUtils;
 import org.apache.jackrabbit.util.Text;
 import org.apache.james.mailbox.MailboxConstants;
@@ -42,6 +41,7 @@
 import org.apache.james.mailbox.jcr.user.model.JCRSubscription;
 import org.apache.james.mailbox.store.user.SubscriptionMapper;
 import org.apache.james.mailbox.store.user.model.Subscription;
+import org.slf4j.Logger;
 
 /**
  * JCR implementation of a SubscriptionManager
@@ -49,7 +49,7 @@
  */
 public class JCRSubscriptionMapper extends AbstractJCRScalingMapper implements SubscriptionMapper {
 
-    public JCRSubscriptionMapper(final MailboxSessionJCRRepository repos, MailboxSession session, final int scaling, final Log log) {
+    public JCRSubscriptionMapper(final MailboxSessionJCRRepository repos, MailboxSession session, final int scaling, final Logger log) {
         super(repos,session, scaling, log);
     }
 
Index: jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMessageManager.java
===================================================================
--- jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMessageManager.java	(revision 1074479)
+++ jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMessageManager.java	(working copy)
@@ -25,7 +25,6 @@
 
 import javax.mail.Flags;
 
-import org.apache.commons.logging.Log;
 import org.apache.james.mailbox.MailboxException;
 import org.apache.james.mailbox.jcr.mail.model.JCRHeader;
 import org.apache.james.mailbox.jcr.mail.model.JCRMailbox;
@@ -36,6 +35,7 @@
 import org.apache.james.mailbox.store.mail.model.MailboxMembership;
 import org.apache.james.mailbox.store.mail.model.PropertyBuilder;
 import org.apache.james.mailbox.util.MailboxEventDispatcher;
+import org.slf4j.Logger;
 
 /**
  * JCR implementation of a {@link MapperStoreMessageManager}
@@ -43,10 +43,10 @@
  */
 public class JCRMessageManager extends StoreMessageManager<String> {
 
-    private final Log log;
+    private final Logger log;
 
     public JCRMessageManager(JCRMailboxSessionMapperFactory mapperFactory, final UidProvider<String> uidProvider,
-            final MailboxEventDispatcher dispatcher, final JCRMailbox mailbox, final Log log, final char delimiter) throws MailboxException {
+            final MailboxEventDispatcher dispatcher, final JCRMailbox mailbox, final Logger log, final char delimiter) throws MailboxException {
         super(mapperFactory, uidProvider, dispatcher, mailbox);
         this.log = log;
     }
Index: jcr/src/main/java/org/apache/james/mailbox/jcr/JCRSubscriptionManager.java
===================================================================
--- jcr/src/main/java/org/apache/james/mailbox/jcr/JCRSubscriptionManager.java	(revision 1074479)
+++ jcr/src/main/java/org/apache/james/mailbox/jcr/JCRSubscriptionManager.java	(working copy)
@@ -18,19 +18,19 @@
  ****************************************************************/
 package org.apache.james.mailbox.jcr;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.james.mailbox.MailboxSession;
 import org.apache.james.mailbox.jcr.user.model.JCRSubscription;
 import org.apache.james.mailbox.store.StoreSubscriptionManager;
 import org.apache.james.mailbox.store.user.model.Subscription;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * JCR implementation of a SubscriptionManager
  */
 public class JCRSubscriptionManager extends StoreSubscriptionManager implements JCRImapConstants {
     
-    private final Log logger = LogFactory.getLog(JCRSubscriptionManager.class);
+    private final Logger logger = LoggerFactory.getLogger(JCRSubscriptionManager.class);
 
     public JCRSubscriptionManager(JCRMailboxSessionMapperFactory mapperFactory) {
         super(mapperFactory);
Index: jcr/pom.xml
===================================================================
--- jcr/pom.xml	(revision 1075120)
+++ jcr/pom.xml	(working copy)
@@ -37,10 +37,15 @@
       <artifactId>apache-james-mailbox-store</artifactId>
     </dependency>
     <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
     </dependency>	
     <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <scope>test</scope>
+    </dependency>   
+    <dependency>
       <groupId>${javax.mail.groupId}</groupId>
       <artifactId>${javax.mail.artifactId}</artifactId>
     </dependency>
@@ -84,11 +89,6 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>apache-james-mailbox-api</artifactId>
       <scope>test</scope>