Author: norman Date: Sun Jan 1 12:10:26 2012 New Revision: 1226241 URL: http://svn.apache.org/viewvc?rev=1226241&view=rev Log: Add Logger adapter for slf4j. See PROTOCOLS-81
Added: james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/logger/ james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/logger/Logger.java (contents, props changed) - copied, changed from r1224771, james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/Logger.java james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/logger/ProtocolSessionLogger.java - copied, changed from r1224771, james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionLogger.java james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/logger/Slf4jLogger.java (with props) Removed: james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/Logger.java james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionLogger.java Modified: james/protocols/trunk/api/pom.xml james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/FutureResponseImpl.java james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolImpl.java james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSession.java james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionImpl.java james/protocols/trunk/pom.xml james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/POP3Protocol.java james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/POP3SessionImpl.java james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocol.java james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/BaseFakeSMTPSession.java james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/MockLogger.java Modified: james/protocols/trunk/api/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/pom.xml?rev=1226241&r1=1226240&r2=1226241&view=diff ============================================================================== --- james/protocols/trunk/api/pom.xml (original) +++ james/protocols/trunk/api/pom.xml Sun Jan 1 12:10:26 2012 @@ -33,6 +33,14 @@ <name>Apache James Protocols API</name> <dependencies> + + <!-- Logging frameworks - completely optional --> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <scope>compile</scope> + <optional>true</optional> + </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> Modified: james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/FutureResponseImpl.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/FutureResponseImpl.java?rev=1226241&r1=1226240&r2=1226241&view=diff ============================================================================== --- james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/FutureResponseImpl.java (original) +++ james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/FutureResponseImpl.java Sun Jan 1 12:10:26 2012 @@ -22,6 +22,8 @@ package org.apache.james.protocols.api; import java.util.ArrayList; import java.util.List; +import org.apache.james.protocols.api.logger.Logger; + /** * {@link FutureResponse} implementation which wraps a {@link AbstractResponse} implementation * Modified: james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolImpl.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolImpl.java?rev=1226241&r1=1226240&r2=1226241&view=diff ============================================================================== --- james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolImpl.java (original) +++ james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolImpl.java Sun Jan 1 12:10:26 2012 @@ -20,6 +20,7 @@ package org.apache.james.protocols.api; import org.apache.james.protocols.api.handler.ProtocolHandlerChain; +import org.apache.james.protocols.api.logger.Logger; /** * Basic {@link Protocol} implementation Modified: james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSession.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSession.java?rev=1226241&r1=1226240&r2=1226241&view=diff ============================================================================== --- james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSession.java (original) +++ james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSession.java Sun Jan 1 12:10:26 2012 @@ -22,6 +22,8 @@ package org.apache.james.protocols.api; import java.net.InetSocketAddress; import java.util.Map; +import org.apache.james.protocols.api.logger.Logger; + /** * Session for a protocol. Every new connection generates a new session * Modified: james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionImpl.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionImpl.java?rev=1226241&r1=1226240&r2=1226241&view=diff ============================================================================== --- james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionImpl.java (original) +++ james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionImpl.java Sun Jan 1 12:10:26 2012 @@ -25,6 +25,8 @@ import java.util.Map; import org.apache.james.protocols.api.ProtocolTransport; +import org.apache.james.protocols.api.logger.Logger; +import org.apache.james.protocols.api.logger.ProtocolSessionLogger; /** * Basic implementation of {@link ProtocolSession} Copied: james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/logger/Logger.java (from r1224771, james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/Logger.java) URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/logger/Logger.java?p2=james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/logger/Logger.java&p1=james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/Logger.java&r1=1224771&r2=1226241&rev=1226241&view=diff ============================================================================== --- james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/Logger.java (original) +++ james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/logger/Logger.java Sun Jan 1 12:10:26 2012 @@ -18,7 +18,7 @@ ****************************************************************/ -package org.apache.james.protocols.api; +package org.apache.james.protocols.api.logger; public interface Logger { @@ -45,19 +45,6 @@ public interface Logger { */ boolean isErrorEnabled(); - - /** - * <p> Is fatal logging currently enabled? </p> - * - * <p> Call this method to prevent having to perform expensive operations - * (for example, <code>String</code> concatenation) - * when the log level is more than fatal. </p> - * - * @return true if fatal is enabled in the underlying logger. - */ - boolean isFatalEnabled(); - - /** * <p> Is info logging currently enabled? </p> * @@ -177,21 +164,4 @@ public interface Logger { * @param t log this cause */ void error(String message, Throwable t); - - - /** - * <p> Log a message with fatal log level. </p> - * - * @param message log this message - */ - void fatal(String message); - - - /** - * <p> Log an error with fatal log level. </p> - * - * @param message log this message - * @param t log this cause - */ - void fatal(String message, Throwable t); } Propchange: james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/logger/Logger.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Copied: james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/logger/ProtocolSessionLogger.java (from r1224771, james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionLogger.java) URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/logger/ProtocolSessionLogger.java?p2=james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/logger/ProtocolSessionLogger.java&p1=james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionLogger.java&r1=1224771&r2=1226241&rev=1226241&view=diff ============================================================================== --- james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionLogger.java (original) +++ james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/logger/ProtocolSessionLogger.java Sun Jan 1 12:10:26 2012 @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.protocols.api; +package org.apache.james.protocols.api.logger; /** @@ -44,7 +44,7 @@ public class ProtocolSessionLogger imple } /** - * @see org.slf4j.Logger#debug(String, Throwable) + * @see org.apache.james.protocols.api.logger.slf4j.Logger#debug(String, Throwable) */ public void debug(String arg0, Throwable arg1) { logger.debug(getText(arg0), arg1); @@ -52,14 +52,14 @@ public class ProtocolSessionLogger imple } /** - * @see org.slf4j.Logger#error(java.lang.String) + * @see org.apache.james.protocols.api.logger.slf4j.Logger#error(java.lang.String) */ public void error(String arg0) { logger.error(getText(arg0)); } /** - * @see org.slf4j.Logger#error(java.lang.String, java.lang.Throwable) + * @see org.apache.james.protocols.api.logger.slf4j.Logger#error(java.lang.String, java.lang.Throwable) */ public void error(String arg0, Throwable arg1) { logger.error(getText(arg0), arg1); @@ -116,17 +116,4 @@ public class ProtocolSessionLogger imple } - public boolean isFatalEnabled() { - return logger.isFatalEnabled(); - } - - public void fatal(String message) { - logger.fatal(getText(message)); - - } - - public void fatal(String message, Throwable t) { - logger.fatal(getText(message), t); - } - } Added: james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/logger/Slf4jLogger.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/logger/Slf4jLogger.java?rev=1226241&view=auto ============================================================================== --- james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/logger/Slf4jLogger.java (added) +++ james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/logger/Slf4jLogger.java Sun Jan 1 12:10:26 2012 @@ -0,0 +1,92 @@ +/**************************************************************** + * Licensed to the Apache Software Foundation (ASF) under one * + * or more contributor license agreements. See the NOTICE file * + * distributed with this work for additional information * + * regarding copyright ownership. The ASF licenses this file * + * to you under the Apache License, Version 2.0 (the * + * "License"); you may not use this file except in compliance * + * with the License. You may obtain a copy of the License at * + * * + * http://www.apache.org/licenses/LICENSE-2.0 * + * * + * Unless required by applicable law or agreed to in writing, * + * software distributed under the License is distributed on an * + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * + * KIND, either express or implied. See the License for the * + * specific language governing permissions and limitations * + * under the License. * + ****************************************************************/ + +package org.apache.james.protocols.api.logger; +/** + * Adapter class for SLF4J + * + */ +public class Slf4jLogger implements Logger{ + + private final org.slf4j.Logger logger; + + public Slf4jLogger(org.slf4j.Logger logger) { + this.logger = logger; + } + + public boolean isDebugEnabled() { + return logger.isDebugEnabled(); + } + + public boolean isErrorEnabled() { + return logger.isErrorEnabled(); + } + public boolean isInfoEnabled() { + return logger.isInfoEnabled(); + } + + public boolean isTraceEnabled() { + return logger.isTraceEnabled(); + } + + public boolean isWarnEnabled() { + return logger.isWarnEnabled(); + } + + public void trace(String message) { + logger.trace(message); + } + + public void trace(String message, Throwable t) { + logger.trace(message, t); + } + + public void debug(String message) { + logger.debug(message); + } + + public void debug(String message, Throwable t) { + logger.debug(message, t); + } + + public void info(String message) { + logger.info(message); + } + + public void info(String message, Throwable t) { + logger.info(message, t); + } + + public void warn(String message) { + logger.warn(message); + } + + public void warn(String message, Throwable t) { + logger.warn(message, t); + } + + public void error(String message) { + logger.error(message); + } + + public void error(String message, Throwable t) { + logger.error(message, t); + } + +} Propchange: james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/logger/Slf4jLogger.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: james/protocols/trunk/pom.xml URL: http://svn.apache.org/viewvc/james/protocols/trunk/pom.xml?rev=1226241&r1=1226240&r2=1226241&view=diff ============================================================================== --- james/protocols/trunk/pom.xml (original) +++ james/protocols/trunk/pom.xml Sun Jan 1 12:10:26 2012 @@ -95,6 +95,8 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> <version>1.6.3</version> + <scope>compile</scope> + <optional>true</optional> </dependency> Modified: james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/POP3Protocol.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/POP3Protocol.java?rev=1226241&r1=1226240&r2=1226241&view=diff ============================================================================== --- james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/POP3Protocol.java (original) +++ james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/POP3Protocol.java Sun Jan 1 12:10:26 2012 @@ -19,12 +19,12 @@ package org.apache.james.protocols.pop3; -import org.apache.james.protocols.api.Logger; import org.apache.james.protocols.api.ProtocolConfiguration; import org.apache.james.protocols.api.ProtocolImpl; import org.apache.james.protocols.api.ProtocolSession; import org.apache.james.protocols.api.ProtocolTransport; import org.apache.james.protocols.api.handler.ProtocolHandlerChain; +import org.apache.james.protocols.api.logger.Logger; public class POP3Protocol extends ProtocolImpl{ Modified: james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/POP3SessionImpl.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/POP3SessionImpl.java?rev=1226241&r1=1226240&r2=1226241&view=diff ============================================================================== --- james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/POP3SessionImpl.java (original) +++ james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/POP3SessionImpl.java Sun Jan 1 12:10:26 2012 @@ -18,11 +18,11 @@ ****************************************************************/ package org.apache.james.protocols.pop3; -import org.apache.james.protocols.api.Logger; import org.apache.james.protocols.api.ProtocolConfiguration; import org.apache.james.protocols.api.ProtocolSessionImpl; import org.apache.james.protocols.api.ProtocolTransport; import org.apache.james.protocols.api.Response; +import org.apache.james.protocols.api.logger.Logger; import org.apache.james.protocols.pop3.mailbox.Mailbox; /** Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocol.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocol.java?rev=1226241&r1=1226240&r2=1226241&view=diff ============================================================================== --- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocol.java (original) +++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocol.java Sun Jan 1 12:10:26 2012 @@ -19,11 +19,11 @@ package org.apache.james.protocols.smtp; -import org.apache.james.protocols.api.Logger; import org.apache.james.protocols.api.ProtocolImpl; import org.apache.james.protocols.api.ProtocolSession; import org.apache.james.protocols.api.ProtocolTransport; import org.apache.james.protocols.api.handler.ProtocolHandlerChain; +import org.apache.james.protocols.api.logger.Logger; import org.apache.james.protocols.smtp.SMTPConfiguration; import org.apache.james.protocols.smtp.SMTPSessionImpl; Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java?rev=1226241&r1=1226240&r2=1226241&view=diff ============================================================================== --- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java (original) +++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPSessionImpl.java Sun Jan 1 12:10:26 2012 @@ -20,11 +20,11 @@ package org.apache.james.protocols.smtp; import java.util.Collection; -import org.apache.james.protocols.api.Logger; import org.apache.james.protocols.api.ProtocolSessionImpl; import org.apache.james.protocols.api.ProtocolTransport; import org.apache.james.protocols.api.Response; import org.apache.james.protocols.api.handler.LineHandler; +import org.apache.james.protocols.api.logger.Logger; import org.apache.james.protocols.smtp.SMTPConfiguration; import org.apache.james.protocols.smtp.SMTPSession; Modified: james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/BaseFakeSMTPSession.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/BaseFakeSMTPSession.java?rev=1226241&r1=1226240&r2=1226241&view=diff ============================================================================== --- james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/BaseFakeSMTPSession.java (original) +++ james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/BaseFakeSMTPSession.java Sun Jan 1 12:10:26 2012 @@ -25,9 +25,9 @@ import java.io.InputStream; import java.net.InetSocketAddress; import java.util.Map; -import org.apache.james.protocols.api.Logger; import org.apache.james.protocols.api.Response; import org.apache.james.protocols.api.handler.LineHandler; +import org.apache.james.protocols.api.logger.Logger; import org.apache.james.protocols.smtp.SMTPConfiguration; import org.apache.james.protocols.smtp.SMTPSession; Modified: james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/MockLogger.java URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/MockLogger.java?rev=1226241&r1=1226240&r2=1226241&view=diff ============================================================================== --- james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/MockLogger.java (original) +++ james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/MockLogger.java Sun Jan 1 12:10:26 2012 @@ -19,7 +19,7 @@ package org.apache.james.protocols.smtp; -import org.apache.james.protocols.api.Logger; +import org.apache.james.protocols.api.logger.Logger; public class MockLogger implements Logger { --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org