Index: ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java =================================================================== --- ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java (revision 1074944) +++ ldap/src/main/java/org/apache/james/user/ldap/ReadOnlyUsersLDAPRepository.java (working copy) @@ -37,12 +37,12 @@ import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.HierarchicalConfiguration; -import org.apache.commons.logging.Log; import org.apache.james.lifecycle.api.Configurable; import org.apache.james.lifecycle.api.LogEnabled; import org.apache.james.user.api.UsersRepository; import org.apache.james.user.api.UsersRepositoryException; import org.apache.james.user.api.model.User; +import org.slf4j.Logger; /** *

@@ -213,7 +213,7 @@ */ private SimpleLDAPConnection ldapConnection; - private Log log; + private Logger log; /** *

@@ -587,10 +587,9 @@ * (non-Javadoc) * * @see - * org.apache.james.lifecycle.LogEnabled#setLog(org.apache.commons.logging - * .Log) + * org.apache.james.lifecycle.LogEnabled#setLog(org.slf4j.Logger) */ - public void setLog(Log log) { + public void setLog(Logger log) { this.log = log; } Index: ldap/pom.xml =================================================================== --- ldap/pom.xml (revision 1074944) +++ ldap/pom.xml (working copy) @@ -42,8 +42,8 @@ commons-configuration - commons-logging - commons-logging + org.slf4j + slf4j-api org.apache.geronimo.specs Index: dnsservice-dnsjava/src/test/java/org/apache/james/dnsservice/dnsjava/DNSJavaServiceTest.java =================================================================== --- dnsservice-dnsjava/src/test/java/org/apache/james/dnsservice/dnsjava/DNSJavaServiceTest.java (revision 1074944) +++ dnsservice-dnsjava/src/test/java/org/apache/james/dnsservice/dnsjava/DNSJavaServiceTest.java (working copy) @@ -20,8 +20,8 @@ package org.apache.james.dnsservice.dnsjava; import org.apache.commons.configuration.DefaultConfigurationBuilder; -import org.apache.commons.logging.impl.SimpleLog; import org.apache.james.dnsservice.dnsjava.DNSJavaService; +import org.slf4j.LoggerFactory; import org.xbill.DNS.Cache; import org.xbill.DNS.DClass; import org.xbill.DNS.Lookup; @@ -111,7 +111,7 @@ DefaultConfigurationBuilder db = new DefaultConfigurationBuilder(); db.load(new ByteArrayInputStream("truefalse".getBytes())); - dnsServer.setLog(new SimpleLog("MockLog")); + dnsServer.setLog(LoggerFactory.getLogger("MockLog")); dnsServer.configure(db); dnsServer.init(); Index: dnsservice-dnsjava/src/main/java/org/apache/james/dnsservice/dnsjava/DNSJavaService.java =================================================================== --- dnsservice-dnsjava/src/main/java/org/apache/james/dnsservice/dnsjava/DNSJavaService.java (revision 1074944) +++ dnsservice-dnsjava/src/main/java/org/apache/james/dnsservice/dnsjava/DNSJavaService.java (working copy) @@ -32,12 +32,12 @@ import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.HierarchicalConfiguration; -import org.apache.commons.logging.Log; import org.apache.james.dnsservice.api.DNSServiceMBean; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.dnsservice.api.TemporaryResolutionException; import org.apache.james.lifecycle.api.Configurable; import org.apache.james.lifecycle.api.LogEnabled; +import org.slf4j.Logger; import org.xbill.DNS.ARecord; import org.xbill.DNS.Cache; import org.xbill.DNS.Credibility; @@ -112,14 +112,14 @@ private String localAddress; - private Log logger; + private Logger logger; /* * (non-Javadoc) - * @see org.apache.james.lifecycle.LogEnabled#setLog(org.apache.commons.logging.Log) + * @see org.apache.james.lifecycle.LogEnabled#setLog(org.slf4j.Logger) */ - public void setLog(Log logger) { + public void setLog(Logger logger) { this.logger = logger; } Index: dnsservice-dnsjava/pom.xml =================================================================== --- dnsservice-dnsjava/pom.xml (revision 1074944) +++ dnsservice-dnsjava/pom.xml (working copy) @@ -75,10 +75,15 @@ commons-configuration - commons-logging - commons-logging + org.slf4j + slf4j-api + org.slf4j + slf4j-simple + test + + dnsjava dnsjava Index: pom.xml =================================================================== --- pom.xml (revision 1074944) +++ pom.xml (working copy) @@ -775,29 +775,27 @@ 3.2.1 - commons-logging - commons-logging - ${commons.logging.version} - - - logkit - logkit - - - avalon-framework - avalon-framework - - - log4j - log4j - - - javax.servlet - servlet-api - - + org.slf4j + slf4j-api + 1.6.1 + org.slf4j + slf4j-log4j12 + 1.6.1 + + + org.slf4j + jcl-over-slf4j + 1.6.1 + + + org.slf4j + slf4j-simple + 1.6.1 + test + + commons-lang commons-lang 2.4 @@ -921,7 +919,7 @@ log4j log4j - 1.2.14 + 1.2.16 org.springframework @@ -997,19 +995,6 @@ - org.slf4j - slf4j-log4j12 - 1.5.8 - runtime - - - org.slf4j - slf4j-api - 1.5.8 - runtime - - - org.apache.openjpa openjpa 2.0.1 @@ -1233,10 +1218,9 @@ 3.0.5.RELEASE 0.2-M2-SNAPSHOT 0.2-M2-SNAPSHOT - 1.3 + 1.4-SNAPSHOT 0.4 2.2.2 - 1.1.1 Index: queue-activemq/src/test/java/org/apache/james/queue/activemq/ActiveMQMailQueueTest.java =================================================================== --- queue-activemq/src/test/java/org/apache/james/queue/activemq/ActiveMQMailQueueTest.java (revision 1074944) +++ queue-activemq/src/test/java/org/apache/james/queue/activemq/ActiveMQMailQueueTest.java (working copy) @@ -26,6 +26,8 @@ import org.apache.commons.logging.impl.SimpleLog; import org.apache.james.queue.jms.JMSMailQueue; import org.apache.james.queue.jms.JMSMailQueueTest; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ActiveMQMailQueueTest extends JMSMailQueueTest{ @@ -43,8 +45,9 @@ @Override protected JMSMailQueue createQueue(ConnectionFactory factory, String queueName) { - SimpleLog log = new SimpleLog("MockLog"); - log.setLevel(SimpleLog.LOG_LEVEL_DEBUG); + Logger log = LoggerFactory.getLogger("MockLog"); + // slf4j can't set programmatically any log level. It's just a facade + // log.setLevel(SimpleLog.LOG_LEVEL_DEBUG); ActiveMQMailQueue queue = new ActiveMQMailQueue(factory, queueName, useBlobMessages(),log); return queue; } Index: queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueueItem.java =================================================================== --- queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueueItem.java (revision 1074944) +++ queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueueItem.java (working copy) @@ -28,11 +28,11 @@ import javax.jms.Session; import org.apache.activemq.command.ActiveMQBlobMessage; -import org.apache.commons.logging.Log; import org.apache.james.queue.api.MailQueue.MailQueueException; import org.apache.james.queue.api.MailQueue.MailQueueItem; import org.apache.james.queue.jms.JMSMailQueueItem; import org.apache.mailet.Mail; +import org.slf4j.Logger; /** * ActiveMQ {@link MailQueueItem} implementation which handles Blob-Messages as @@ -42,9 +42,9 @@ public class ActiveMQMailQueueItem extends JMSMailQueueItem implements ActiveMQSupport{ private final Message message; - private final Log logger; + private final Logger logger; - public ActiveMQMailQueueItem(Mail mail, Connection connection, Session session, MessageConsumer consumer, Message message, Log logger) { + public ActiveMQMailQueueItem(Mail mail, Connection connection, Session session, MessageConsumer consumer, Message message, Logger logger) { super(mail, connection, session, consumer); this.message = message; this.logger = logger; Index: queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java =================================================================== --- queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java (revision 1074944) +++ queue-activemq/src/main/java/org/apache/james/queue/activemq/ActiveMQMailQueue.java (working copy) @@ -45,7 +45,6 @@ import org.apache.activemq.BlobMessage; import org.apache.activemq.command.ActiveMQBlobMessage; import org.apache.activemq.util.JMSExceptionSupport; -import org.apache.commons.logging.Log; import org.apache.james.core.MimeMessageCopyOnWriteProxy; import org.apache.james.core.MimeMessageInputStream; import org.apache.james.core.MimeMessageInputStreamSource; @@ -54,6 +53,7 @@ import org.apache.james.queue.api.MailQueue; import org.apache.james.queue.jms.JMSMailQueue; import org.apache.mailet.Mail; +import org.slf4j.Logger; import org.springframework.jms.connection.SessionProxy; /** @@ -94,7 +94,7 @@ * * @see #ActiveMQMailQueue(ConnectionFactory, String, boolean, Log) */ - public ActiveMQMailQueue(final ConnectionFactory connectionFactory, final String queuename, final Log logger) { + public ActiveMQMailQueue(final ConnectionFactory connectionFactory, final String queuename, final Logger logger) { this(connectionFactory, queuename, true, logger); } @@ -110,7 +110,7 @@ * @param logger * @throws NotCompliantMBeanException */ - public ActiveMQMailQueue(final ConnectionFactory connectionFactory, final String queuename, boolean useBlob, final Log logger) { + public ActiveMQMailQueue(final ConnectionFactory connectionFactory, final String queuename, boolean useBlob, final Logger logger) { super(connectionFactory, queuename, logger); this.useBlob = useBlob; } Index: queue-activemq/pom.xml =================================================================== --- queue-activemq/pom.xml (revision 1074944) +++ queue-activemq/pom.xml (working copy) @@ -92,8 +92,8 @@ ${javax.mail.artifactId} - commons-logging - commons-logging + org.slf4j + slf4j-api @@ -108,5 +108,10 @@ test-jar test + + org.slf4j + slf4j-simple + test + Index: mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/camel/CamelCompositeProcessorTest.java =================================================================== --- mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/camel/CamelCompositeProcessorTest.java (revision 1074944) +++ mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/camel/CamelCompositeProcessorTest.java (working copy) @@ -21,12 +21,12 @@ import org.apache.camel.impl.DefaultCamelContext; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.HierarchicalConfiguration; -import org.apache.commons.logging.impl.SimpleLog; import org.apache.james.mailetcontainer.api.mock.MockMailetContext; import org.apache.james.mailetcontainer.api.mock.MockMailetLoader; import org.apache.james.mailetcontainer.api.mock.MockMatcherLoader; import org.apache.james.mailetcontainer.lib.AbstractStateCompositeProcessorTest; import org.apache.james.mailetcontainer.lib.AbstractStateCompositeProcessor; +import org.slf4j.LoggerFactory; public class CamelCompositeProcessorTest extends AbstractStateCompositeProcessorTest{ @@ -34,7 +34,7 @@ protected AbstractStateCompositeProcessor createProcessor(HierarchicalConfiguration config) throws ConfigurationException, Exception { CamelCompositeProcessor processor = new CamelCompositeProcessor(); try { - processor.setLog(new SimpleLog("MockLog")); + processor.setLog(LoggerFactory.getLogger("MockLog")); processor.setCamelContext(new DefaultCamelContext()); processor.setMailetLoader(new MockMailetLoader()); processor.setMatcherLoader(new MockMatcherLoader()); Index: mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/camel/CamelMailetProcessorTest.java =================================================================== --- mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/camel/CamelMailetProcessorTest.java (revision 1074944) +++ mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/camel/CamelMailetProcessorTest.java (working copy) @@ -22,12 +22,13 @@ import org.apache.camel.impl.DefaultCamelContext; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.HierarchicalConfiguration; -import org.apache.commons.logging.impl.SimpleLog; import org.apache.james.mailetcontainer.api.mock.MockMailetContext; import org.apache.james.mailetcontainer.api.mock.MockMailetLoader; import org.apache.james.mailetcontainer.api.mock.MockMatcherLoader; import org.apache.james.mailetcontainer.lib.AbstractStateMailetProcessor; import org.apache.james.mailetcontainer.lib.AbstractStateMailetProcessorTest; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class CamelMailetProcessorTest extends AbstractStateMailetProcessorTest { @@ -36,8 +37,9 @@ CamelMailetProcessor processor = null; try { processor = new CamelMailetProcessor(); - SimpleLog log = new SimpleLog("MockLog"); - log.setLevel(SimpleLog.LOG_LEVEL_DEBUG); + Logger log = LoggerFactory.getLogger("MockLog"); + // slf4j can't set programmatically any log level. It's just a facade + //log.setLevel(SimpleLog.LOG_LEVEL_DEBUG); processor.setLog(log); processor.setCamelContext(new DefaultCamelContext()); processor.setMailetContext(new MockMailetContext()); Index: mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/camel/JamesMailetContext.java =================================================================== --- mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/camel/JamesMailetContext.java (revision 1074944) +++ mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/camel/JamesMailetContext.java (working copy) @@ -41,7 +41,6 @@ import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.HierarchicalConfiguration; -import org.apache.commons.logging.Log; import org.apache.james.core.MailImpl; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.dnsservice.api.TemporaryResolutionException; @@ -58,6 +57,7 @@ import org.apache.mailet.MailAddress; import org.apache.mailet.MailetContext; import org.apache.mailet.base.RFC2822Headers; +import org.slf4j.Logger; public abstract class JamesMailetContext implements MailetContext, LogEnabled, Configurable { @@ -67,7 +67,7 @@ private Hashtable attributes = new Hashtable(); protected DNSService dns; - protected Log log; + protected Logger log; private UsersRepository localusers; @@ -438,9 +438,9 @@ /* * (non-Javadoc) - * @see org.apache.james.lifecycle.LogEnabled#setLog(org.apache.commons.logging.Log) + * @see org.apache.james.lifecycle.LogEnabled#setLog(org.slf4j.Logger) */ - public void setLog(Log log) { + public void setLog(Logger log) { this.log = log; } Index: mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/camel/CamelProcessor.java =================================================================== --- mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/camel/CamelProcessor.java (revision 1074944) +++ mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/camel/CamelProcessor.java (working copy) @@ -25,13 +25,13 @@ import org.apache.camel.Exchange; import org.apache.camel.Processor; -import org.apache.commons.logging.Log; import org.apache.james.mailetcontainer.lib.AbstractStateMailetProcessor.MailetProcessorListener; import org.apache.james.mailetcontainer.lib.MailetConfigImpl; import org.apache.james.mailetcontainer.lib.ProcessorUtil; import org.apache.mailet.Mail; import org.apache.mailet.Mailet; import org.apache.mailet.MailetConfig; +import org.slf4j.Logger; /** * Mailet wrapper which execute a Mailet in a Processor @@ -40,7 +40,7 @@ public class CamelProcessor implements Processor{ private Mailet mailet; - private Log logger; + private Logger logger; private CamelMailetProcessor processor; /** @@ -48,7 +48,7 @@ * * @param mailet */ - public CamelProcessor(Mailet mailet, Log logger, CamelMailetProcessor processor) { + public CamelProcessor(Mailet mailet, Logger logger, CamelMailetProcessor processor) { this.mailet = mailet; this.logger = logger; this.processor = processor; Index: mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/camel/MatcherSplitter.java =================================================================== --- mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/camel/MatcherSplitter.java (revision 1074944) +++ mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/camel/MatcherSplitter.java (working copy) @@ -31,13 +31,13 @@ import org.apache.camel.Handler; import org.apache.camel.InOnly; import org.apache.camel.Property; -import org.apache.commons.logging.Log; import org.apache.james.core.MailImpl; import org.apache.james.mailetcontainer.lib.AbstractStateMailetProcessor.MailetProcessorListener; import org.apache.james.mailetcontainer.lib.ProcessorUtil; import org.apache.mailet.Mail; import org.apache.mailet.MailAddress; import org.apache.mailet.Matcher; +import org.slf4j.Logger; /** * A Splitter for use with Camel to split the MailMessage into many pieces if needed. This is done @@ -77,7 +77,7 @@ */ @SuppressWarnings("unchecked") @Handler - public List split(@Property(MATCHER_PROPERTY) Matcher matcher, @Property(ON_MATCH_EXCEPTION_PROPERTY) String onMatchException, @Property(LOGGER_PROPERTY) Log logger, @Property(MAILETCONTAINER_PROPERTY) CamelMailetProcessor container, + public List split(@Property(MATCHER_PROPERTY) Matcher matcher, @Property(ON_MATCH_EXCEPTION_PROPERTY) String onMatchException, @Property(LOGGER_PROPERTY) Logger logger, @Property(MAILETCONTAINER_PROPERTY) CamelMailetProcessor container, @Body Mail mail) throws MessagingException { Collection matchedRcpts = null; Collection origRcpts = new ArrayList(mail.getRecipients()); Index: mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/camel/CamelMailetProcessor.java =================================================================== --- mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/camel/CamelMailetProcessor.java (revision 1074944) +++ mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/camel/CamelMailetProcessor.java (working copy) @@ -32,7 +32,6 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.model.RouteDefinition; import org.apache.camel.processor.aggregate.UseLatestAggregationStrategy; -import org.apache.commons.logging.Log; import org.apache.james.mailetcontainer.lib.AbstractStateMailetProcessor; import org.apache.james.mailetcontainer.lib.MailetConfigImpl; import org.apache.james.mailetcontainer.lib.MatcherMailetPair; @@ -40,6 +39,7 @@ import org.apache.mailet.Mailet; import org.apache.mailet.MailetConfig; import org.apache.mailet.Matcher; +import org.slf4j.Logger; /** @@ -146,7 +146,7 @@ Processor stateChangedProcessor = new StateChangedProcessor(); String state = getState(); - Log logger = getLogger(); + Logger logger = getLogger(); RouteDefinition processorDef = from(getEndpoint()).routeId(state).inOnly() // store the logger in properties Index: mailetcontainer-camel/pom.xml =================================================================== --- mailetcontainer-camel/pom.xml (revision 1074944) +++ mailetcontainer-camel/pom.xml (working copy) @@ -63,10 +63,15 @@ --> - commons-logging - commons-logging + org.slf4j + slf4j-api + org.slf4j + slf4j-simple + test + + commons-configuration commons-configuration Index: mailets/src/main/java/org/apache/james/transport/util/MailetContextLog.java =================================================================== --- mailets/src/main/java/org/apache/james/transport/util/MailetContextLog.java (revision 1074944) +++ mailets/src/main/java/org/apache/james/transport/util/MailetContextLog.java (working copy) @@ -18,15 +18,17 @@ ****************************************************************/ package org.apache.james.transport.util; -import org.apache.commons.logging.Log; import org.apache.mailet.MailetContext; +import org.slf4j.Logger; +import org.slf4j.Marker; /** - * {@link Log} implementation which delegate the logging to a {@link MailetContext} + * {@link Logger} implementation which delegate the logging to a + * {@link MailetContext} * - * + * */ -public class MailetContextLog implements Log { +public class MailetContextLog implements Logger { private boolean isDebug; private MailetContext context; @@ -35,83 +37,68 @@ this.context = context; this.isDebug = isDebug; } - + public MailetContextLog(MailetContext context) { this(context, false); - + } - /** * Only log if {@link #isDebugEnabled()} is true */ - public void debug(Object arg0) { + public void debug(String arg0) { if (isDebug) { - context.log(arg0.toString()); + debugLog(arg0); } } /** * Only log if {@link #isDebugEnabled()} is true */ - public void debug(Object arg0, Throwable arg1) { + public void debug(String arg0, Throwable arg1) { if (isDebug) { - context.log(arg0.toString(), arg1); - } + debugLog(arg0, arg1); + } } /* * (non-Javadoc) - * @see org.apache.commons.logging.Log#error(java.lang.Object) + * + * @see org.slf4j.Logger#error(java.lang.String) */ - public void error(Object arg0) { - context.log(arg0.toString()); - + public void error(String arg0) { + errorLog(arg0); + } /* * (non-Javadoc) - * @see org.apache.commons.logging.Log#error(java.lang.Object, java.lang.Throwable) + * + * @see org.slf4j.Logger#error(java.lang.String, java.lang.Throwable) */ - public void error(Object arg0, Throwable arg1) { - context.log(arg0.toString(), arg1); - + public void error(String arg0, Throwable arg1) { + errorLog(arg0, arg1); + } /* * (non-Javadoc) - * @see org.apache.commons.logging.Log#fatal(java.lang.Object) + * + * @see org.slf4j.Logger#info(java.lang.String) */ - public void fatal(Object arg0) { - context.log(arg0.toString()); - - } + public void info(String arg0) { + infoLog(arg0); - /* - * (non-Javadoc) - * @see org.apache.commons.logging.Log#fatal(java.lang.Object, java.lang.Throwable) - */ - public void fatal(Object arg0, Throwable arg1) { - context.log(arg0.toString(), arg1); - } /* * (non-Javadoc) - * @see org.apache.commons.logging.Log#info(java.lang.Object) + * + * @see org.slf4j.Logger#info(java.lang.String, java.lang.Throwable) */ - public void info(Object arg0) { - context.log(arg0.toString()); - - } + public void info(String arg0, Throwable arg1) { + infoLog(arg0, arg1); - /* - * (non-Javadoc) - * @see org.apache.commons.logging.Log#info(java.lang.Object, java.lang.Throwable) - */ - public void info(Object arg0, Throwable arg1) { - context.log(arg0.toString(), arg1); - } /** @@ -160,32 +147,722 @@ /** * Do nothing */ - public void trace(Object arg0) { + public void trace(Object arg0) { } /** * Do nothing */ public void trace(Object arg0, Throwable arg1) { - + } /* * (non-Javadoc) - * @see org.apache.commons.logging.Log#warn(java.lang.Object) + * + * @see org.slf4j.Logger#warn(java.lang.String) */ - public void warn(Object arg0) { - context.log(arg0.toString()); - + public void warn(String arg0) { + warnLog(arg0); + } /* * (non-Javadoc) - * @see org.apache.commons.logging.Log#warn(java.lang.Object, java.lang.Throwable) + * + * @see org.slf4j.Logger#warn(java.lang.String, java.lang.Throwable) */ - public void warn(Object arg0, Throwable arg1) { - context.log(arg0.toString(), arg1); - + public void warn(String arg0, Throwable arg1) { + warnLog(arg0, arg1); + } - + + /* + * (non-Javadoc) + * + * @see org.slf4j.Logger#getName() + */ + public String getName() { + return context.toString(); + } + + /** + * Do nothing + */ + public void trace(String msg) { + } + + /** + * Do nothing + */ + public void trace(String format, Object arg) { + } + + /** + * Do nothing + */ + public void trace(String format, Object arg1, Object arg2) { + } + + /** + * Do nothing + */ + public void trace(String format, Object[] argArray) { + } + + /** + * Do nothing + */ + public void trace(String msg, Throwable t) { + } + + /** + * Do nothing + */ + public boolean isTraceEnabled(Marker marker) { + return false; + } + + /** + * Do nothing + */ + public void trace(Marker marker, String msg) { + } + + /** + * Do nothing + */ + public void trace(Marker marker, String format, Object arg) { + } + + /** + * Do nothing + */ + public void trace(Marker marker, String format, Object arg1, Object arg2) { + } + + /** + * Do nothing + */ + public void trace(Marker marker, String format, Object[] argArray) { + } + + /** + * Do nothing + */ + public void trace(Marker marker, String msg, Throwable t) { + } + + /* + * (non-Javadoc) + * + * @see org.slf4j.Logger#debug(java.lang.String, java.lang.Object) + */ + public void debug(String format, Object arg) { + if (isDebug) { + debugLog(format, arg); + } + } + + /* + * (non-Javadoc) + * + * @see org.slf4j.Logger#debug(java.lang.String, java.lang.Object, + * java.lang.Object) + */ + public void debug(String format, Object arg1, Object arg2) { + if (isDebug) { + debugLog(format, arg1, arg2); + } + } + + /* + * (non-Javadoc) + * + * @see org.slf4j.Logger#debug(java.lang.String, java.lang.Object[]) + */ + public void debug(String format, Object[] argArray) { + if (isDebug) { + debugLog(format, argArray); + } + } + + /* + * (non-Javadoc) + * + * @see org.slf4j.Logger#isDebugEnabled(org.slf4j.Marker) + */ + public boolean isDebugEnabled(Marker marker) { + return isDebug; + } + + /* + * (non-Javadoc) + * + * @see org.slf4j.Logger#debug(org.slf4j.Marker, java.lang.String) + */ + public void debug(Marker marker, String msg) { + if (isDebug) { + debugLog(marker, msg); + } + } + + /* + * (non-Javadoc) + * + * @see org.slf4j.Logger#debug(org.slf4j.Marker, java.lang.String, + * java.lang.Object) + */ + public void debug(Marker marker, String format, Object arg) { + if (isDebug) { + debugLog(marker, format, arg); + } + } + + /* + * (non-Javadoc) + * + * @see org.slf4j.Logger#debug(org.slf4j.Marker, java.lang.String, + * java.lang.Object, java.lang.Object) + */ + public void debug(Marker marker, String format, Object arg1, Object arg2) { + if (isDebug) { + debugLog(marker, format, arg1, arg2); + } + } + + /* + * (non-Javadoc) + * + * @see org.slf4j.Logger#debug(org.slf4j.Marker, java.lang.String, + * java.lang.Object[]) + */ + public void debug(Marker marker, String format, Object[] argArray) { + if (isDebug) { + debugLog(marker, format, argArray); + } + } + + /* + * (non-Javadoc) + * + * @see org.slf4j.Logger#debug(org.slf4j.Marker, java.lang.String, + * java.lang.Throwable) + */ + public void debug(Marker marker, String msg, Throwable t) { + if (isDebug) { + debugLog(marker, msg, t); + } + } + + /* + * (non-Javadoc) + * + * @see org.slf4j.Logger#info(java.lang.String, java.lang.Object) + */ + public void info(String format, Object arg) { + infoLog(format, arg); + } + + /* + * (non-Javadoc) + * + * @see org.slf4j.Logger#info(java.lang.String, java.lang.Object, + * java.lang.Object) + */ + public void info(String format, Object arg1, Object arg2) { + infoLog(format, arg1, arg2); + } + + /* + * (non-Javadoc) + * + * @see org.slf4j.Logger#info(java.lang.String, java.lang.Object[]) + */ + public void info(String format, Object[] argArray) { + infoLog(format, argArray); + } + + /* + * (non-Javadoc) + * + * @see org.slf4j.Logger#isInfoEnabled(org.slf4j.Marker) + */ + public boolean isInfoEnabled(Marker marker) { + return true; + } + + /* + * (non-Javadoc) + * + * @see org.slf4j.Logger#info(org.slf4j.Marker, java.lang.String) + */ + public void info(Marker marker, String msg) { + infoLog(marker, msg); + } + + /* + * (non-Javadoc) + * + * @see org.slf4j.Logger#info(org.slf4j.Marker, java.lang.String, + * java.lang.Object) + */ + public void info(Marker marker, String format, Object arg) { + infoLog(marker, format, arg); + } + + /* + * (non-Javadoc) + * + * @see org.slf4j.Logger#info(org.slf4j.Marker, java.lang.String, + * java.lang.Object, java.lang.Object) + */ + public void info(Marker marker, String format, Object arg1, Object arg2) { + infoLog(marker, format, arg1, arg2); + } + + /* + * (non-Javadoc) + * + * @see org.slf4j.Logger#info(org.slf4j.Marker, java.lang.String, + * java.lang.Object[]) + */ + public void info(Marker marker, String format, Object[] argArray) { + infoLog(marker, format, argArray); + } + + /* + * (non-Javadoc) + * + * @see org.slf4j.Logger#info(org.slf4j.Marker, java.lang.String, + * java.lang.Throwable) + */ + public void info(Marker marker, String msg, Throwable t) { + infoLog(marker, msg, t); + } + + /* + * (non-Javadoc) + * + * @see org.slf4j.Logger#warn(java.lang.String, java.lang.Object) + */ + public void warn(String format, Object arg) { + warnLog(format, arg); + } + + /* + * (non-Javadoc) + * + * @see org.slf4j.Logger#warn(java.lang.String, java.lang.Object[]) + */ + public void warn(String format, Object[] argArray) { + warnLog(format, argArray); + } + + /* + * (non-Javadoc) + * + * @see org.slf4j.Logger#warn(java.lang.String, java.lang.Object, + * java.lang.Object) + */ + public void warn(String format, Object arg1, Object arg2) { + warnLog(format, arg1, arg2); + } + + /* + * (non-Javadoc) + * + * @see org.slf4j.Logger#isWarnEnabled(org.slf4j.Marker) + */ + public boolean isWarnEnabled(Marker marker) { + return true; + } + + /* + * (non-Javadoc) + * + * @see org.slf4j.Logger#warn(org.slf4j.Marker, java.lang.String) + */ + public void warn(Marker marker, String msg) { + warnLog(marker, msg); + } + + /* + * (non-Javadoc) + * + * @see org.slf4j.Logger#warn(org.slf4j.Marker, java.lang.String, + * java.lang.Object) + */ + public void warn(Marker marker, String format, Object arg) { + warnLog(marker, format, arg); + } + + /* + * (non-Javadoc) + * + * @see org.slf4j.Logger#warn(org.slf4j.Marker, java.lang.String, + * java.lang.Object, java.lang.Object) + */ + public void warn(Marker marker, String format, Object arg1, Object arg2) { + warnLog(marker, format, arg1, arg2); + } + + /* + * (non-Javadoc) + * + * @see org.slf4j.Logger#warn(org.slf4j.Marker, java.lang.String, + * java.lang.Object[]) + */ + public void warn(Marker marker, String format, Object[] argArray) { + warnLog(marker, format, argArray); + } + + /* + * (non-Javadoc) + * + * @see org.slf4j.Logger#warn(org.slf4j.Marker, java.lang.String, + * java.lang.Throwable) + */ + public void warn(Marker marker, String msg, Throwable t) { + warnLog(marker, msg, t); + } + + /* + * (non-Javadoc) + * + * @see org.slf4j.Logger#error(java.lang.String, java.lang.Object) + */ + public void error(String format, Object arg) { + errorLog(format, arg); + } + + /* + * (non-Javadoc) + * + * @see org.slf4j.Logger#error(java.lang.String, java.lang.Object, + * java.lang.Object) + */ + public void error(String format, Object arg1, Object arg2) { + errorLog(format, arg1, arg2); + } + + /* + * (non-Javadoc) + * + * @see org.slf4j.Logger#error(java.lang.String, java.lang.Object[]) + */ + public void error(String format, Object[] argArray) { + errorLog(format, argArray); + } + + /* + * (non-Javadoc) + * + * @see org.slf4j.Logger#isErrorEnabled(org.slf4j.Marker) + */ + public boolean isErrorEnabled(Marker marker) { + return true; + } + + /* + * (non-Javadoc) + * + * @see org.slf4j.Logger#error(org.slf4j.Marker, java.lang.String) + */ + public void error(Marker marker, String msg) { + errorLog(marker, msg); + } + + /* + * (non-Javadoc) + * + * @see org.slf4j.Logger#error(org.slf4j.Marker, java.lang.String, + * java.lang.Object) + */ + public void error(Marker marker, String format, Object arg) { + errorLog(marker, format, arg); + } + + /* + * (non-Javadoc) + * + * @see org.slf4j.Logger#error(org.slf4j.Marker, java.lang.String, + * java.lang.Object, java.lang.Object) + */ + public void error(Marker marker, String format, Object arg1, Object arg2) { + errorLog(marker, format, arg1, arg2); + } + + /* + * (non-Javadoc) + * + * @see org.slf4j.Logger#error(org.slf4j.Marker, java.lang.String, + * java.lang.Object[]) + */ + public void error(Marker marker, String format, Object[] argArray) { + errorLog(marker, format, argArray); + } + + /* + * (non-Javadoc) + * + * @see org.slf4j.Logger#error(org.slf4j.Marker, java.lang.String, + * java.lang.Throwable) + */ + public void error(Marker marker, String msg, Throwable t) { + errorLog(marker, msg, t); + } + + private void debugLog(Marker marker, String msg, Object... obj) { + StringBuffer s = new StringBuffer("["); + s.append(marker.toString()).append("] ").append(msg); + Throwable t = null; + if (obj != null) { + s.append(" args=["); + boolean first = true; + for (Object o : obj) { + if (o instanceof Throwable) { + t = (Throwable) o; + } else { + if (first) { + s.append(o.toString()); + first = false; + } else { + s.append(", ").append(o.toString()); + } + } + } + s.append("]"); + } + if (t != null) { + // TODO Use with apache-mailet-2.5 + // context.log(MailetContext.LogLevel.DEBUG, s.toString(), t); + context.log(s.toString(), t); + } else { + // TODO Use with apache-mailet-2.5 + // context.log(MailetContext.LogLevel.DEBUG, s.toString()); + context.log(s.toString()); + } + } + + private void debugLog(String msg, Object... obj) { + StringBuffer s = new StringBuffer(msg); + Throwable t = null; + if (obj != null) { + s.append(" args=["); + boolean first = true; + for (Object o : obj) { + if (o instanceof Throwable) { + t = (Throwable) o; + } else { + if (first) { + s.append(o.toString()); + first = false; + } else { + s.append(", ").append(o.toString()); + } + } + } + s.append("]"); + } + if (t != null) { + // TODO Use with apache-mailet-2.5 + // context.log(MailetContext.LogLevel.DEBUG, s.toString(), t); + context.log(s.toString(), t); + } else { + // TODO Use with apache-mailet-2.5 + // context.log(MailetContext.LogLevel.DEBUG, s.toString()); + context.log(s.toString()); + } + } + + private void errorLog(Marker marker, String msg, Object... obj) { + StringBuffer s = new StringBuffer("["); + s.append(marker.toString()).append("] ").append(msg); + Throwable t = null; + if (obj != null) { + s.append(" args=["); + boolean first = true; + for (Object o : obj) { + if (o instanceof Throwable) { + t = (Throwable) o; + } else { + if (first) { + s.append(o.toString()); + first = false; + } else { + s.append(", ").append(o.toString()); + } + } + } + s.append("]"); + } + if (t != null) { + // TODO Use with apache-mailet-2.5 + // context.log(MailetContext.LogLevel.ERROR, s.toString(), t); + context.log(s.toString(), t); + } else { + // TODO Use with apache-mailet-2.5 + // context.log(MailetContext.LogLevel.ERROR, s.toString()); + context.log(s.toString()); + } + } + + private void errorLog(String msg, Object... obj) { + StringBuffer s = new StringBuffer(msg); + Throwable t = null; + if (obj != null) { + s.append(" args=["); + boolean first = true; + for (Object o : obj) { + if (o instanceof Throwable) { + t = (Throwable) o; + } else { + if (first) { + s.append(o.toString()); + first = false; + } else { + s.append(", ").append(o.toString()); + } + } + } + s.append("]"); + } + if (t != null) { + // TODO Use with apache-mailet-2.5 + // context.log(MailetContext.LogLevel.ERROR, s.toString(), t); + context.log(s.toString(), t); + } else { + // TODO Use with apache-mailet-2.5 + // context.log(MailetContext.LogLevel.ERROR, s.toString()); + context.log(s.toString()); + } + } + + private void infoLog(Marker marker, String msg, Object... obj) { + StringBuffer s = new StringBuffer("["); + s.append(marker.toString()).append("] ").append(msg); + Throwable t = null; + if (obj != null) { + s.append(" args=["); + boolean first = true; + for (Object o : obj) { + if (o instanceof Throwable) { + t = (Throwable) o; + } else { + if (first) { + s.append(o.toString()); + first = false; + } else { + s.append(", ").append(o.toString()); + } + } + } + s.append("]"); + } + if (t != null) { + // TODO Use with apache-mailet-2.5 + // context.log(MailetContext.LogLevel.INFO, s.toString(), t); + context.log(s.toString(), t); + } else { + // TODO Use with apache-mailet-2.5 + // context.log(MailetContext.LogLevel.INFO, s.toString()); + context.log(s.toString()); + } + } + + private void infoLog(String msg, Object... obj) { + StringBuffer s = new StringBuffer(msg); + Throwable t = null; + if (obj != null) { + s.append(" args=["); + boolean first = true; + for (Object o : obj) { + if (o instanceof Throwable) { + t = (Throwable) o; + } else { + if (first) { + s.append(o.toString()); + first = false; + } else { + s.append(", ").append(o.toString()); + } + } + } + s.append("]"); + } + if (t != null) { + // TODO Use with apache-mailet-2.5 + // context.log(MailetContext.LogLevel.INFO, s.toString(), t); + context.log(s.toString(), t); + } else { + // TODO Use with apache-mailet-2.5 + // context.log(MailetContext.LogLevel.INFO, s.toString()); + context.log(s.toString()); + } + } + + private void warnLog(Marker marker, String msg, Object... obj) { + StringBuffer s = new StringBuffer("["); + s.append(marker.toString()).append("] ").append(msg); + Throwable t = null; + if (obj != null) { + s.append(" args=["); + boolean first = true; + for (Object o : obj) { + if (o instanceof Throwable) { + t = (Throwable) o; + } else { + if (first) { + s.append(o.toString()); + first = false; + } else { + s.append(", ").append(o.toString()); + } + } + } + s.append("]"); + } + if (t != null) { + // TODO Use with apache-mailet-2.5 + // context.log(MailetContext.LogLevel.WARN, s.toString(), t); + context.log(s.toString(), t); + } else { + // TODO Use with apache-mailet-2.5 + // context.log(MailetContext.LogLevel.WARN, s.toString()); + context.log(s.toString()); + } + } + + private void warnLog(String msg, Object... obj) { + StringBuffer s = new StringBuffer(msg); + Throwable t = null; + if (obj != null) { + s.append(" args=["); + boolean first = true; + for (Object o : obj) { + if (o instanceof Throwable) { + t = (Throwable) o; + } else { + if (first) { + s.append(o.toString()); + first = false; + } else { + s.append(", ").append(o.toString()); + } + } + } + s.append("]"); + } + if (t != null) { + // TODO Use with apache-mailet-2.5 + // context.log(MailetContext.LogLevel.WARN, s.toString(), t); + context.log(s.toString(), t); + t.printStackTrace(); + } else { + // TODO Use with apache-mailet-2.5 + // context.log(MailetContext.LogLevel.WARN, s.toString()); + context.log(s.toString()); + } + } } Index: mailets/pom.xml =================================================================== --- mailets/pom.xml (revision 1074944) +++ mailets/pom.xml (working copy) @@ -162,8 +162,8 @@ commons-configuration - commons-logging - commons-logging + org.slf4j + slf4j-api org.apache.geronimo.specs Index: jdbc/src/test/java/org/apache/james/mailrepository/jdbc/JDBCMailRepositoryTest.java =================================================================== --- jdbc/src/test/java/org/apache/james/mailrepository/jdbc/JDBCMailRepositoryTest.java (revision 1074944) +++ jdbc/src/test/java/org/apache/james/mailrepository/jdbc/JDBCMailRepositoryTest.java (working copy) @@ -24,12 +24,12 @@ import org.apache.commons.configuration.DefaultConfigurationBuilder; import org.apache.commons.dbcp.BasicDataSource; -import org.apache.commons.logging.impl.SimpleLog; import org.apache.derby.jdbc.EmbeddedDriver; import org.apache.james.filesystem.api.mock.MockFileSystem; import org.apache.james.mailrepository.AbstractMailRepositoryTest; import org.apache.james.mailrepository.api.MailRepository; import org.apache.james.mailrepository.jdbc.JDBCMailRepository; +import org.slf4j.LoggerFactory; public class JDBCMailRepositoryTest extends AbstractMailRepositoryTest { @@ -50,7 +50,7 @@ defaultConfiguration.addProperty("[@type]","MAIL"); mr.setFileSystem(fs); mr.setDatasource(datasource); - mr.setLog(new SimpleLog("MockLog")); + mr.setLog(LoggerFactory.getLogger("MockLog")); mr.configure(defaultConfiguration); mr.init(); return mr; Index: jdbc/src/test/java/org/apache/james/user/jdbc/JamesUsersJdbcRepositoryTest.java =================================================================== --- jdbc/src/test/java/org/apache/james/user/jdbc/JamesUsersJdbcRepositoryTest.java (revision 1074944) +++ jdbc/src/test/java/org/apache/james/user/jdbc/JamesUsersJdbcRepositoryTest.java (working copy) @@ -23,7 +23,6 @@ import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.DefaultConfigurationBuilder; import org.apache.commons.dbcp.BasicDataSource; -import org.apache.commons.logging.impl.SimpleLog; import org.apache.derby.jdbc.EmbeddedDriver; import org.apache.james.filesystem.api.mock.MockFileSystem; import org.apache.james.lifecycle.api.LifecycleUtil; @@ -35,6 +34,7 @@ import org.apache.james.user.lib.AbstractUsersRepositoryTest; import org.apache.james.vut.api.VirtualUserTable; import org.apache.mailet.MailAddress; +import org.slf4j.LoggerFactory; import java.util.Collection; import java.util.Iterator; @@ -72,7 +72,7 @@ DefaultConfigurationBuilder configuration = new DefaultConfigurationBuilder(); configuration.addProperty("[@destinationURL]", "db://maildb/"+tableString); configuration.addProperty("sqlFile","file://conf/sqlResources.xml"); - res.setLog(new SimpleLog("MockLog")); + res.setLog(LoggerFactory.getLogger("MockLog")); res.configure(configuration); res.init(); } Index: jdbc/src/test/java/org/apache/james/user/jdbc/DefaultUsersJdbcRepositoryTest.java =================================================================== --- jdbc/src/test/java/org/apache/james/user/jdbc/DefaultUsersJdbcRepositoryTest.java (revision 1074944) +++ jdbc/src/test/java/org/apache/james/user/jdbc/DefaultUsersJdbcRepositoryTest.java (working copy) @@ -22,7 +22,6 @@ import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.DefaultConfigurationBuilder; import org.apache.commons.dbcp.BasicDataSource; -import org.apache.commons.logging.impl.SimpleLog; import org.apache.derby.jdbc.EmbeddedDriver; import org.apache.james.filesystem.api.mock.MockFileSystem; import org.apache.james.lifecycle.api.LifecycleUtil; @@ -31,6 +30,7 @@ import org.apache.james.user.jdbc.AbstractJdbcUsersRepository; import org.apache.james.user.jdbc.DefaultUsersJdbcRepository; import org.apache.james.user.lib.AbstractUsersRepositoryTest; +import org.slf4j.LoggerFactory; import java.util.Iterator; @@ -69,7 +69,7 @@ DefaultConfigurationBuilder configuration = new DefaultConfigurationBuilder(); configuration.addProperty("[@destinationURL]", "db://maildb/"+tableString); configuration.addProperty("sqlFile","file://conf/sqlResources.xml"); - res.setLog(new SimpleLog("MockLog")); + res.setLog(LoggerFactory.getLogger("MockLog")); res.configure(configuration); res.init(); } Index: jdbc/src/test/java/org/apache/james/vut/jdbc/JDBCVirtualUserTableTest.java =================================================================== --- jdbc/src/test/java/org/apache/james/vut/jdbc/JDBCVirtualUserTableTest.java (revision 1074944) +++ jdbc/src/test/java/org/apache/james/vut/jdbc/JDBCVirtualUserTableTest.java (working copy) @@ -22,13 +22,13 @@ import org.apache.commons.configuration.DefaultConfigurationBuilder; import org.apache.commons.dbcp.BasicDataSource; -import org.apache.commons.logging.impl.SimpleLog; import org.apache.derby.jdbc.EmbeddedDriver; import org.apache.james.filesystem.api.mock.MockFileSystem; import org.apache.james.vut.api.VirtualUserTableException; import org.apache.james.vut.jdbc.JDBCVirtualUserTable; import org.apache.james.vut.lib.AbstractVirtualUserTable; import org.apache.james.vut.lib.AbstractVirtualUserTableTest; +import org.slf4j.LoggerFactory; /** * Test the JDBC Virtual User Table implementation. @@ -40,7 +40,7 @@ */ protected AbstractVirtualUserTable getVirtualUserTable() throws Exception { JDBCVirtualUserTable virtualUserTable = new JDBCVirtualUserTable(); - virtualUserTable.setLog(new SimpleLog("MockLog")); + virtualUserTable.setLog(LoggerFactory.getLogger("MockLog")); virtualUserTable.setDataSource(getDataSource()); virtualUserTable.setFileSystem(new MockFileSystem()); DefaultConfigurationBuilder defaultConfiguration = new DefaultConfigurationBuilder(); Index: jdbc/pom.xml =================================================================== --- jdbc/pom.xml (revision 1074944) +++ jdbc/pom.xml (working copy) @@ -62,9 +62,14 @@ commons-configuration - commons-logging - commons-logging + org.slf4j + slf4j-api + + org.slf4j + slf4j-simple + test + ${javax.mail.groupId} Index: lmtpserver/pom.xml =================================================================== --- lmtpserver/pom.xml (revision 1074944) +++ lmtpserver/pom.xml (working copy) @@ -69,8 +69,8 @@ james-server-data-api - commons-logging - commons-logging + org.slf4j + slf4j-api commons-configuration Index: lifecycle-api/src/main/java/org/apache/james/lifecycle/api/LogEnabled.java =================================================================== --- lifecycle-api/src/main/java/org/apache/james/lifecycle/api/LogEnabled.java (revision 1074944) +++ lifecycle-api/src/main/java/org/apache/james/lifecycle/api/LogEnabled.java (working copy) @@ -19,7 +19,7 @@ package org.apache.james.lifecycle.api; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; /** * Indicates that a services requires general logging. @@ -33,5 +33,5 @@ * Sets the service log. * @param log not null */ - public void setLog(Log log); + public void setLog(Logger log); } Index: lifecycle-api/pom.xml =================================================================== --- lifecycle-api/pom.xml (revision 1074944) +++ lifecycle-api/pom.xml (working copy) @@ -67,8 +67,8 @@ commons-configuration - commons-logging - commons-logging + org.slf4j + slf4j-api \ No newline at end of file Index: pop3server/src/test/java/org/apache/james/pop3server/POP3ServerTest.java =================================================================== --- pop3server/src/test/java/org/apache/james/pop3server/POP3ServerTest.java (revision 1074944) +++ pop3server/src/test/java/org/apache/james/pop3server/POP3ServerTest.java (working copy) @@ -32,7 +32,6 @@ import junit.framework.TestCase; -import org.apache.commons.logging.impl.SimpleLog; import org.apache.commons.net.pop3.POP3Client; import org.apache.commons.net.pop3.POP3MessageInfo; import org.apache.commons.net.pop3.POP3Reply; @@ -55,6 +54,8 @@ import org.apache.james.protocols.lib.mock.MockProtocolHandlerChain; import org.apache.james.user.api.UsersRepositoryException; import org.apache.james.user.lib.mock.MockUsersRepository; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class POP3ServerTest extends TestCase { @@ -93,8 +94,9 @@ m_pop3Server.setProtocolHandlerChain(chain); - SimpleLog log = new SimpleLog("Mock"); - log.setLevel(SimpleLog.LOG_LEVEL_DEBUG); + Logger log = LoggerFactory.getLogger("Mock"); + // slf4j can't set programmatically any log level. It's just a facade + // log.setLevel(SimpleLog.LOG_LEVEL_DEBUG); m_pop3Server.setLog(log); } @@ -104,7 +106,7 @@ chain = new MockProtocolHandlerChain(); chain.setLoader(serviceManager); - chain.setLog(new SimpleLog("ChainLog")); + chain.setLog(LoggerFactory.getLogger("ChainLog")); setUpPOP3Server(); m_testConfiguration = new POP3TestConfiguration(m_pop3ListenerPort); @@ -281,7 +283,7 @@ m_pop3Protocol.disconnect(); MailboxPath mailboxPath = new MailboxPath(MailboxConstants.USER_NAMESPACE, "foo", "INBOX"); - MailboxSession session = manager.login("foo", "bar", new SimpleLog("Test")); + MailboxSession session = manager.login("foo", "bar", LoggerFactory.getLogger("Test")); if (manager.mailboxExists(mailboxPath, session) == false) { manager.createMailbox(mailboxPath, session); } @@ -363,7 +365,7 @@ m_usersRepository.addUser("foo2", "bar2"); MailboxPath mailboxPath = new MailboxPath(MailboxConstants.USER_NAMESPACE, "foo2", "INBOX"); - MailboxSession session = manager.login("foo2", "bar2", new SimpleLog("Test")); + MailboxSession session = manager.login("foo2", "bar2", LoggerFactory.getLogger("Test")); if (manager.mailboxExists(mailboxPath, session) == false) { manager.createMailbox(mailboxPath, session); @@ -595,7 +597,7 @@ m_usersRepository.addUser("foo6", "bar6"); MailboxPath mailboxPath = MailboxPath.inbox("foo6"); - MailboxSession session = manager.login("foo6", "bar6", new SimpleLog("Test")); + MailboxSession session = manager.login("foo6", "bar6", LoggerFactory.getLogger("Test")); manager.startProcessingRequest(session); if (manager.mailboxExists(mailboxPath, session) == false) { Index: pop3server/src/main/java/org/apache/james/pop3server/netty/POP3ChannelUpstreamHandler.java =================================================================== --- pop3server/src/main/java/org/apache/james/pop3server/netty/POP3ChannelUpstreamHandler.java (revision 1074944) +++ pop3server/src/main/java/org/apache/james/pop3server/netty/POP3ChannelUpstreamHandler.java (working copy) @@ -21,13 +21,13 @@ import javax.net.ssl.SSLContext; import javax.net.ssl.SSLEngine; -import org.apache.commons.logging.Log; import org.apache.james.pop3server.POP3HandlerConfigurationData; import org.apache.james.protocols.api.ProtocolHandlerChain; import org.apache.james.protocols.api.ProtocolSession; import org.apache.james.protocols.impl.AbstractChannelUpstreamHandler; import org.jboss.netty.channel.ChannelHandlerContext; import org.jboss.netty.channel.ChannelUpstreamHandler; +import org.slf4j.Logger; /** * {@link ChannelUpstreamHandler} which is used for the POP3 Server @@ -36,12 +36,12 @@ */ public class POP3ChannelUpstreamHandler extends AbstractChannelUpstreamHandler{ - private final Log logger; + private final Logger logger; private final POP3HandlerConfigurationData conf; private final SSLContext context; private String[] enabledCipherSuites; - public POP3ChannelUpstreamHandler(ProtocolHandlerChain chain, POP3HandlerConfigurationData conf, Log logger, SSLContext context, String[] enabledCipherSuites) { + public POP3ChannelUpstreamHandler(ProtocolHandlerChain chain, POP3HandlerConfigurationData conf, Logger logger, SSLContext context, String[] enabledCipherSuites) { super(chain); this.logger = logger; this.conf = conf; @@ -49,7 +49,7 @@ this.enabledCipherSuites = enabledCipherSuites; } - public POP3ChannelUpstreamHandler(ProtocolHandlerChain chain, POP3HandlerConfigurationData conf, Log logger) { + public POP3ChannelUpstreamHandler(ProtocolHandlerChain chain, POP3HandlerConfigurationData conf, Logger logger) { this(chain, conf, logger, null, null); } Index: pop3server/src/main/java/org/apache/james/pop3server/netty/POP3NettySession.java =================================================================== --- pop3server/src/main/java/org/apache/james/pop3server/netty/POP3NettySession.java (revision 1074944) +++ pop3server/src/main/java/org/apache/james/pop3server/netty/POP3NettySession.java (working copy) @@ -23,12 +23,12 @@ import javax.net.ssl.SSLEngine; -import org.apache.commons.logging.Log; import org.apache.james.mailbox.MessageManager; import org.apache.james.pop3server.POP3HandlerConfigurationData; import org.apache.james.pop3server.POP3Session; import org.apache.james.protocols.impl.AbstractSession; import org.jboss.netty.channel.ChannelHandlerContext; +import org.slf4j.Logger; /** * {@link POP3Session} implementation which use Netty @@ -44,12 +44,12 @@ private MessageManager mailbox; - public POP3NettySession(POP3HandlerConfigurationData configData, Log logger, ChannelHandlerContext handlerContext) { + public POP3NettySession(POP3HandlerConfigurationData configData, Logger logger, ChannelHandlerContext handlerContext) { this(configData, logger, handlerContext, null); } - public POP3NettySession(POP3HandlerConfigurationData configData, Log logger, ChannelHandlerContext handlerContext, SSLEngine engine) { + public POP3NettySession(POP3HandlerConfigurationData configData, Logger logger, ChannelHandlerContext handlerContext, SSLEngine engine) { super(logger, handlerContext, engine); this.configData = configData; } Index: pop3server/pom.xml =================================================================== --- pop3server/pom.xml (revision 1074944) +++ pop3server/pom.xml (working copy) @@ -57,8 +57,8 @@ apache-james-mailbox-api - commons-logging - commons-logging + org.slf4j + slf4j-api commons-configuration Index: queue-jms/src/test/java/org/apache/james/queue/jms/JMSMailQueueTest.java =================================================================== --- queue-jms/src/test/java/org/apache/james/queue/jms/JMSMailQueueTest.java (revision 1074944) +++ queue-jms/src/test/java/org/apache/james/queue/jms/JMSMailQueueTest.java (working copy) @@ -36,13 +36,14 @@ import org.apache.activemq.broker.BrokerService; import org.apache.activemq.broker.region.policy.PolicyEntry; import org.apache.activemq.broker.region.policy.PolicyMap; -import org.apache.commons.logging.impl.SimpleLog; import org.apache.james.core.MailImpl; import org.apache.james.queue.api.ManageableMailQueue; import org.apache.james.queue.api.MailQueue.MailQueueItem; import org.apache.james.queue.api.ManageableMailQueue.MailQueueIterator; import org.apache.mailet.Mail; import org.apache.mailet.MailAddress; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import junit.framework.TestCase; @@ -85,8 +86,9 @@ } protected JMSMailQueue createQueue(ConnectionFactory factory, String queueName) { - SimpleLog log = new SimpleLog("MockLog"); - log.setLevel(SimpleLog.LOG_LEVEL_DEBUG); + Logger log = LoggerFactory.getLogger("MockLog"); + // slf4j can't set programmatically any log level. It's just a facade + // log.setLevel(SimpleLog.LOG_LEVEL_DEBUG); JMSMailQueue queue = new JMSMailQueue(factory, queueName, log ); return queue; } Index: queue-jms/src/main/java/org/apache/james/queue/library/AbstractMailQueueFactory.java =================================================================== --- queue-jms/src/main/java/org/apache/james/queue/library/AbstractMailQueueFactory.java (revision 1074944) +++ queue-jms/src/main/java/org/apache/james/queue/library/AbstractMailQueueFactory.java (working copy) @@ -30,7 +30,6 @@ import javax.management.MBeanServer; import javax.management.ObjectName; -import org.apache.commons.logging.Log; import org.apache.james.lifecycle.api.LifecycleUtil; import org.apache.james.lifecycle.api.LogEnabled; import org.apache.james.queue.api.MailQueue; @@ -38,6 +37,7 @@ import org.apache.james.queue.api.MailQueueManagementMBean; import org.apache.james.queue.api.ManageableMailQueue; import org.apache.james.queue.library.MailQueueManagement; +import org.slf4j.Logger; /** * {@link MailQueueFactory} abstract base class which take care of register the {@link MailQueue} implementations via JMX (if possible) @@ -49,7 +49,7 @@ protected final Map queues = new HashMap(); - protected Log log; + protected Logger log; private boolean useJMX = true; private MBeanServer mbeanServer; private List mbeans = new ArrayList(); @@ -136,9 +136,9 @@ /* * (non-Javadoc) - * @see org.apache.james.lifecycle.LogEnabled#setLog(org.apache.commons.logging.Log) + * @see org.apache.james.lifecycle.LogEnabled#setLog(org.slf4j.Logger) */ - public void setLog(Log log) { + public void setLog(Logger log) { this.log = log; } } \ No newline at end of file Index: queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java =================================================================== --- queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java (revision 1074944) +++ queue-jms/src/main/java/org/apache/james/queue/jms/JMSMailQueue.java (working copy) @@ -47,7 +47,6 @@ import javax.mail.internet.AddressException; import javax.mail.internet.MimeMessage; -import org.apache.commons.logging.Log; import org.apache.james.core.MailImpl; import org.apache.james.core.MimeMessageCopyOnWriteProxy; import org.apache.james.queue.api.MailPrioritySupport; @@ -55,6 +54,7 @@ import org.apache.james.queue.api.ManageableMailQueue; import org.apache.mailet.Mail; import org.apache.mailet.MailAddress; +import org.slf4j.Logger; /** * {@link MailQueue} implementation which use a JMS Queue for the @@ -69,11 +69,11 @@ protected final String queuename; protected final ConnectionFactory connectionFactory; - protected final Log logger; + protected final Logger logger; public final static String FORCE_DELIVERY = "FORCE_DELIVERY"; - public JMSMailQueue(final ConnectionFactory connectionFactory, final String queuename, final Log logger) { + public JMSMailQueue(final ConnectionFactory connectionFactory, final String queuename, final Logger logger) { this.connectionFactory = connectionFactory; this.queuename = queuename; this.logger = logger; Index: queue-jms/pom.xml =================================================================== --- queue-jms/pom.xml (revision 1074944) +++ queue-jms/pom.xml (working copy) @@ -46,8 +46,8 @@ apache-mailet - commons-logging - commons-logging + org.slf4j + slf4j-api org.apache.geronimo.specs @@ -73,5 +73,10 @@ activemq-core test + + org.slf4j + slf4j-simple + test + Index: jcr/src/test/java/org/apache/james/user/jcr/JcrUserRepositoryTest.java =================================================================== --- jcr/src/test/java/org/apache/james/user/jcr/JcrUserRepositoryTest.java (revision 1074944) +++ jcr/src/test/java/org/apache/james/user/jcr/JcrUserRepositoryTest.java (working copy) @@ -22,12 +22,12 @@ import java.io.File; import org.apache.commons.configuration.DefaultConfigurationBuilder; -import org.apache.commons.logging.impl.SimpleLog; import org.apache.jackrabbit.core.RepositoryImpl; import org.apache.jackrabbit.core.config.RepositoryConfig; import org.apache.james.user.api.UsersRepository; import org.apache.james.user.jcr.JCRUsersRepository; import org.apache.james.user.lib.AbstractUsersRepositoryTest; +import org.slf4j.LoggerFactory; import org.xml.sax.InputSource; public class JcrUserRepositoryTest extends AbstractUsersRepositoryTest { @@ -42,7 +42,7 @@ config.addProperty("username", "admin"); config.addProperty("password", "test"); repos.configure(config); - repos.setLog(new SimpleLog("MockLog")); + repos.setLog(LoggerFactory.getLogger("MockLog")); return repos; } Index: jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java =================================================================== --- jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java (revision 1074944) +++ jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java (working copy) @@ -54,7 +54,6 @@ import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.HierarchicalConfiguration; -import org.apache.commons.logging.Log; import org.apache.jackrabbit.commons.cnd.CndImporter; import org.apache.jackrabbit.util.ISO9075; import org.apache.jackrabbit.util.Text; @@ -63,6 +62,7 @@ import org.apache.james.mailrepository.lib.AbstractMailRepository; import org.apache.mailet.Mail; import org.apache.mailet.MailAddress; +import org.slf4j.Logger; /** * Mail repository that is backed by a JCR content repository. @@ -76,7 +76,7 @@ private SimpleCredentials creds; private String workspace; - private Log logger; + private Logger logger; @Resource(name="jcrRepository") public void setRepository(Repository repository) { Index: jcr/pom.xml =================================================================== --- jcr/pom.xml (revision 1074944) +++ jcr/pom.xml (working copy) @@ -81,7 +81,11 @@ org.slf4j - slf4j-log4j12 + slf4j-api + + + org.slf4j + slf4j-simple test Index: file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java =================================================================== --- file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java (revision 1074944) +++ file/src/test/java/org/apache/james/mailrepository/FileMailRepositoryTest.java (working copy) @@ -21,10 +21,10 @@ package org.apache.james.mailrepository; import org.apache.commons.configuration.DefaultConfigurationBuilder; -import org.apache.commons.logging.impl.SimpleLog; import org.apache.james.filesystem.api.mock.MockFileSystem; import org.apache.james.mailrepository.api.MailRepository; import org.apache.james.mailrepository.file.FileMailRepository; +import org.slf4j.LoggerFactory; public class FileMailRepositoryTest extends AbstractMailRepositoryTest { @@ -38,7 +38,7 @@ MockFileSystem fs = new MockFileSystem(); FileMailRepository mr = new FileMailRepository(); mr.setFileSystem(fs); - mr.setLog(new SimpleLog("MockLog")); + mr.setLog(LoggerFactory.getLogger("MockLog")); DefaultConfigurationBuilder defaultConfiguration = new DefaultConfigurationBuilder(); defaultConfiguration.addProperty( "[@destinationURL]","file://target/var/mr"); defaultConfiguration.addProperty( "[@type]","MAIL"); Index: file/src/test/java/org/apache/james/mailrepository/MBoxMailRepositoryTest.java =================================================================== --- file/src/test/java/org/apache/james/mailrepository/MBoxMailRepositoryTest.java (revision 1074944) +++ file/src/test/java/org/apache/james/mailrepository/MBoxMailRepositoryTest.java (working copy) @@ -26,10 +26,10 @@ import junit.framework.TestCase; import org.apache.commons.configuration.DefaultConfigurationBuilder; -import org.apache.commons.logging.impl.SimpleLog; import org.apache.james.filesystem.api.mock.MockFileSystem; import org.apache.james.mailrepository.api.MailRepository; import org.apache.james.mailrepository.file.MBoxMailRepository; +import org.slf4j.LoggerFactory; /** * NOTE this test *WAS* disabled because MBoxMailRepository does not @@ -51,7 +51,7 @@ defaultConfiguration.addProperty("[@destinationURL]",mboxPath); defaultConfiguration.addProperty("[@type]","MAIL"); - mr.setLog(new SimpleLog("MockLog"));; + mr.setLog(LoggerFactory.getLogger("MockLog"));; mr.configure(defaultConfiguration); return mr; Index: file/src/test/java/org/apache/james/domainlist/xml/XMLDomainListTest.java =================================================================== --- file/src/test/java/org/apache/james/domainlist/xml/XMLDomainListTest.java (revision 1074944) +++ file/src/test/java/org/apache/james/domainlist/xml/XMLDomainListTest.java (working copy) @@ -29,10 +29,10 @@ import org.apache.commons.configuration.DefaultConfigurationBuilder; import org.apache.commons.configuration.HierarchicalConfiguration; -import org.apache.commons.logging.impl.SimpleLog; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.dnsservice.api.mock.MockDNSService; import org.apache.james.domainlist.xml.XMLDomainList; +import org.slf4j.LoggerFactory; import junit.framework.TestCase; @@ -72,7 +72,7 @@ public void testNoConfiguredDomains() throws Exception { List domains = new ArrayList(); XMLDomainList dom = new XMLDomainList(); - dom.setLog(new SimpleLog("MockLog")); + dom.setLog(LoggerFactory.getLogger("MockLog")); dom.configure(setUpConfiguration(false, false, domains)); dom.setDNSService(setUpDNSServer("localhost")); @@ -85,7 +85,7 @@ domains.add("domain2."); XMLDomainList dom = new XMLDomainList(); - dom.setLog(new SimpleLog("MockLog")); + dom.setLog(LoggerFactory.getLogger("MockLog")); dom.configure(setUpConfiguration(false,false,domains)); dom.setDNSService(setUpDNSServer("localhost")); @@ -97,7 +97,7 @@ domains.add("domain1."); XMLDomainList dom = new XMLDomainList(); - dom.setLog(new SimpleLog("MockLog")); + dom.setLog(LoggerFactory.getLogger("MockLog")); dom.configure(setUpConfiguration(true,false,domains)); dom.setDNSService(setUpDNSServer("local")); @@ -109,7 +109,7 @@ domains.add("domain1."); XMLDomainList dom = new XMLDomainList(); - dom.setLog(new SimpleLog("MockLog")); + dom.setLog(LoggerFactory.getLogger("MockLog")); dom.configure(setUpConfiguration(true,false,domains)); dom.setDNSService(setUpDNSServer("localhost")); Index: file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java =================================================================== --- file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java (revision 1074944) +++ file/src/test/java/org/apache/james/user/file/UsersFileRepositoryTest.java (working copy) @@ -28,7 +28,6 @@ import java.util.Iterator; import org.apache.commons.configuration.DefaultConfigurationBuilder; -import org.apache.commons.logging.impl.SimpleLog; import org.apache.james.filesystem.api.FileSystem; import org.apache.james.lifecycle.api.LifecycleUtil; import org.apache.james.user.api.UsersRepository; @@ -38,6 +37,7 @@ import org.apache.james.user.lib.AbstractUsersRepositoryTest; import org.apache.james.vut.api.VirtualUserTable; import org.apache.mailet.MailAddress; +import org.slf4j.LoggerFactory; /** * Test basic behaviours of UsersFileRepository @@ -75,7 +75,7 @@ res.setFileSystem(fs); - res.setLog(new SimpleLog("MockLog")); + res.setLog(LoggerFactory.getLogger("MockLog")); res.configure(configuration); res.init(); return res; Index: file/src/test/java/org/apache/james/vut/file/XMLVirtualUserTableTest.java =================================================================== --- file/src/test/java/org/apache/james/vut/file/XMLVirtualUserTableTest.java (revision 1074944) +++ file/src/test/java/org/apache/james/vut/file/XMLVirtualUserTableTest.java (working copy) @@ -23,13 +23,13 @@ import java.util.List; import org.apache.commons.configuration.DefaultConfigurationBuilder; -import org.apache.commons.logging.impl.SimpleLog; import org.apache.james.vut.api.VirtualUserTable; import org.apache.james.vut.api.VirtualUserTableException; import org.apache.james.vut.file.XMLVirtualUserTable; import org.apache.james.vut.lib.AbstractVirtualUserTable; import org.apache.james.vut.lib.AbstractVirtualUserTableTest; import org.apache.james.vut.lib.VirtualUserTableUtil; +import org.slf4j.LoggerFactory; /** * Test the XML Virtual User Table implementation. @@ -46,7 +46,7 @@ protected AbstractVirtualUserTable getVirtualUserTable() throws Exception { XMLVirtualUserTable virtualUserTable = new XMLVirtualUserTable(); - virtualUserTable.setLog(new SimpleLog("MockLog")); + virtualUserTable.setLog(LoggerFactory.getLogger("MockLog")); return virtualUserTable; } Index: file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java =================================================================== --- file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java (revision 1074944) +++ file/src/main/java/org/apache/james/mailrepository/file/MBoxMailRepository.java (working copy) @@ -73,12 +73,12 @@ import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.HierarchicalConfiguration; -import org.apache.commons.logging.Log; import org.apache.james.core.MailImpl; import org.apache.james.lifecycle.api.Configurable; import org.apache.james.lifecycle.api.LogEnabled; import org.apache.james.mailrepository.api.MailRepository; import org.apache.mailet.Mail; +import org.slf4j.Logger; /** * Implementation of a MailRepository using UNIX mbox files. @@ -156,10 +156,10 @@ */ private HierarchicalConfiguration configuration; - private Log logger; + private Logger logger; - public void setLog(Log logger) { + public void setLog(Logger logger) { this.logger = logger; } @@ -191,7 +191,7 @@ } } - protected Log getLogger() { + protected Logger getLogger() { return logger; } Index: file/pom.xml =================================================================== --- file/pom.xml (revision 1074944) +++ file/pom.xml (working copy) @@ -58,10 +58,15 @@ commons-configuration - commons-logging - commons-logging + org.slf4j + slf4j-api + org.slf4j + slf4j-simple + test + + org.apache.geronimo.specs geronimo-annotation_1.0_spec Index: mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessorTest.java =================================================================== --- mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessorTest.java (revision 1074944) +++ mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessorTest.java (working copy) @@ -29,11 +29,12 @@ import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.DefaultConfigurationBuilder; import org.apache.commons.configuration.HierarchicalConfiguration; -import org.apache.commons.logging.impl.SimpleLog; import org.apache.james.core.MailImpl; import org.apache.james.mailetcontainer.api.MailProcessor; import org.apache.james.mailetcontainer.api.mock.MockMailProcessor; import org.apache.mailet.Mail; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public abstract class AbstractStateCompositeProcessorTest extends TestCase{ @@ -55,8 +56,9 @@ }; } }; - SimpleLog log = new SimpleLog("MockLog"); - log.setLevel(SimpleLog.LOG_LEVEL_DEBUG); + Logger log = LoggerFactory.getLogger("MockLog"); + // slf4j can't set programmatically any log level. It's just a facade + // log.setLevel(SimpleLog.LOG_LEVEL_DEBUG); processor.setLog(log); processor.configure(createConfig(Arrays.asList("root","error","test"))); processor.init(); Index: mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java =================================================================== --- mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java (revision 1074944) +++ mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateMailetProcessor.java (working copy) @@ -33,7 +33,6 @@ import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.HierarchicalConfiguration; -import org.apache.commons.logging.Log; import org.apache.james.lifecycle.api.Configurable; import org.apache.james.lifecycle.api.LogEnabled; import org.apache.james.mailetcontainer.api.MailProcessor; @@ -50,6 +49,7 @@ import org.apache.mailet.MatcherConfig; import org.apache.mailet.base.GenericMailet; import org.apache.mailet.base.MatcherInverter; +import org.slf4j.Logger; /** * Abstract base class for {@link MailProcessor} implementations which want to process {@link Mail} via {@link Matcher} and {@link Mailet} @@ -62,7 +62,7 @@ private List listeners = Collections.synchronizedList(new ArrayList()); private JMXStateMailetProcessorListener jmxListener; private boolean enableJmx = true; - private Log logger; + private Logger logger; private HierarchicalConfiguration config; private MailetLoader mailetLoader; private List pairs = new ArrayList(); @@ -86,9 +86,9 @@ /* * (non-Javadoc) - * @see org.apache.james.lifecycle.api.LogEnabled#setLog(org.apache.commons.logging.Log) + * @see org.apache.james.lifecycle.api.LogEnabled#setLog(org.slf4j.Logger) */ - public void setLog(Log log) { + public void setLog(Logger log) { this.logger = log; } @@ -163,7 +163,7 @@ mailetContext.sendMail(mail); } - protected Log getLogger() { + protected Logger getLogger() { return logger; } Index: mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/JamesMailSpooler.java =================================================================== --- mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/JamesMailSpooler.java (revision 1074944) +++ mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/JamesMailSpooler.java (working copy) @@ -31,7 +31,6 @@ import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.HierarchicalConfiguration; -import org.apache.commons.logging.Log; import org.apache.james.lifecycle.api.Configurable; import org.apache.james.lifecycle.api.LifecycleUtil; import org.apache.james.lifecycle.api.LogEnabled; @@ -41,6 +40,7 @@ import org.apache.james.queue.api.MailQueue.MailQueueItem; import org.apache.james.queue.api.MailQueueFactory; import org.apache.mailet.Mail; +import org.slf4j.Logger; /** * Manages the mail spool. This class is responsible for retrieving @@ -86,7 +86,7 @@ */ private MailProcessor mailProcessor; - private Log logger; + private Logger logger; private MailQueueFactory queueFactory; @@ -229,9 +229,9 @@ /* * (non-Javadoc) - * @see org.apache.james.lifecycle.LogEnabled#setLog(org.apache.commons.logging.Log) + * @see org.apache.james.lifecycle.LogEnabled#setLog(org.slf4j.Logger) */ - public void setLog(Log log) { + public void setLog(Logger log) { this.logger = log; } Index: mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessor.java =================================================================== --- mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessor.java (revision 1074944) +++ mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessor.java (working copy) @@ -31,13 +31,13 @@ import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.HierarchicalConfiguration; -import org.apache.commons.logging.Log; import org.apache.james.lifecycle.api.Configurable; import org.apache.james.lifecycle.api.LifecycleUtil; import org.apache.james.lifecycle.api.LogEnabled; import org.apache.james.mailetcontainer.api.MailProcessor; import org.apache.james.mailetcontainer.lib.jmx.JMXStateCompositeProcessorListener; import org.apache.mailet.Mail; +import org.slf4j.Logger; /** * Abstract base class for {@link CompositeProcessor} which service the {@link Mail} with a {@link CamelProcessor} instances @@ -48,7 +48,7 @@ private List listeners = Collections.synchronizedList(new ArrayList()); private final Map processors = new HashMap(); - protected Log logger; + protected Logger logger; protected HierarchicalConfiguration config; private JMXStateCompositeProcessorListener jmxListener; @@ -56,9 +56,9 @@ /* * (non-Javadoc) - * @see org.apache.james.lifecycle.LogEnabled#setLog(org.apache.commons.logging.Log) + * @see org.apache.james.lifecycle.LogEnabled#setLog(org.slf4j.Logger) */ - public void setLog(Log log) { + public void setLog(Logger log) { this.logger = log; } Index: mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/ProcessorUtil.java =================================================================== --- mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/ProcessorUtil.java (revision 1074944) +++ mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/ProcessorUtil.java (working copy) @@ -26,10 +26,10 @@ import javax.mail.MessagingException; -import org.apache.commons.logging.Log; import org.apache.mailet.Mail; import org.apache.mailet.MailAddress; import org.apache.mailet.MailetException; +import org.slf4j.Logger; public class ProcessorUtil { @@ -44,7 +44,7 @@ * * @throws MessagingException thrown always, rethrowing the passed in exception */ - public static void handleException(MessagingException me, Mail mail, String offendersName, String nextState, Log logger) throws MessagingException { + public static void handleException(MessagingException me, Mail mail, String offendersName, String nextState, Logger logger) throws MessagingException { mail.setState(nextState); StringWriter sout = new StringWriter(); PrintWriter out = new PrintWriter(sout, true); Index: mailetcontainer-library/pom.xml =================================================================== --- mailetcontainer-library/pom.xml (revision 1074944) +++ mailetcontainer-library/pom.xml (working copy) @@ -45,8 +45,8 @@ apache-mailet-base - commons-logging - commons-logging + org.slf4j + slf4j-api commons-configuration Index: container-spring/src/main/java/org/apache/james/container/spring/Main.java =================================================================== --- container-spring/src/main/java/org/apache/james/container/spring/Main.java (revision 1074944) +++ container-spring/src/main/java/org/apache/james/container/spring/Main.java (working copy) @@ -21,16 +21,16 @@ import java.io.IOException; import java.util.Calendar; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.james.container.spring.context.JamesServerApplicationContext; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Bootstraps James using a Spring container. */ public class Main { - private static Log log = LogFactory.getLog(Main.class.getName()); + private static Logger log = LoggerFactory.getLogger(Main.class.getName()); public static void main(String[] args) throws IOException { Index: container-spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java =================================================================== --- container-spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java (revision 1074944) +++ container-spring/src/main/java/org/apache/james/container/spring/bean/factory/mailrepositorystore/MailRepositoryStoreBeanFactory.java (working copy) @@ -30,12 +30,12 @@ import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.DefaultConfigurationBuilder; import org.apache.commons.configuration.HierarchicalConfiguration; -import org.apache.commons.logging.Log; import org.apache.james.container.spring.bean.AbstractBeanFactory; import org.apache.james.lifecycle.api.Configurable; import org.apache.james.lifecycle.api.LogEnabled; import org.apache.james.mailrepository.api.MailRepository; import org.apache.james.mailrepository.api.MailRepositoryStore; +import org.slf4j.Logger; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; /** @@ -67,7 +67,7 @@ /** * The Logger */ - private Log logger; + private Logger logger; /* (non-Javadoc) * @see org.apache.james.lifecycle.api.Configurable#configure(org.apache.commons.configuration.HierarchicalConfiguration) @@ -261,11 +261,11 @@ return new ArrayList(repositories.keySet()); } - public void setLog(Log logger) { + public void setLog(Logger logger) { this.logger = logger; } - private Log getLogger() { + private Logger getLogger() { return logger; } Index: container-spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/ProtocolHandlerChainFactoryPostProcessor.java =================================================================== --- container-spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/ProtocolHandlerChainFactoryPostProcessor.java (revision 1074944) +++ container-spring/src/main/java/org/apache/james/container/spring/bean/factorypostprocessor/ProtocolHandlerChainFactoryPostProcessor.java (working copy) @@ -27,7 +27,6 @@ import org.apache.commons.configuration.ConfigurationUtils; import org.apache.commons.configuration.DefaultConfigurationBuilder; import org.apache.commons.configuration.HierarchicalConfiguration; -import org.apache.commons.logging.Log; import org.apache.james.container.spring.provider.configuration.ConfigurationProvider; import org.apache.james.container.spring.provider.log.LogProvider; import org.apache.james.lifecycle.api.Configurable; @@ -35,6 +34,7 @@ import org.apache.james.protocols.api.ExtensibleHandler; import org.apache.james.protocols.api.HandlersPackage; import org.apache.james.protocols.api.ProtocolHandlerChain; +import org.slf4j.Logger; import org.springframework.beans.BeansException; import org.springframework.beans.FatalBeanException; import org.springframework.beans.factory.config.BeanDefinition; @@ -83,7 +83,7 @@ try { - Log log = logProvider.getLog(beanname); + Logger log = logProvider.getLog(beanname); HierarchicalConfiguration config = confProvider.getConfiguration(beanname); String jmxName = config.getString("jmxName", beanname);; Index: container-spring/src/main/java/org/apache/james/container/spring/provider/log/LogProvider.java =================================================================== --- container-spring/src/main/java/org/apache/james/container/spring/provider/log/LogProvider.java (revision 1074944) +++ container-spring/src/main/java/org/apache/james/container/spring/provider/log/LogProvider.java (working copy) @@ -18,10 +18,10 @@ ****************************************************************/ package org.apache.james.container.spring.provider.log; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; /** - * Provide {@link Log} instances for Beans + * Provide {@link Logger} instances for Beans * * */ @@ -33,13 +33,13 @@ * @param name * @return log */ - public Log getLog(String beanName); + public Logger getLog(String beanName); /** - * Register a {@link Log} for a beanName. The registered Log will get returned by {@link #getLog(String)} + * Register a {@link Logger} for a beanName. The registered Log will get returned by {@link #getLog(String)} * * @param beanName * @param log */ - public void registerLog(String beanName, Log log); + public void registerLog(String beanName, Logger log); } Index: container-spring/src/main/java/org/apache/james/container/spring/provider/log/LogProviderImpl.java =================================================================== --- container-spring/src/main/java/org/apache/james/container/spring/provider/log/LogProviderImpl.java (revision 1074944) +++ container-spring/src/main/java/org/apache/james/container/spring/provider/log/LogProviderImpl.java (working copy) @@ -26,10 +26,9 @@ import java.util.TreeMap; import java.util.concurrent.ConcurrentHashMap; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.impl.Log4JLogger; import org.apache.log4j.Level; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; /** @@ -39,18 +38,18 @@ */ public class LogProviderImpl implements LogProvider, InitializingBean, LogProviderManagementMBean { - private final ConcurrentHashMap logMap = new ConcurrentHashMap(); + private final ConcurrentHashMap logMap = new ConcurrentHashMap(); private Map logs; private final static String PREFIX = "james."; /** - * Use {@link Log4JLogger} to create the Log + * Use {@link Logger} to create the Log * * @param loggerName * @return log */ - protected Log createLog(String loggerName) { - return new Log4JLogger(loggerName); + protected Logger createLog(String loggerName) { + return LoggerFactory.getLogger(loggerName); } @@ -77,16 +76,16 @@ * (non-Javadoc) * @see org.apache.james.container.spring.lifecycle.LogProvider#getLog(java.lang.String) */ - public Log getLog(String name) { + public Logger getLog(String name) { logMap.putIfAbsent(name, createLog(PREFIX + name)); return logMap.get(name); } /* * (non-Javadoc) - * @see org.apache.james.container.spring.lifecycle.LogProvider#registerLog(java.lang.String, org.apache.commons.logging.Log) + * @see org.apache.james.container.spring.lifecycle.LogProvider#registerLog(java.lang.String, org.slf4j.Logger) */ - public void registerLog(String beanName, Log log) { + public void registerLog(String beanName, Logger log) { logMap.put(beanName, log); } @@ -122,11 +121,11 @@ * @see org.apache.james.container.spring.provider.log.LogProviderManagementMBean#getLogLevel(java.lang.String) */ public String getLogLevel(String component) { - Log log = logMap.get(component); + Logger log = logMap.get(component); if (log == null) { throw new IllegalArgumentException("No Log for component "+ component); } - Logger logger = ((Log4JLogger)log).getLogger(); + org.apache.log4j.Logger logger = ((org.apache.log4j.Logger)log).getRootLogger(); if (logger == null || logger.getLevel() == null) { return null; } @@ -143,7 +142,7 @@ if (getSupportedLogLevels().contains(loglevel) == false) { throw new IllegalArgumentException("Not supported loglevel given"); } else { - ((Log4JLogger)logMap.get(component)).getLogger().setLevel(Level.toLevel(loglevel)); + ((org.apache.log4j.Logger)logMap.get(component)).getRootLogger().setLevel(Level.toLevel(loglevel)); } } Index: container-spring/src/main/java/org/apache/james/container/spring/tool/James23Importer.java =================================================================== --- container-spring/src/main/java/org/apache/james/container/spring/tool/James23Importer.java (revision 1074944) +++ container-spring/src/main/java/org/apache/james/container/spring/tool/James23Importer.java (working copy) @@ -26,7 +26,6 @@ import javax.mail.Flags; import javax.mail.MessagingException; -import org.apache.commons.logging.Log; import org.apache.james.core.MimeMessageInputStream; import org.apache.james.domainlist.api.DomainList; import org.apache.james.domainlist.api.DomainListException; @@ -43,6 +42,7 @@ import org.apache.james.user.api.UsersRepository; import org.apache.james.user.api.UsersRepositoryException; import org.apache.mailet.Mail; +import org.slf4j.Logger; /** * Tool to import James 2.3 users and mails into James 3.0. @@ -52,7 +52,7 @@ /** * The logger. */ - private Log log; + private Logger log; /** * James 3.0 users repository. @@ -175,9 +175,9 @@ } /* (non-Javadoc) - * @see org.apache.james.lifecycle.api.LogEnabled#setLog(org.apache.commons.logging.Log) + * @see org.apache.james.lifecycle.api.LogEnabled#setLog(org.slf4j.Logger) */ - public void setLog(Log log) { + public void setLog(Logger log) { this.log = log; } Index: container-spring/pom.xml =================================================================== --- container-spring/pom.xml (revision 1074944) +++ container-spring/pom.xml (working copy) @@ -463,10 +463,23 @@ commons-configuration - commons-logging - commons-logging + org.slf4j + slf4j-api + org.slf4j + slf4j-log4j12 + + + org.slf4j + jcl-over-slf4j + runtime + + + log4j + log4j + + org.apache.james apache-mailet Index: protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockJSR250Loader.java =================================================================== --- protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockJSR250Loader.java (revision 1074944) +++ protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockJSR250Loader.java (working copy) @@ -31,7 +31,7 @@ import javax.annotation.Resource; import org.apache.commons.configuration.HierarchicalConfiguration; -import org.apache.commons.logging.Log; +import org.slf4j.Logger; public class MockJSR250Loader { @@ -65,7 +65,7 @@ return newInstance(clazz, null, null); } - public final T newInstance(Class clazz, Log log, HierarchicalConfiguration config) throws Exception{ + public final T newInstance(Class clazz, Logger log, HierarchicalConfiguration config) throws Exception{ T obj = clazz.newInstance(); injectResources(obj); postConstruct(obj); Index: protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerChain.java =================================================================== --- protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerChain.java (revision 1074944) +++ protocols-library/src/test/java/org/apache/james/protocols/lib/mock/MockProtocolHandlerChain.java (working copy) @@ -28,13 +28,13 @@ import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.DefaultConfigurationBuilder; import org.apache.commons.configuration.HierarchicalConfiguration; -import org.apache.commons.logging.Log; import org.apache.james.lifecycle.api.Configurable; import org.apache.james.lifecycle.api.LogEnabled; import org.apache.james.protocols.api.ExtensibleHandler; import org.apache.james.protocols.api.HandlersPackage; import org.apache.james.protocols.api.ProtocolHandlerChain; import org.apache.james.protocols.api.WiringException; +import org.slf4j.Logger; /** @@ -46,7 +46,7 @@ @SuppressWarnings("unchecked") public class MockProtocolHandlerChain implements ProtocolHandlerChain, Configurable, LogEnabled { - private Log log; + private Logger log; private String coreHandlersPackage; private LinkedList handlers = new LinkedList(); private HierarchicalConfiguration config; @@ -211,9 +211,9 @@ /* * (non-Javadoc) - * @see org.apache.james.lifecycle.LogEnabled#setLog(org.apache.commons.logging.Log) + * @see org.apache.james.lifecycle.LogEnabled#setLog(org.slf4j.Logger) */ - public void setLog(Log log) { + public void setLog(Logger log) { this.log = log; } } \ No newline at end of file Index: protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java =================================================================== --- protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java (revision 1074944) +++ protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java (working copy) @@ -33,7 +33,6 @@ import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.HierarchicalConfiguration; -import org.apache.commons.logging.Log; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.filesystem.api.FileSystem; import org.apache.james.lifecycle.api.Configurable; @@ -41,6 +40,7 @@ import org.apache.james.protocols.impl.AbstractAsyncServer; import org.apache.james.protocols.lib.jmx.ServerMBean; import org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutor; +import org.slf4j.Logger; /** @@ -82,7 +82,7 @@ private FileSystem fileSystem; - private Log logger; + private Logger logger; private DNSService dns; @@ -121,9 +121,9 @@ /* * (non-Javadoc) - * @see org.apache.james.lifecycle.LogEnabled#setLog(org.apache.commons.logging.Log) + * @see org.apache.james.lifecycle.LogEnabled#setLog(org.slf4j.Logger) */ - public final void setLog(Log logger) { + public final void setLog(Logger logger) { this.logger = logger; } @@ -135,7 +135,7 @@ enabled = config.getBoolean("[@enabled]", true); - final Log logger = getLogger(); + final Logger logger = getLogger(); if (!enabled) { logger.info(getServiceType() + " disabled by configuration"); return; @@ -348,7 +348,7 @@ * * @return logger */ - protected Log getLogger() { + protected Logger getLogger() { return logger; } Index: protocols-library/pom.xml =================================================================== --- protocols-library/pom.xml (revision 1074944) +++ protocols-library/pom.xml (working copy) @@ -95,10 +95,15 @@ protocols-impl - commons-logging - commons-logging + org.slf4j + slf4j-api + org.slf4j + slf4j-simple + test + + commons-configuration commons-configuration Index: fetchmail/src/main/java/org/apache/james/fetchmail/ProcessorAbstract.java =================================================================== --- fetchmail/src/main/java/org/apache/james/fetchmail/ProcessorAbstract.java (revision 1074944) +++ fetchmail/src/main/java/org/apache/james/fetchmail/ProcessorAbstract.java (working copy) @@ -27,11 +27,11 @@ import javax.mail.MessagingException; import javax.mail.Session; -import org.apache.commons.logging.Log; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.queue.api.MailQueue; import org.apache.james.user.api.UsersRepository; import org.apache.mailet.MailAddress; +import org.slf4j.Logger; /** *

Class ProcessorAbstract is an abstract class that @@ -152,7 +152,7 @@ * Returns the logger. * @return Logger */ - protected Log getLogger() + protected Logger getLogger() { return getConfiguration().getLogger(); } Index: fetchmail/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java =================================================================== --- fetchmail/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java (revision 1074944) +++ fetchmail/src/main/java/org/apache/james/fetchmail/ParsedConfiguration.java (working copy) @@ -30,13 +30,13 @@ import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.HierarchicalConfiguration; -import org.apache.commons.logging.Log; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.domainlist.api.DomainList; import org.apache.james.domainlist.api.DomainListException; import org.apache.james.queue.api.MailQueue; import org.apache.james.user.api.UsersRepository; import org.apache.mailet.MailAddress; +import org.slf4j.Logger; /** *

Parses and validates an @@ -50,7 +50,7 @@ /** * The logger. */ - private Log fieldLogger; + private Logger fieldLogger; /** * The name of the folder to fetch from the javamail provider @@ -327,7 +327,7 @@ * @param dnsServer * @throws ConfigurationException */ - public ParsedConfiguration(HierarchicalConfiguration configuration, Log logger, UsersRepository localUsers,DNSService dnsServer, DomainList domainList, MailQueue queue) throws ConfigurationException + public ParsedConfiguration(HierarchicalConfiguration configuration, Logger logger, UsersRepository localUsers,DNSService dnsServer, DomainList domainList, MailQueue queue) throws ConfigurationException { this(); setLogger(logger); @@ -569,7 +569,7 @@ * Returns the logger. * @return Logger */ - public Log getLogger() + public Logger getLogger() { return fieldLogger; } @@ -578,7 +578,7 @@ * Sets the logger. * @param logger The logger to set */ - protected void setLogger(Log logger) + protected void setLogger(Logger logger) { fieldLogger = logger; } Index: fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java =================================================================== --- fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java (revision 1074944) +++ fetchmail/src/main/java/org/apache/james/fetchmail/FetchScheduler.java (working copy) @@ -34,7 +34,6 @@ import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.HierarchicalConfiguration; -import org.apache.commons.logging.Log; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.domainlist.api.DomainList; import org.apache.james.lifecycle.api.Configurable; @@ -43,6 +42,7 @@ import org.apache.james.queue.api.MailQueueFactory; import org.apache.james.user.api.UsersRepository; import org.apache.james.util.concurrent.JMXEnabledScheduledThreadPoolExecutor; +import org.slf4j.Logger; /** * A class to instantiate and schedule a set of mail fetching tasks @@ -77,7 +77,7 @@ private UsersRepository urepos; - private Log logger; + private Logger logger; private MailQueue queue; @@ -114,9 +114,9 @@ /* * (non-Javadoc) - * @see org.apache.james.lifecycle.LogEnabled#setLog(org.apache.commons.logging.Log) + * @see org.apache.james.lifecycle.LogEnabled#setLog(org.slf4j.Logger) */ - public final void setLog(Log logger) { + public final void setLog(Logger logger) { this.logger = logger; } Index: fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java =================================================================== --- fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java (revision 1074944) +++ fetchmail/src/main/java/org/apache/james/fetchmail/FetchMail.java (working copy) @@ -37,7 +37,6 @@ import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.HierarchicalConfiguration; import org.apache.commons.configuration.HierarchicalConfiguration.Node; -import org.apache.commons.logging.Log; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.domainlist.api.DomainList; import org.apache.james.lifecycle.api.Configurable; @@ -45,6 +44,7 @@ import org.apache.james.queue.api.MailQueue; import org.apache.james.user.api.UsersRepository; import org.apache.james.user.api.UsersRepositoryException; +import org.slf4j.Logger; /** *

Class FetchMail is an Avalon task that is periodically @@ -400,7 +400,7 @@ */ private DNSService dnsServer; - private Log logger; + private Logger logger; private MailQueue queue; @@ -660,7 +660,7 @@ this.fieldLocalUsers = urepos; } - public final void setLog(Log logger) { + public final void setLog(Logger logger) { this.logger = logger; } Index: fetchmail/pom.xml =================================================================== --- fetchmail/pom.xml (revision 1074944) +++ fetchmail/pom.xml (working copy) @@ -57,8 +57,8 @@ apache-mailet - commons-logging - commons-logging + org.slf4j + slf4j-api commons-configuration Index: osgi/src/main/java/org/apache/james/container/osgi/OsgiLogProvider.java =================================================================== --- osgi/src/main/java/org/apache/james/container/osgi/OsgiLogProvider.java (revision 1074944) +++ osgi/src/main/java/org/apache/james/container/osgi/OsgiLogProvider.java (working copy) @@ -18,9 +18,9 @@ ****************************************************************/ package org.apache.james.container.osgi; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.james.container.spring.provider.log.LogProvider; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** @@ -33,11 +33,11 @@ * (non-Javadoc) * @see org.apache.james.container.spring.lifecycle.LogProvider#getLog(java.lang.String) */ - public Log getLog(String beanName) { - return LogFactory.getLog(beanName); + public Logger getLog(String beanName) { + return LoggerFactory.getLogger(beanName); } - public void registerLog(String beanName, Log log) { + public void registerLog(String beanName, Logger log) { // TODO Auto-generated method stub } Index: osgi/pom.xml =================================================================== --- osgi/pom.xml (revision 1074944) +++ osgi/pom.xml (working copy) @@ -96,8 +96,8 @@ commons-configuration - commons-logging - commons-logging + org.slf4j + slf4j-api Index: dnsservice-library/src/main/java/org/apache/james/dnsservice/library/MXHostAddressIterator.java =================================================================== --- dnsservice-library/src/main/java/org/apache/james/dnsservice/library/MXHostAddressIterator.java (revision 1074944) +++ dnsservice-library/src/main/java/org/apache/james/dnsservice/library/MXHostAddressIterator.java (working copy) @@ -22,9 +22,9 @@ import java.net.UnknownHostException; import java.util.Iterator; -import org.apache.commons.logging.Log; import org.apache.james.dnsservice.api.DNSService; import org.apache.mailet.HostAddress; +import org.slf4j.Logger; /** * @@ -37,15 +37,15 @@ private Iterator hosts; private DNSService dns; private boolean useSingleIP; - private Log logger; + private Logger logger; private int defaultPort; - public MXHostAddressIterator(Iterator hosts, DNSService dns, boolean useSingleIP, Log logger) { + public MXHostAddressIterator(Iterator hosts, DNSService dns, boolean useSingleIP, Logger logger) { this(hosts, 25, dns, useSingleIP, logger); } - public MXHostAddressIterator(Iterator hosts, int defaultPort, DNSService dns, boolean useSingleIP, Log logger) { + public MXHostAddressIterator(Iterator hosts, int defaultPort, DNSService dns, boolean useSingleIP, Logger logger) { this.hosts = hosts; this.dns = dns; this.useSingleIP = useSingleIP; Index: dnsservice-library/pom.xml =================================================================== --- dnsservice-library/pom.xml (revision 1074944) +++ dnsservice-library/pom.xml (working copy) @@ -72,8 +72,8 @@ apache-mailet - commons-logging - commons-logging + org.slf4j + slf4j-api ${javax.mail.groupId} Index: mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java =================================================================== --- mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java (revision 1074944) +++ mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/MailboxManagerManagement.java (working copy) @@ -27,7 +27,6 @@ import javax.management.NotCompliantMBeanException; import javax.management.StandardMBean; -import org.apache.commons.logging.Log; import org.apache.james.lifecycle.api.LogEnabled; import org.apache.james.mailbox.MailboxException; import org.apache.james.mailbox.MailboxManager; @@ -35,6 +34,7 @@ import org.apache.james.mailbox.MailboxPath; import org.apache.james.mailbox.MailboxQuery; import org.apache.james.mailbox.MailboxSession; +import org.slf4j.Logger; /** * JMX managmenent for Mailboxes @@ -44,7 +44,7 @@ public class MailboxManagerManagement extends StandardMBean implements MailboxManagerManagementMBean, LogEnabled { private MailboxManager mailboxManager; - private Log log; + private Logger log; @Resource(name="mailboxmanager") public void setMailboxManager(MailboxManager mailboxManager) { @@ -87,9 +87,9 @@ /* * (non-Javadoc) - * @see org.apache.james.lifecycle.LogEnabled#setLog(org.apache.commons.logging.Log) + * @see org.apache.james.lifecycle.LogEnabled#setLog(org.slf4j.Logger) */ - public void setLog(Log log) { + public void setLog(Logger log) { this.log = log; } Index: mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticator.java =================================================================== --- mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticator.java (revision 1074944) +++ mailbox-adapter/src/main/java/org/apache/james/adapter/mailbox/store/UserRepositoryAuthenticator.java (working copy) @@ -21,11 +21,11 @@ import javax.annotation.Resource; -import org.apache.commons.logging.Log; import org.apache.james.lifecycle.api.LogEnabled; import org.apache.james.mailbox.store.Authenticator; import org.apache.james.user.api.UsersRepository; import org.apache.james.user.api.UsersRepositoryException; +import org.slf4j.Logger; /** * Authenticator which use an UsersRepository to check if the user and password match @@ -34,7 +34,7 @@ public class UserRepositoryAuthenticator implements Authenticator, LogEnabled{ private UsersRepository repos; - private Log log; + private Logger log; @Resource(name="usersrepository") public void setUsersRepository(UsersRepository repos) { @@ -54,7 +54,7 @@ return false; } - public void setLog(Log log) { + public void setLog(Logger log) { this.log = log; } Index: mailbox-adapter/pom.xml =================================================================== --- mailbox-adapter/pom.xml (revision 1074944) +++ mailbox-adapter/pom.xml (working copy) @@ -54,8 +54,8 @@ apache-james-mailbox-maildir - commons-logging - commons-logging + org.slf4j + slf4j-api org.apache.geronimo.specs Index: jpa/src/test/java/org/apache/james/domainlist/jpa/JPADomainListTest.java =================================================================== --- jpa/src/test/java/org/apache/james/domainlist/jpa/JPADomainListTest.java (revision 1074944) +++ jpa/src/test/java/org/apache/james/domainlist/jpa/JPADomainListTest.java (working copy) @@ -24,7 +24,6 @@ import junit.framework.TestCase; -import org.apache.commons.logging.impl.SimpleLog; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.dnsservice.api.mock.MockDNSService; import org.apache.james.domainlist.api.DomainListException; @@ -32,6 +31,7 @@ import org.apache.james.domainlist.jpa.model.JPADomain; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory; import org.apache.openjpa.persistence.OpenJPAPersistence; +import org.slf4j.LoggerFactory; /** * Test the JPA implementation of the DomainList. @@ -77,7 +77,7 @@ // Initialize the JPADomainList (no autodetect,...). jpaDomainList = new JPADomainList(); - jpaDomainList.setLog(new SimpleLog("JPADomainListMockLog")); + jpaDomainList.setLog(LoggerFactory.getLogger("JPADomainListMockLog")); jpaDomainList.setDNSService(setUpDNSServer("localhost")); jpaDomainList.setAutoDetect(false); jpaDomainList.setAutoDetectIP(false); Index: jpa/src/test/java/org/apache/james/user/jpa/JpaUsersRepositoryTest.java =================================================================== --- jpa/src/test/java/org/apache/james/user/jpa/JpaUsersRepositoryTest.java (revision 1074944) +++ jpa/src/test/java/org/apache/james/user/jpa/JpaUsersRepositoryTest.java (working copy) @@ -22,7 +22,6 @@ import java.util.HashMap; import org.apache.commons.configuration.DefaultConfigurationBuilder; -import org.apache.commons.logging.impl.SimpleLog; import org.apache.james.user.api.UsersRepository; import org.apache.james.user.jpa.JPAUsersRepository; import org.apache.james.user.jpa.model.JPAUser; @@ -31,6 +30,7 @@ import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory; import org.apache.openjpa.persistence.OpenJPAEntityTransaction; import org.apache.openjpa.persistence.OpenJPAPersistence; +import org.slf4j.LoggerFactory; public class JpaUsersRepositoryTest extends AbstractUsersRepositoryTest { @@ -78,7 +78,7 @@ protected UsersRepository getUsersRepository() throws Exception { factory = OpenJPAPersistence.getEntityManagerFactory(properties); JPAUsersRepository repos = new JPAUsersRepository(); - repos.setLog(new SimpleLog("JPA")); + repos.setLog(LoggerFactory.getLogger("JPA")); repos.setEntityManagerFactory(factory); repos.configure(new DefaultConfigurationBuilder()); return repos; Index: jpa/src/test/java/org/apache/james/vut/jpa/JPAVirtualUserTableTest.java =================================================================== --- jpa/src/test/java/org/apache/james/vut/jpa/JPAVirtualUserTableTest.java (revision 1074944) +++ jpa/src/test/java/org/apache/james/vut/jpa/JPAVirtualUserTableTest.java (working copy) @@ -21,7 +21,6 @@ import java.util.HashMap; import org.apache.commons.configuration.DefaultConfigurationBuilder; -import org.apache.commons.logging.impl.SimpleLog; import org.apache.james.vut.api.VirtualUserTableException; import org.apache.james.vut.jpa.JPAVirtualUserTable; import org.apache.james.vut.jpa.model.JPAVirtualUser; @@ -29,6 +28,7 @@ import org.apache.james.vut.lib.AbstractVirtualUserTableTest; import org.apache.openjpa.persistence.OpenJPAEntityManagerFactory; import org.apache.openjpa.persistence.OpenJPAPersistence; +import org.slf4j.LoggerFactory; /** * Test the JPA Virtual User Table implementation. @@ -68,7 +68,7 @@ */ protected AbstractVirtualUserTable getVirtualUserTable() throws Exception { JPAVirtualUserTable virtualUserTable = new JPAVirtualUserTable(); - virtualUserTable.setLog(new SimpleLog("MockLog")); + virtualUserTable.setLog(LoggerFactory.getLogger("MockLog")); virtualUserTable.setEntityManagerFactory(factory); DefaultConfigurationBuilder defaultConfiguration = new DefaultConfigurationBuilder(); virtualUserTable.configure(defaultConfiguration); Index: jpa/pom.xml =================================================================== --- jpa/pom.xml (revision 1074944) +++ jpa/pom.xml (working copy) @@ -85,10 +85,15 @@ commons-configuration - commons-logging - commons-logging + org.slf4j + slf4j-api + org.slf4j + slf4j-simple + test + + commons-codec commons-codec Index: smtpserver/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java =================================================================== --- smtpserver/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java (revision 1074944) +++ smtpserver/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java (working copy) @@ -39,7 +39,6 @@ import junit.framework.TestCase; -import org.apache.commons.logging.impl.SimpleLog; import org.apache.commons.net.smtp.SMTPClient; import org.apache.commons.net.smtp.SMTPReply; import org.apache.james.protocols.impl.AbstractChannelPipelineFactory; @@ -59,6 +58,8 @@ import org.apache.mailet.HostAddress; import org.apache.mailet.Mail; import org.apache.mailet.MailAddress; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public abstract class SMTPServerTest extends TestCase { @@ -160,8 +161,9 @@ protected void setUp() throws Exception { setUpFakeLoader(); - SimpleLog log = new SimpleLog("Mock"); - log.setLevel(SimpleLog.LOG_LEVEL_ALL); + Logger log = LoggerFactory.getLogger("Mock"); + // slf4j can't set programmatically any log level. It's just a facade + // log.setLevel(SimpleLog.LOG_LEVEL_ALL); m_testConfiguration = new SMTPTestConfiguration(m_smtpListenerPort); @@ -180,8 +182,9 @@ } protected void setUpSMTPServer() throws Exception { - SimpleLog log = new SimpleLog("SMTP"); - log.setLevel(SimpleLog.LOG_LEVEL_ALL); + Logger log = LoggerFactory.getLogger("SMTP"); + // slf4j can't set programmatically any log level. It's just a facade + // log.setLevel(SimpleLog.LOG_LEVEL_ALL); m_smtpServer = new SMTPServer(); m_smtpServer.setDNSService(m_dnsServer); m_smtpServer.setFileSystem(fileSystem); Index: smtpserver/src/main/java/org/apache/james/smtpserver/SMTPServerDNSServiceAdapter.java =================================================================== --- smtpserver/src/main/java/org/apache/james/smtpserver/SMTPServerDNSServiceAdapter.java (revision 1074944) +++ smtpserver/src/main/java/org/apache/james/smtpserver/SMTPServerDNSServiceAdapter.java (working copy) @@ -23,17 +23,17 @@ import java.util.Collection; import java.util.Iterator; -import org.apache.commons.logging.Log; import org.apache.james.dnsservice.library.MXHostAddressIterator; import org.apache.james.lifecycle.api.LogEnabled; import org.apache.james.protocols.smtp.DNSService; import org.apache.james.protocols.smtp.TemporaryResolutionException; import org.apache.mailet.HostAddress; +import org.slf4j.Logger; public class SMTPServerDNSServiceAdapter implements DNSService, LogEnabled{ private org.apache.james.dnsservice.api.DNSService dns; - private Log log; + private Logger log; public SMTPServerDNSServiceAdapter(org.apache.james.dnsservice.api.DNSService dns) { this.dns = dns; @@ -95,7 +95,7 @@ /* * */ - public void setLog(Log log) { + public void setLog(Logger log) { this.log = log; } Index: smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java =================================================================== --- smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java (revision 1074944) +++ smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/JDBCGreylistHandler.java (working copy) @@ -39,8 +39,6 @@ import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.HierarchicalConfiguration; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.dnsservice.library.netmatcher.NetMatcher; import org.apache.james.filesystem.api.FileSystem; @@ -54,6 +52,8 @@ import org.apache.james.util.sql.JDBCUtil; import org.apache.james.util.sql.SqlResources; import org.apache.mailet.MailAddress; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * GreylistHandler which can be used to activate Greylisting @@ -62,10 +62,10 @@ /** This log is the fall back shared by all instances */ - private static final Log FALLBACK_LOG = LogFactory.getLog(JDBCGreylistHandler.class); + private static final Logger FALLBACK_LOG = LoggerFactory.getLogger(JDBCGreylistHandler.class); /** Non context specific log should only be used when no context specific log is available */ - private Log serviceLog = FALLBACK_LOG; + private Logger serviceLog = FALLBACK_LOG; private DataSource datasource = null; @@ -406,7 +406,7 @@ sqlFile = fileSystem.getFile(sqlFileUrl); sqlFileUrl = null; } catch (Exception e) { - serviceLog.fatal(e.getMessage(), e); + serviceLog.error(e.getMessage(), e); throw e; } @@ -481,7 +481,7 @@ /** * @see org.apache.james.lifecycle.api.LogEnabled#setLog(org.apache.commons.logging.Log) */ - public void setLog(Log log) { + public void setLog(Logger log) { this.serviceLog = log; } } Index: smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java =================================================================== --- smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java (revision 1074944) +++ smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/SPFHandler.java (working copy) @@ -22,8 +22,6 @@ import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.HierarchicalConfiguration; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.james.jspf.core.DNSService; import org.apache.james.jspf.core.exceptions.SPFErrorConstants; import org.apache.james.jspf.executor.SPFResult; @@ -41,15 +39,17 @@ import org.apache.james.smtpserver.JamesMessageHook; import org.apache.mailet.Mail; import org.apache.mailet.MailAddress; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class SPFHandler implements JamesMessageHook, LogEnabled, MailHook, RcptHook, Configurable { /** This log is the fall back shared by all instances */ - private static final Log FALLBACK_LOG = LogFactory.getLog(SPFHandler.class); + private static final Logger FALLBACK_LOG = LoggerFactory.getLogger(SPFHandler.class); /** Non context specific log should only be used when no context specific log is available */ - private Log serviceLog = FALLBACK_LOG; + private Logger serviceLog = FALLBACK_LOG; public static final String SPF_BLOCKLISTED = "SPF_BLOCKLISTED"; @@ -76,7 +76,7 @@ * Where available, a context sensitive log should be used. * @param Log not null */ - public void setLog(Log log) { + public void setLog(Logger log) { this.serviceLog = log; } @@ -230,14 +230,14 @@ * @see org.apache.james.jspf.core.Logger#fatalError(String) */ public void fatalError(String message) { - serviceLog.fatal(message); + serviceLog.error(message); } /** * @see org.apache.james.jspf.core.Logger#fatalError(String, Throwable) */ public void fatalError(String message, Throwable t) { - serviceLog.fatal(message, t); + serviceLog.error(message, t); } /** Index: smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java =================================================================== --- smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java (revision 1074944) +++ smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/URIRBLHandler.java (working copy) @@ -38,8 +38,6 @@ import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.HierarchicalConfiguration; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.lifecycle.api.Configurable; import org.apache.james.lifecycle.api.LogEnabled; @@ -49,6 +47,8 @@ import org.apache.james.protocols.smtp.hook.HookReturnCode; import org.apache.james.smtpserver.JamesMessageHook; import org.apache.mailet.Mail; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Extract domains from message and check against URIRBLServer. For more informations see http://www.surbl.org @@ -56,10 +56,10 @@ public class URIRBLHandler implements LogEnabled, JamesMessageHook, Configurable { /** This log is the fall back shared by all instances */ - private static final Log FALLBACK_LOG = LogFactory.getLog(URIRBLHandler.class); + private static final Logger FALLBACK_LOG = LoggerFactory.getLogger(URIRBLHandler.class); /** Non context specific log should only be used when no context specific log is available */ - private Log serviceLog = FALLBACK_LOG; + private Logger serviceLog = FALLBACK_LOG; private final static String LISTED_DOMAIN ="LISTED_DOMAIN"; @@ -77,7 +77,7 @@ * Where available, a context sensitive log should be used. * @param Log not null */ - public void setLog(Log log) { + public void setLog(Logger log) { this.serviceLog = log; } Index: smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java =================================================================== --- smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java (revision 1074944) +++ smtpserver/src/main/java/org/apache/james/smtpserver/fastfail/ValidRcptMX.java (working copy) @@ -29,8 +29,6 @@ import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.HierarchicalConfiguration; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.dnsservice.api.TemporaryResolutionException; import org.apache.james.dnsservice.library.netmatcher.NetMatcher; @@ -43,6 +41,8 @@ import org.apache.james.protocols.smtp.hook.HookReturnCode; import org.apache.james.protocols.smtp.hook.RcptHook; import org.apache.mailet.MailAddress; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * This class can be used to reject email with bogus MX which is send from a authorized user or an authorized @@ -51,10 +51,10 @@ public class ValidRcptMX implements LogEnabled, RcptHook, Configurable{ /** This log is the fall back shared by all instances */ - private static final Log FALLBACK_LOG = LogFactory.getLog(ValidRcptMX.class); + private static final Logger FALLBACK_LOG = LoggerFactory.getLogger(ValidRcptMX.class); /** Non context specific log should only be used when no context specific log is available */ - private Log serviceLog = FALLBACK_LOG; + private Logger serviceLog = FALLBACK_LOG; private DNSService dnsService = null; @@ -68,7 +68,7 @@ * Where available, a context sensitive log should be used. * @param Log not null */ - public void setLog(Log log) { + public void setLog(Logger log) { this.serviceLog = log; } Index: smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPChannelUpstreamHandler.java =================================================================== --- smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPChannelUpstreamHandler.java (revision 1074944) +++ smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPChannelUpstreamHandler.java (working copy) @@ -21,7 +21,6 @@ import javax.net.ssl.SSLContext; import javax.net.ssl.SSLEngine; -import org.apache.commons.logging.Log; import org.apache.james.lifecycle.api.LifecycleUtil; import org.apache.james.protocols.api.ProtocolHandlerChain; import org.apache.james.protocols.api.ProtocolSession; @@ -36,24 +35,25 @@ import org.jboss.netty.channel.ChannelUpstreamHandler; import org.jboss.netty.channel.ExceptionEvent; import org.jboss.netty.handler.codec.frame.TooLongFrameException; +import org.slf4j.Logger; /** * {@link ChannelUpstreamHandler} which is used by the SMTPServer * */ public class SMTPChannelUpstreamHandler extends AbstractChannelUpstreamHandler{ - private final Log logger; + private final Logger logger; private final SMTPConfiguration conf; private final SSLContext context; private String[] enabledCipherSuites; public SMTPChannelUpstreamHandler(ProtocolHandlerChain chain, - SMTPConfiguration conf, Log logger) { + SMTPConfiguration conf, Logger logger) { this(chain, conf, logger, null, null); } public SMTPChannelUpstreamHandler(ProtocolHandlerChain chain, - SMTPConfiguration conf, Log logger, SSLContext context, String[] enabledCipherSuites) { + SMTPConfiguration conf, Logger logger, SSLContext context, String[] enabledCipherSuites) { super(chain); this.conf = conf; this.logger = logger; Index: smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPNettySession.java =================================================================== --- smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPNettySession.java (revision 1074944) +++ smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPNettySession.java (working copy) @@ -24,7 +24,6 @@ import javax.net.ssl.SSLEngine; -import org.apache.commons.logging.Log; import org.apache.james.protocols.api.LineHandler; import org.apache.james.protocols.impl.AbstractSession; import org.apache.james.protocols.impl.LineHandlerUpstreamHandler; @@ -32,6 +31,7 @@ import org.apache.james.protocols.smtp.SMTPSession; import org.apache.james.smtpserver.netty.SMTPServer.SMTPHandlerConfigurationDataImpl; import org.jboss.netty.channel.ChannelHandlerContext; +import org.slf4j.Logger; /** * {@link SMTPSession} implementation for use with Netty @@ -50,7 +50,7 @@ private int lineHandlerCount = 0; - public SMTPNettySession(SMTPConfiguration theConfigData, Log logger, ChannelHandlerContext handlerContext, SSLEngine engine) { + public SMTPNettySession(SMTPConfiguration theConfigData, Logger logger, ChannelHandlerContext handlerContext, SSLEngine engine) { super(logger, handlerContext, engine); this.theConfigData = theConfigData; connectionState = new HashMap(); @@ -58,7 +58,7 @@ relayingAllowed = theConfigData.isRelayingAllowed(getRemoteIPAddress()); } - public SMTPNettySession(SMTPConfiguration theConfigData, Log logger, ChannelHandlerContext handlerContext) { + public SMTPNettySession(SMTPConfiguration theConfigData, Logger logger, ChannelHandlerContext handlerContext) { this(theConfigData, logger, handlerContext, null); } Index: smtpserver/pom.xml =================================================================== --- smtpserver/pom.xml (revision 1074944) +++ smtpserver/pom.xml (working copy) @@ -86,8 +86,8 @@ apache-jspf-resolver - commons-logging - commons-logging + org.slf4j + slf4j-api commons-configuration @@ -179,5 +179,10 @@ test-jar test + + org.slf4j + slf4j-simple + test + Index: data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java =================================================================== --- data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java (revision 1074944) +++ data-library/src/main/java/org/apache/james/repository/file/AbstractFileRepository.java (working copy) @@ -23,11 +23,11 @@ import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.HierarchicalConfiguration; -import org.apache.commons.logging.Log; import org.apache.james.filesystem.api.FileSystem; import org.apache.james.lifecycle.api.Configurable; import org.apache.james.lifecycle.api.LogEnabled; import org.apache.james.repository.api.Repository; +import org.slf4j.Logger; import java.io.File; import java.io.FileInputStream; @@ -69,7 +69,7 @@ private FileSystem fileSystem; - private Log logger; + private Logger logger; private String destination; @@ -83,11 +83,11 @@ this.fileSystem = fileSystem; } - public void setLog(Log logger) { + public void setLog(Logger logger) { this.logger = logger; } - protected Log getLogger() { + protected Logger getLogger() { return logger; } Index: data-library/src/main/java/org/apache/james/mailrepository/lib/AbstractMailRepository.java =================================================================== --- data-library/src/main/java/org/apache/james/mailrepository/lib/AbstractMailRepository.java (revision 1074944) +++ data-library/src/main/java/org/apache/james/mailrepository/lib/AbstractMailRepository.java (working copy) @@ -23,11 +23,11 @@ import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.HierarchicalConfiguration; -import org.apache.commons.logging.Log; import org.apache.james.lifecycle.api.Configurable; import org.apache.james.lifecycle.api.LogEnabled; import org.apache.james.mailrepository.api.MailRepository; import org.apache.mailet.Mail; +import org.slf4j.Logger; import javax.mail.MessagingException; @@ -51,14 +51,14 @@ */ private final Lock lock = new Lock();; - private Log logger; + private Logger logger; - public void setLog(Log logger) { + public void setLog(Logger logger) { this.logger = logger; } - protected Log getLogger() { + protected Logger getLogger() { return logger; } Index: data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java =================================================================== --- data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java (revision 1074944) +++ data-library/src/main/java/org/apache/james/domainlist/lib/AbstractDomainList.java (working copy) @@ -32,12 +32,12 @@ import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.HierarchicalConfiguration; -import org.apache.commons.logging.Log; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.domainlist.api.DomainList; import org.apache.james.domainlist.api.DomainListException; import org.apache.james.lifecycle.api.Configurable; import org.apache.james.lifecycle.api.LogEnabled; +import org.slf4j.Logger; /** * All implementations of the DomainList interface should extends this abstract class @@ -46,7 +46,7 @@ private DNSService dns; private boolean autoDetect = true; private boolean autoDetectIP = true; - private Log logger; + private Logger logger; private String defaultDomain; @Resource(name="dnsservice") @@ -55,11 +55,11 @@ } - public void setLog(Log logger) { + public void setLog(Logger logger) { this.logger = logger; } - protected Log getLogger() { + protected Logger getLogger() { return logger; } @@ -130,7 +130,7 @@ * @param domains List of domains * @return domainIP List of ipaddress for domains */ - private static List getDomainsIP(List domains,DNSService dns,Log log) { + private static List getDomainsIP(List domains,DNSService dns,Logger log) { List domainIP = new ArrayList(); if (domains.size() > 0 ) { for (int i = 0; i < domains.size(); i++) { @@ -149,7 +149,7 @@ /** * @see #getDomainsIP(List, DNSService, Logger) */ - private static List getDomainIP(String domain, DNSService dns, Log log) { + private static List getDomainIP(String domain, DNSService dns, Logger log) { List domainIP = new ArrayList(); try { InetAddress[] addrs = dns.getAllByName(domain); Index: data-library/src/main/java/org/apache/james/user/lib/AbstractUsersRepository.java =================================================================== --- data-library/src/main/java/org/apache/james/user/lib/AbstractUsersRepository.java (revision 1074944) +++ data-library/src/main/java/org/apache/james/user/lib/AbstractUsersRepository.java (working copy) @@ -24,31 +24,31 @@ import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.HierarchicalConfiguration; -import org.apache.commons.logging.Log; import org.apache.james.domainlist.api.DomainList; import org.apache.james.domainlist.api.DomainListException; import org.apache.james.lifecycle.api.Configurable; import org.apache.james.lifecycle.api.LogEnabled; import org.apache.james.user.api.UsersRepository; import org.apache.james.user.api.UsersRepositoryException; +import org.slf4j.Logger; public abstract class AbstractUsersRepository implements UsersRepository, LogEnabled, Configurable{ private DomainList domainList; private boolean virtualHosting; - private Log logger; + private Logger logger; - protected Log getLogger() { + protected Logger getLogger() { return logger; } /* * (non-Javadoc) - * @see org.apache.james.lifecycle.api.LogEnabled#setLog(org.apache.commons.logging.Log) + * @see org.apache.james.lifecycle.api.LogEnabled#setLog(org.slf4j.Logger) */ - public void setLog(Log logger) { + public void setLog(Logger logger) { this.logger = logger; } Index: data-library/src/main/java/org/apache/james/vut/lib/AbstractVirtualUserTable.java =================================================================== --- data-library/src/main/java/org/apache/james/vut/lib/AbstractVirtualUserTable.java (revision 1074944) +++ data-library/src/main/java/org/apache/james/vut/lib/AbstractVirtualUserTable.java (working copy) @@ -31,7 +31,6 @@ import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.configuration.HierarchicalConfiguration; -import org.apache.commons.logging.Log; import org.apache.james.domainlist.api.DomainList; import org.apache.james.domainlist.api.DomainListException; import org.apache.james.lifecycle.api.Configurable; @@ -39,6 +38,7 @@ import org.apache.james.vut.api.VirtualUserTable; import org.apache.james.vut.api.VirtualUserTableException; import org.apache.mailet.MailAddress; +import org.slf4j.Logger; /** * @@ -49,7 +49,7 @@ private boolean recursive = true; - private Log logger; + private Logger logger; private DomainList domainList; @@ -72,7 +72,7 @@ doConfigure(config); } - public void setLog(Log logger) { + public void setLog(Logger logger) { this.logger = logger; } @@ -350,7 +350,7 @@ removeMappingInternal(null, aliasDomain, VirtualUserTable.ALIASDOMAIN_PREFIX + realDomain); } - protected Log getLogger() { + protected Logger getLogger() { return logger; } Index: data-library/pom.xml =================================================================== --- data-library/pom.xml (revision 1074944) +++ data-library/pom.xml (working copy) @@ -54,8 +54,8 @@ commons-configuration - commons-logging - commons-logging + org.slf4j + slf4j-api org.apache.geronimo.specs Index: imapserver/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java =================================================================== --- imapserver/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java (revision 1074944) +++ imapserver/src/main/java/org/apache/james/imapserver/netty/ImapChannelUpstreamHandler.java (working copy) @@ -23,7 +23,6 @@ import javax.net.ssl.SSLContext; -import org.apache.commons.logging.Log; import org.apache.james.imap.api.ImapConstants; import org.apache.james.imap.api.ImapMessage; import org.apache.james.imap.api.ImapSessionState; @@ -42,6 +41,7 @@ import org.jboss.netty.channel.MessageEvent; import org.jboss.netty.channel.SimpleChannelUpstreamHandler; import org.jboss.netty.handler.codec.frame.TooLongFrameException; +import org.slf4j.Logger; /** * {@link SimpleChannelUpstreamHandler} which handles IMAP @@ -50,7 +50,7 @@ */ public class ImapChannelUpstreamHandler extends SimpleChannelUpstreamHandler implements ChannelAttributeSupport{ - private final Log logger; + private final Logger logger; private final String hello; @@ -65,12 +65,12 @@ private ImapEncoder encoder; - public ImapChannelUpstreamHandler(final String hello, final ImapProcessor processor, ImapEncoder encoder, final Log logger, boolean compress) { + public ImapChannelUpstreamHandler(final String hello, final ImapProcessor processor, ImapEncoder encoder, final Logger logger, boolean compress) { this(hello, processor, encoder, logger, compress, null, null); } - public ImapChannelUpstreamHandler(final String hello, final ImapProcessor processor, ImapEncoder encoder, final Log logger, boolean compress, SSLContext context, String[] enabledCipherSuites) { + public ImapChannelUpstreamHandler(final String hello, final ImapProcessor processor, ImapEncoder encoder, final Logger logger, boolean compress, SSLContext context, String[] enabledCipherSuites) { this.logger = logger; this.hello = hello; this.processor = processor; @@ -80,7 +80,7 @@ this.compress = compress; } - private Log getLogger(Channel channel) { + private Logger getLogger(Channel channel) { return new SessionLog(""+channel.getId(), logger); } @@ -173,7 +173,7 @@ final IOException failure = responseEncoder.getFailure(); if (failure != null) { - final Log logger = session.getLog(); + final Logger logger = session.getLog(); logger.info(failure.getMessage()); if (logger.isDebugEnabled()) { logger.debug("Failed to write " + message, failure); Index: imapserver/src/main/java/org/apache/james/imapserver/netty/NettyImapSession.java =================================================================== --- imapserver/src/main/java/org/apache/james/imapserver/netty/NettyImapSession.java (revision 1074944) +++ imapserver/src/main/java/org/apache/james/imapserver/netty/NettyImapSession.java (working copy) @@ -23,7 +23,6 @@ import javax.net.ssl.SSLContext; -import org.apache.commons.logging.Log; import org.apache.james.imap.api.ImapSessionState; import org.apache.james.imap.api.process.ImapLineHandler; import org.apache.james.imap.api.process.ImapSession; @@ -34,6 +33,7 @@ import org.jboss.netty.handler.codec.compression.ZlibEncoder; import org.jboss.netty.handler.codec.compression.ZlibWrapper; import org.jboss.netty.handler.ssl.SslHandler; +import org.slf4j.Logger; public class NettyImapSession implements ImapSession, NettyConstants{ @@ -48,7 +48,7 @@ private int handlerCount; - public NettyImapSession(ChannelHandlerContext context, Log log, SSLContext sslContext, String[] enabledCipherSuites, boolean compress) { + public NettyImapSession(ChannelHandlerContext context, Logger log, SSLContext sslContext, String[] enabledCipherSuites, boolean compress) { this.context = context; this.log = new SessionLog(context.getChannel().getId() + "", log); this.sslContext = sslContext; @@ -221,7 +221,7 @@ * (non-Javadoc) * @see org.apache.james.imap.api.process.ImapSession#getLog() */ - public Log getLog() { + public Logger getLog() { return log; } Index: imapserver/pom.xml =================================================================== --- imapserver/pom.xml (revision 1074944) +++ imapserver/pom.xml (working copy) @@ -45,8 +45,8 @@ protocols-impl - commons-logging - commons-logging + org.slf4j + slf4j-api commons-configuration