You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by no...@apache.org on 2011/12/24 23:37:18 UTC
svn commit: r1223033 - in /james/protocols/trunk: api/
api/src/main/java/org/apache/james/protocols/api/ lmtp/
lmtp/src/test/java/org/apache/james/protocols/lmtp/ netty/
netty/src/main/java/org/apache/james/protocols/netty/ pop3/
pop3/src/main/java/org...
Author: norman
Date: Sat Dec 24 22:37:17 2011
New Revision: 1223033
URL: http://svn.apache.org/viewvc?rev=1223033&view=rev
Log:
Remove dependency on slf4j. See PROTOCOLS-76
Added:
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/Logger.java (with props)
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionLogger.java
- copied, changed from r1222696, james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/SessionLog.java
james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/MockLogger.java
- copied, changed from r1222696, james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MockLog.java
Removed:
james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/SessionLog.java
james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MockLog.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/lmtp/pom.xml
james/protocols/trunk/lmtp/src/test/java/org/apache/james/protocols/lmtp/LMTPServerTest.java
james/protocols/trunk/netty/pom.xml
james/protocols/trunk/netty/src/main/java/org/apache/james/protocols/netty/BasicChannelUpstreamHandler.java
james/protocols/trunk/netty/src/main/java/org/apache/james/protocols/netty/NettyServer.java
james/protocols/trunk/pop3/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/pom.xml
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/SMTPServerTest.java
Modified: james/protocols/trunk/api/pom.xml
URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/pom.xml?rev=1223033&r1=1223032&r2=1223033&view=diff
==============================================================================
--- james/protocols/trunk/api/pom.xml (original)
+++ james/protocols/trunk/api/pom.xml Sat Dec 24 22:37:17 2011
@@ -34,10 +34,6 @@
<dependencies>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
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=1223033&r1=1223032&r2=1223033&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 Sat Dec 24 22:37:17 2011
@@ -22,18 +22,23 @@ package org.apache.james.protocols.api;
import java.util.ArrayList;
import java.util.List;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
/**
* {@link FutureResponse} implementation which wraps a {@link AbstractResponse} implementation
*
*
*/
public class FutureResponseImpl implements FutureResponse{
+
+ private final Logger logger;
- private final static Logger LOGGER = LoggerFactory.getLogger(FutureResponseImpl.class);
-
+ public FutureResponseImpl() {
+ this(null);
+ }
+
+ public FutureResponseImpl(Logger logger) {
+ this.logger = logger;
+ }
+
protected Response response;
private List<ResponseListener> listeners;
private int waiters;
@@ -138,7 +143,11 @@ public class FutureResponseImpl implemen
try {
listener.onResponse(this);
} catch (Throwable e) {
- LOGGER.warn("An exception was thrown by the listener " + listener, e);
+ if (logger != null) {
+ logger.warn("An exception was thrown by the listener " + listener, e);
+ } else {
+ e.printStackTrace();
+ }
}
}
listeners = null;
Added: 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.java?rev=1223033&view=auto
==============================================================================
--- james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/Logger.java (added)
+++ james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/Logger.java Sat Dec 24 22:37:17 2011
@@ -0,0 +1,197 @@
+/****************************************************************
+ * 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;
+
+public interface Logger {
+
+ /**
+ * <p> Is debug 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 debug. </p>
+ *
+ * @return true if debug is enabled in the underlying logger.
+ */
+ boolean isDebugEnabled();
+
+
+ /**
+ * <p> Is error 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 error. </p>
+ *
+ * @return true if error is enabled in the underlying 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>
+ *
+ * <p> Call this method to prevent having to perform expensive operations
+ * (for example, <code>String</code> concatenation)
+ * when the log level is more than info. </p>
+ *
+ * @return true if info is enabled in the underlying logger.
+ */
+ boolean isInfoEnabled();
+
+
+ /**
+ * <p> Is trace 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 trace. </p>
+ *
+ * @return true if trace is enabled in the underlying logger.
+ */
+ boolean isTraceEnabled();
+
+
+ /**
+ * <p> Is warn 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 warn. </p>
+ *
+ * @return true if warn is enabled in the underlying logger.
+ */
+ boolean isWarnEnabled();
+
+
+ /**
+ * <p> Log a message with trace log level. </p>
+ *
+ * @param message log this message
+ */
+ void trace(String message);
+
+
+ /**
+ * <p> Log an error with trace log level. </p>
+ *
+ * @param message log this message
+ * @param t log this cause
+ */
+ void trace(String message, Throwable t);
+
+
+ /**
+ * <p> Log a message with debug log level. </p>
+ *
+ * @param message log this message
+ */
+ void debug(String message);
+
+
+ /**
+ * <p> Log an error with debug log level. </p>
+ *
+ * @param message log this message
+ * @param t log this cause
+ */
+ void debug(String message, Throwable t);
+
+
+ /**
+ * <p> Log a message with info log level. </p>
+ *
+ * @param message log this message
+ */
+ void info(String message);
+
+
+ /**
+ * <p> Log an error with info log level. </p>
+ *
+ * @param message log this message
+ * @param t log this cause
+ */
+ void info(String message, Throwable t);
+
+
+ /**
+ * <p> Log a message with warn log level. </p>
+ *
+ * @param message log this message
+ */
+ public void warn(String message);
+
+
+ /**
+ * <p> Log an error with warn log level. </p>
+ *
+ * @param message log this message
+ * @param t log this cause
+ */
+ void warn(String message, Throwable t);
+
+
+ /**
+ * <p> Log a message with error log level. </p>
+ *
+ * @param message log this message
+ */
+ void error(String message);
+
+
+ /**
+ * <p> Log an error with error log level. </p>
+ *
+ * @param message log this message
+ * @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.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
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=1223033&r1=1223032&r2=1223033&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 Sat Dec 24 22:37:17 2011
@@ -20,21 +20,20 @@
package org.apache.james.protocols.api;
import org.apache.james.protocols.api.handler.ProtocolHandlerChain;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Basic {@link Protocol} implementation
*
*/
public class ProtocolImpl implements Protocol{
- protected final static Logger logger = LoggerFactory.getLogger(ProtocolImpl.class);
private final ProtocolHandlerChain chain;
private final ProtocolConfiguration config;
+ protected final Logger logger;
- public ProtocolImpl(ProtocolHandlerChain chain, ProtocolConfiguration config) {
+ public ProtocolImpl(ProtocolHandlerChain chain, ProtocolConfiguration config, Logger logger) {
this.chain = chain;
this.config = config;
+ this.logger = logger;
}
/*
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=1223033&r1=1223032&r2=1223033&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 Sat Dec 24 22:37:17 2011
@@ -22,8 +22,6 @@ package org.apache.james.protocols.api;
import java.net.InetSocketAddress;
import java.util.Map;
-import org.slf4j.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=1223033&r1=1223032&r2=1223033&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 Sat Dec 24 22:37:17 2011
@@ -25,7 +25,6 @@ import java.util.Map;
import org.apache.james.protocols.api.ProtocolTransport;
-import org.slf4j.Logger;
/**
* Basic implementation of {@link ProtocolSession}
@@ -34,7 +33,7 @@ import org.slf4j.Logger;
*/
public class ProtocolSessionImpl implements ProtocolSession {
- private final SessionLog pLog;
+ private final ProtocolSessionLogger pLog;
private final ProtocolTransport transport;
private final Map<String, Object> connectionState;
private final Map<String, Object> sessionState;
@@ -43,7 +42,7 @@ public class ProtocolSessionImpl impleme
public ProtocolSessionImpl(Logger logger, ProtocolTransport transport, ProtocolConfiguration config) {
this.transport = transport;
- this.pLog = new SessionLog(getSessionID(), logger);;
+ this.pLog = new ProtocolSessionLogger(transport.getId(), logger);
this.connectionState = new HashMap<String, Object>();
this.sessionState = new HashMap<String, Object>();
this.config = config;
Copied: james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionLogger.java (from r1222696, james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/SessionLog.java)
URL: http://svn.apache.org/viewvc/james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionLogger.java?p2=james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionLogger.java&p1=james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/SessionLog.java&r1=1222696&r2=1223033&rev=1223033&view=diff
==============================================================================
--- james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/SessionLog.java (original)
+++ james/protocols/trunk/api/src/main/java/org/apache/james/protocols/api/ProtocolSessionLogger.java Sat Dec 24 22:37:17 2011
@@ -19,8 +19,6 @@
package org.apache.james.protocols.api;
-import org.slf4j.Logger;
-import org.slf4j.Marker;
/**
* A {@link Logger} implementation which suffix every log message with the
@@ -28,11 +26,11 @@ import org.slf4j.Marker;
*
*
*/
-public class SessionLog implements Logger {
- private Logger logger;
- private String id;
+public class ProtocolSessionLogger implements Logger {
+ private final Logger logger;
+ private final String id;
- public SessionLog(String id, Logger logger) {
+ public ProtocolSessionLogger(String id, Logger logger) {
this.logger = logger;
this.id = id;
}
@@ -41,9 +39,6 @@ public class SessionLog implements Logge
return "ID=" + id + " " + str;
}
- /**
- * @see org.slf4j.Logger#debug(java.lang.String)
- */
public void debug(String arg0) {
logger.debug(getText(arg0));
}
@@ -61,7 +56,6 @@ public class SessionLog implements Logge
*/
public void error(String arg0) {
logger.error(getText(arg0));
-
}
/**
@@ -72,270 +66,67 @@ public class SessionLog implements Logge
}
- /**
- * @see org.slf4j.Logger#info(java.lang.String)
- */
public void info(String arg0) {
logger.info(getText(arg0));
}
- /**
- * @see org.slf4j.Logger#info(java.lang.String, java.lang.Throwable)
- */
public void info(String arg0, Throwable arg1) {
logger.info(getText(arg0), arg1);
}
- /**
- * @see org.slf4j.Logger#isDebugEnabled()
- */
public boolean isDebugEnabled() {
return logger.isDebugEnabled();
}
- /**
- * @see org.slf4j.Logger#isErrorEnabled()
- */
public boolean isErrorEnabled() {
return logger.isErrorEnabled();
}
- /**
- * @see org.slf4j.Logger#isInfoEnabled()
- */
public boolean isInfoEnabled() {
return logger.isInfoEnabled();
}
- /**
- * @see org.slf4j.Logger#isTraceEnabled()
- */
public boolean isTraceEnabled() {
return logger.isTraceEnabled();
}
- /**
- * @see org.slf4j.Logger#isWarnEnabled()
- */
public boolean isWarnEnabled() {
return logger.isWarnEnabled();
}
- /**
- * @see org.slf4j.Logger#trace(java.lang.String)
- */
public void trace(String arg0) {
logger.trace(getText(arg0));
}
-
- /**
- * @see org.slf4j.Logger#trace(java.lang.String, java.lang.Throwable)
- */
+
public void trace(String arg0, Throwable arg1) {
logger.trace(getText(arg0), arg1);
}
- /**
- * @see org.slf4j.Logger#warn(java.lang.String)
- */
public void warn(String arg0) {
logger.warn(getText(arg0));
}
- /**
- * @see org.slf4j.Logger#warn(java.lang.String, java.lang.Throwable)
- */
+
public void warn(String arg0, Throwable arg1) {
logger.warn(getText(arg0), arg1);
}
- public String getName() {
- return logger.getName();
- }
-
- public void trace(String format, Object arg) {
- logger.trace(format, arg);
- }
-
- public void trace(String format, Object arg1, Object arg2) {
- logger.trace(format, arg1, arg2);
- }
-
- public void trace(String format, Object[] argArray) {
- logger.trace(format, argArray);
- }
-
- public boolean isTraceEnabled(Marker marker) {
- return logger.isTraceEnabled(marker);
- }
-
- public void trace(Marker marker, String msg) {
- logger.trace(marker, msg);
- }
-
- public void trace(Marker marker, String format, Object arg) {
- logger.trace(marker, format, arg);
- }
-
- public void trace(Marker marker, String format, Object arg1, Object arg2) {
- logger.trace(marker, format, arg1, arg2);
- }
-
- public void trace(Marker marker, String format, Object[] argArray) {
- logger.trace(marker, format, argArray);
- }
-
- public void trace(Marker marker, String msg, Throwable t) {
- logger.trace(marker, msg, t);
- }
-
- public void debug(String format, Object arg) {
- logger.debug(format, arg);
- }
-
- public void debug(String format, Object arg1, Object arg2) {
- logger.debug(format, arg1, arg2);
- }
-
- public void debug(String format, Object[] argArray) {
- logger.debug(format, argArray);
- }
-
- public boolean isDebugEnabled(Marker marker) {
- return logger.isDebugEnabled(marker);
- }
-
- public void debug(Marker marker, String msg) {
- logger.debug(marker, msg);
- }
-
- public void debug(Marker marker, String format, Object arg) {
- logger.debug(marker, format, arg);
- }
-
- public void debug(Marker marker, String format, Object arg1, Object arg2) {
- logger.debug(marker, format, arg1, arg2);
- }
-
- public void debug(Marker marker, String format, Object[] argArray) {
- logger.debug(marker, format, argArray);
- }
-
- public void debug(Marker marker, String msg, Throwable t) {
- logger.debug(marker, msg, t);
- }
-
- public void info(String format, Object arg) {
- logger.info(format, arg);
- }
-
- public void info(String format, Object arg1, Object arg2) {
- logger.info(format, arg1, arg2);
- }
-
- public void info(String format, Object[] argArray) {
- logger.info(format, argArray);
- }
-
- public boolean isInfoEnabled(Marker marker) {
- return logger.isInfoEnabled(marker);
- }
-
- public void info(Marker marker, String msg) {
- logger.info(marker, msg);
- }
-
- public void info(Marker marker, String format, Object arg) {
- logger.info(marker, format, arg);
- }
-
- public void info(Marker marker, String format, Object arg1, Object arg2) {
- logger.info(marker, format, arg1, arg2);
- }
-
- public void info(Marker marker, String format, Object[] argArray) {
- logger.info(marker, format, argArray);
- }
-
- public void info(Marker marker, String msg, Throwable t) {
- logger.info(marker, msg, t);
- }
-
- public void warn(String format, Object arg) {
- logger.warn(format, arg);
- }
-
- public void warn(String format, Object[] argArray) {
- logger.warn(format, argArray);
- }
-
- public void warn(String format, Object arg1, Object arg2) {
- logger.warn(format, arg1, arg2);
- }
-
- public boolean isWarnEnabled(Marker marker) {
- return logger.isWarnEnabled(marker);
- }
-
- public void warn(Marker marker, String msg) {
- logger.warn(marker, msg);
- }
-
- public void warn(Marker marker, String format, Object arg) {
- logger.warn(marker, format, arg);
- }
-
- public void warn(Marker marker, String format, Object arg1, Object arg2) {
- logger.warn(marker, format, arg1, arg2);
- }
-
- public void warn(Marker marker, String format, Object[] argArray) {
- logger.warn(marker, format, argArray);
- }
-
- public void warn(Marker marker, String msg, Throwable t) {
- logger.warn(marker, msg, t);
- }
-
- public void error(String format, Object arg) {
- logger.error(format, arg);
- }
-
- public void error(String format, Object arg1, Object arg2) {
- logger.error(format, arg1, arg2);
- }
-
- public void error(String format, Object[] argArray) {
- logger.error(format, argArray);
- }
-
- public boolean isErrorEnabled(Marker marker) {
- return logger.isErrorEnabled(marker);
- }
-
- public void error(Marker marker, String msg) {
- logger.error(marker, msg);
- }
-
- public void error(Marker marker, String format, Object arg) {
- logger.error(marker, format, arg);
- }
-
- public void error(Marker marker, String format, Object arg1, Object arg2) {
- logger.error(marker, format, arg1, arg2);
+ public boolean isFatalEnabled() {
+ return logger.isFatalEnabled();
}
- public void error(Marker marker, String format, Object[] argArray) {
- logger.error(marker, format, argArray);
+ public void fatal(String message) {
+ logger.fatal(getText(message));
+
}
- public void error(Marker marker, String msg, Throwable t) {
- logger.error(marker, msg, t);
+ public void fatal(String message, Throwable t) {
+ logger.fatal(getText(message), t);
}
}
Modified: james/protocols/trunk/lmtp/pom.xml
URL: http://svn.apache.org/viewvc/james/protocols/trunk/lmtp/pom.xml?rev=1223033&r1=1223032&r2=1223033&view=diff
==============================================================================
--- james/protocols/trunk/lmtp/pom.xml (original)
+++ james/protocols/trunk/lmtp/pom.xml Sat Dec 24 22:37:17 2011
@@ -42,11 +42,6 @@
<artifactId>protocols-smtp</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
-
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified: james/protocols/trunk/lmtp/src/test/java/org/apache/james/protocols/lmtp/LMTPServerTest.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/lmtp/src/test/java/org/apache/james/protocols/lmtp/LMTPServerTest.java?rev=1223033&r1=1223032&r2=1223033&view=diff
==============================================================================
--- james/protocols/trunk/lmtp/src/test/java/org/apache/james/protocols/lmtp/LMTPServerTest.java (original)
+++ james/protocols/trunk/lmtp/src/test/java/org/apache/james/protocols/lmtp/LMTPServerTest.java Sat Dec 24 22:37:17 2011
@@ -37,6 +37,7 @@ import org.apache.james.protocols.lmtp.h
import org.apache.james.protocols.netty.NettyServer;
import org.apache.james.protocols.smtp.MailAddress;
import org.apache.james.protocols.smtp.MailEnvelope;
+import org.apache.james.protocols.smtp.MockLogger;
import org.apache.james.protocols.smtp.SMTPProtocol;
import org.apache.james.protocols.smtp.SMTPServerTest;
import org.apache.james.protocols.smtp.SMTPSession;
@@ -62,7 +63,7 @@ public class LMTPServerTest extends SMTP
}
chain.addAll(0, hList);
chain.wireExtensibleHandlers();
- return new SMTPProtocol(chain, new LMTPConfigurationImpl());
+ return new SMTPProtocol(chain, new LMTPConfigurationImpl(), new MockLogger());
}
Modified: james/protocols/trunk/netty/pom.xml
URL: http://svn.apache.org/viewvc/james/protocols/trunk/netty/pom.xml?rev=1223033&r1=1223032&r2=1223033&view=diff
==============================================================================
--- james/protocols/trunk/netty/pom.xml (original)
+++ james/protocols/trunk/netty/pom.xml Sat Dec 24 22:37:17 2011
@@ -38,10 +38,6 @@
<artifactId>protocols-api</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
<groupId>org.jboss.netty</groupId>
<artifactId>netty</artifactId>
</dependency>
Modified: james/protocols/trunk/netty/src/main/java/org/apache/james/protocols/netty/BasicChannelUpstreamHandler.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/netty/src/main/java/org/apache/james/protocols/netty/BasicChannelUpstreamHandler.java?rev=1223033&r1=1223032&r2=1223033&view=diff
==============================================================================
--- james/protocols/trunk/netty/src/main/java/org/apache/james/protocols/netty/BasicChannelUpstreamHandler.java (original)
+++ james/protocols/trunk/netty/src/main/java/org/apache/james/protocols/netty/BasicChannelUpstreamHandler.java Sat Dec 24 22:37:17 2011
@@ -46,26 +46,23 @@ import org.jboss.netty.channel.Exception
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 ChannelUpstreamHandler} which is used by the SMTPServer and other line based protocols
*/
@Sharable
public class BasicChannelUpstreamHandler extends SimpleChannelUpstreamHandler {
- protected final Logger logger;
protected final Protocol protocol;
protected final ProtocolHandlerChain chain;
protected final Encryption secure;
- public BasicChannelUpstreamHandler(Protocol protocol, Logger logger) {
- this(protocol, logger, null);
+ public BasicChannelUpstreamHandler(Protocol protocol) {
+ this(protocol, null);
}
- public BasicChannelUpstreamHandler(Protocol protocol, Logger logger, Encryption secure) {
+ public BasicChannelUpstreamHandler(Protocol protocol, Encryption secure) {
this.protocol = protocol;
this.chain = protocol.getProtocolChain();
- this.logger = logger;
this.secure = secure;
}
@@ -230,8 +227,6 @@ public class BasicChannelUpstreamHandler
}
if (session != null) {
session.getLogger().debug("Unable to process request", e.getCause());
- } else {
- logger.debug("Unable to process request", e.getCause());
}
cleanup(ctx);
}
Modified: james/protocols/trunk/netty/src/main/java/org/apache/james/protocols/netty/NettyServer.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/netty/src/main/java/org/apache/james/protocols/netty/NettyServer.java?rev=1223033&r1=1223032&r2=1223033&view=diff
==============================================================================
--- james/protocols/trunk/netty/src/main/java/org/apache/james/protocols/netty/NettyServer.java (original)
+++ james/protocols/trunk/netty/src/main/java/org/apache/james/protocols/netty/NettyServer.java Sat Dec 24 22:37:17 2011
@@ -29,8 +29,7 @@ import org.jboss.netty.channel.ChannelUp
import org.jboss.netty.channel.group.ChannelGroup;
import org.jboss.netty.handler.execution.ExecutionHandler;
import org.jboss.netty.handler.execution.OrderedMemoryAwareThreadPoolExecutor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
/**
* Generic NettyServer
@@ -39,8 +38,6 @@ public class NettyServer extends Abstrac
protected final Protocol protocol;
- protected final Logger logger = LoggerFactory.getLogger(NettyServer.class);
-
private ExecutionHandler eHandler;
private ChannelUpstreamHandler coreHandler;
@@ -94,8 +91,9 @@ public class NettyServer extends Abstrac
if (isBound()) throw new IllegalStateException("Server running already");
this.maxCurConnectionsPerIP = maxCurConnectionsPerIP;
}
+
protected ChannelUpstreamHandler createCoreHandler() {
- return new BasicChannelUpstreamHandler(protocol, logger, secure);
+ return new BasicChannelUpstreamHandler(protocol, secure);
}
@Override
Modified: james/protocols/trunk/pop3/pom.xml
URL: http://svn.apache.org/viewvc/james/protocols/trunk/pop3/pom.xml?rev=1223033&r1=1223032&r2=1223033&view=diff
==============================================================================
--- james/protocols/trunk/pop3/pom.xml (original)
+++ james/protocols/trunk/pop3/pom.xml Sat Dec 24 22:37:17 2011
@@ -38,10 +38,6 @@
<artifactId>protocols-api</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
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=1223033&r1=1223032&r2=1223033&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 Sat Dec 24 22:37:17 2011
@@ -19,6 +19,7 @@
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;
@@ -27,8 +28,8 @@ import org.apache.james.protocols.api.ha
public class POP3Protocol extends ProtocolImpl{
- public POP3Protocol(ProtocolHandlerChain chain, ProtocolConfiguration config) {
- super(chain, config);
+ public POP3Protocol(ProtocolHandlerChain chain, ProtocolConfiguration config, Logger logger) {
+ super(chain, config, logger);
}
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=1223033&r1=1223032&r2=1223033&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 Sat Dec 24 22:37:17 2011
@@ -18,12 +18,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.ProtocolSessionImpl;
import org.apache.james.protocols.api.ProtocolTransport;
import org.apache.james.protocols.api.Response;
import org.apache.james.protocols.pop3.mailbox.Mailbox;
-import org.slf4j.Logger;
/**
* {@link POP3Session} implementation which use Netty
Modified: james/protocols/trunk/smtp/pom.xml
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/pom.xml?rev=1223033&r1=1223032&r2=1223033&view=diff
==============================================================================
--- james/protocols/trunk/smtp/pom.xml (original)
+++ james/protocols/trunk/smtp/pom.xml Sat Dec 24 22:37:17 2011
@@ -38,10 +38,6 @@
<artifactId>protocols-api</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<optional>true</optional>
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=1223033&r1=1223032&r2=1223033&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 Sat Dec 24 22:37:17 2011
@@ -19,6 +19,7 @@
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;
@@ -33,8 +34,8 @@ import org.apache.james.protocols.smtp.S
*/
public class SMTPProtocol extends ProtocolImpl {
- public SMTPProtocol(ProtocolHandlerChain chain, SMTPConfiguration config) {
- super(chain, config);
+ public SMTPProtocol(ProtocolHandlerChain chain, SMTPConfiguration config, Logger logger) {
+ super(chain, config, logger);
}
@Override
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=1223033&r1=1223032&r2=1223033&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 Sat Dec 24 22:37:17 2011
@@ -20,13 +20,13 @@ 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.smtp.SMTPConfiguration;
import org.apache.james.protocols.smtp.SMTPSession;
-import org.slf4j.Logger;
/**
* {@link SMTPSession} implementation
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=1223033&r1=1223032&r2=1223033&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 Sat Dec 24 22:37:17 2011
@@ -25,19 +25,18 @@ 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.smtp.SMTPConfiguration;
import org.apache.james.protocols.smtp.SMTPSession;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Abstract class to simplify the mocks
*/
public class BaseFakeSMTPSession implements SMTPSession {
- private static final Logger log = LoggerFactory.getLogger(BaseFakeSMTPSession.class);
+ private static final Logger log = new MockLogger();
/**
* @see org.apache.james.protocols.smtp.SMTPSession#getConnectionState()
Copied: james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/MockLogger.java (from r1222696, james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MockLog.java)
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/MockLogger.java?p2=james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/MockLogger.java&p1=james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MockLog.java&r1=1222696&r2=1223033&rev=1223033&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MockLog.java (original)
+++ james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/MockLogger.java Sat Dec 24 22:37:17 2011
@@ -17,308 +17,112 @@
* under the License. *
****************************************************************/
-package org.apache.james.protocols.smtp.core.fastfail;
+package org.apache.james.protocols.smtp;
-import org.slf4j.Logger;
-import org.slf4j.Marker;
+import org.apache.james.protocols.api.Logger;
-public class MockLog implements Logger {
+public class MockLogger implements Logger {
public String getName() {
- return "MockLogger to System out";
+ return "MockLogger to System out";
}
public boolean isTraceEnabled() {
- return true;
+ return true;
}
public void trace(String msg) {
- SysPrint(msg);
- }
-
- public void trace(String format, Object arg) {
- SysPrint(format, arg);
- }
-
- public void trace(String format, Object arg1, Object arg2) {
- SysPrint(format, arg1, arg2);
- }
-
- public void trace(String format, Object[] argArray) {
- SysPrint(format, argArray);
+ SysPrint(msg);
}
public void trace(String msg, Throwable t) {
- SysPrint(msg, t);
- }
-
- public boolean isTraceEnabled(Marker marker) {
- return true;
- }
-
- public void trace(Marker marker, String msg) {
- SysPrint(marker, msg);
- }
-
- public void trace(Marker marker, String format, Object arg) {
- SysPrint(marker, format, arg);
- }
-
- public void trace(Marker marker, String format, Object arg1, Object arg2) {
- SysPrint(marker, format, arg1, arg2);
- }
-
- public void trace(Marker marker, String format, Object[] argArray) {
- SysPrint(marker, format, argArray);
- }
-
- public void trace(Marker marker, String msg, Throwable t) {
- SysPrint(marker, msg, t);
+ SysPrint(msg, t);
}
public boolean isDebugEnabled() {
- return true;
+ return true;
}
public void debug(String msg) {
- SysPrint(msg);
- }
-
- public void debug(String format, Object arg) {
- SysPrint(format, arg);
- }
-
- public void debug(String format, Object arg1, Object arg2) {
- SysPrint(format, arg1, arg2);
- }
-
- public void debug(String format, Object[] argArray) {
- SysPrint(format, argArray);
+ SysPrint(msg);
}
public void debug(String msg, Throwable t) {
- SysPrint(msg, t);
- }
-
- public boolean isDebugEnabled(Marker marker) {
- return true;
- }
-
- public void debug(Marker marker, String msg) {
- SysPrint(marker, msg);
- }
-
- public void debug(Marker marker, String format, Object arg) {
- SysPrint(marker, format, arg);
- }
-
- public void debug(Marker marker, String format, Object arg1, Object arg2) {
- SysPrint(marker, format, arg1, arg2);
- }
-
- public void debug(Marker marker, String format, Object[] argArray) {
- SysPrint(marker, format, argArray);
- }
-
- public void debug(Marker marker, String msg, Throwable t) {
- SysPrint(marker, msg, t);
+ SysPrint(msg, t);
}
public boolean isInfoEnabled() {
- return true;
+ return true;
}
public void info(String msg) {
- SysPrint(msg);
- }
-
- public void info(String format, Object arg) {
- SysPrint(format, arg);
- }
-
- public void info(String format, Object arg1, Object arg2) {
- SysPrint(format, arg1, arg2);
- }
-
- public void info(String format, Object[] argArray) {
- SysPrint(format, argArray);
+ SysPrint(msg);
}
public void info(String msg, Throwable t) {
- SysPrint(msg, t);
- }
-
- public boolean isInfoEnabled(Marker marker) {
- return true;
- }
-
- public void info(Marker marker, String msg) {
- SysPrint(marker, msg);
- }
-
- public void info(Marker marker, String format, Object arg) {
- SysPrint(marker, format, arg);
- }
-
- public void info(Marker marker, String format, Object arg1, Object arg2) {
- SysPrint(marker, format, arg1, arg2);
- }
-
- public void info(Marker marker, String format, Object[] argArray) {
- SysPrint(marker, format, argArray);
- }
-
- public void info(Marker marker, String msg, Throwable t) {
- SysPrint(marker, msg, t);
+ SysPrint(msg, t);
}
public boolean isWarnEnabled() {
- return true;
+ return true;
}
public void warn(String msg) {
- SysPrint(msg);
- }
-
- public void warn(String format, Object arg) {
- SysPrint(format, arg);
- }
-
- public void warn(String format, Object[] argArray) {
- SysPrint(format, argArray);
- }
-
- public void warn(String format, Object arg1, Object arg2) {
- SysPrint(format, arg1, arg2);
+ SysPrint(msg);
}
public void warn(String msg, Throwable t) {
- SysPrint(msg, t);
- }
-
- public boolean isWarnEnabled(Marker marker) {
- return true;
- }
-
- public void warn(Marker marker, String msg) {
- }
-
- public void warn(Marker marker, String format, Object arg) {
- SysPrint(marker, format, arg);
- }
-
- public void warn(Marker marker, String format, Object arg1, Object arg2) {
- SysPrint(marker, format, arg1, arg2);
- }
-
- public void warn(Marker marker, String format, Object[] argArray) {
- SysPrint(marker, format, argArray);
- }
-
- public void warn(Marker marker, String msg, Throwable t) {
- SysPrint(marker, msg, t);
+ SysPrint(msg, t);
}
public boolean isErrorEnabled() {
- return true;
+ return true;
}
public void error(String msg) {
- SysPrint(msg);
- }
-
- public void error(String format, Object arg) {
- SysPrint(format, arg);
- }
-
- public void error(String format, Object arg1, Object arg2) {
- SysPrint(format, arg1, arg2);
- }
-
- public void error(String format, Object[] argArray) {
- SysPrint(format, argArray);
+ SysPrint(msg);
}
public void error(String msg, Throwable t) {
- SysPrint(msg, t);
- }
-
- public boolean isErrorEnabled(Marker marker) {
- return true;
- }
-
- public void error(Marker marker, String msg) {
- SysPrint(marker, msg);
+ SysPrint(msg, t);
}
- public void error(Marker marker, String format, Object arg) {
- SysPrint(marker, format, arg);
- }
-
- public void error(Marker marker, String format, Object arg1, Object arg2) {
- SysPrint(marker, format, arg1, arg2);
- }
-
- public void error(Marker marker, String format, Object[] argArray) {
- SysPrint(marker, format, argArray);
- }
-
- public void error(Marker marker, String msg, Throwable t) {
- SysPrint(marker, msg, t);
+ private void SysPrint(String msg, Object... obj) {
+ if (obj != null) {
+ Throwable t = null;
+ StringBuffer s = new StringBuffer(msg);
+ 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());
+ }
+ }
+ }
+ System.out.println(s.toString());
+ if (t != null) {
+ t.printStackTrace();
+ }
+ } else {
+ System.out.println(msg);
+ }
+ }
+
+ public boolean isFatalEnabled() {
+ return true;
}
- private void SysPrint(Marker marker, String msg, Object... obj) {
- if (obj != null) {
- Throwable t = null;
- StringBuffer s = new StringBuffer("[");
- s.append(marker.toString()).append("] ").append(msg);
- 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());
- }
- }
- }
- System.out.println(s.toString());
- if (t != null) {
- t.printStackTrace();
- }
- } else {
- System.out.println(msg);
- }
+ public void fatal(String message) {
+ SysPrint(message);
}
- private void SysPrint(String msg, Object... obj) {
- if (obj != null) {
- Throwable t = null;
- StringBuffer s = new StringBuffer(msg);
- 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());
- }
- }
- }
- System.out.println(s.toString());
- if (t != null) {
- t.printStackTrace();
- }
- } else {
- System.out.println(msg);
- }
+ public void fatal(String message, Throwable t) {
+ SysPrint(message, t);
}
}
Modified: james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/SMTPServerTest.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/SMTPServerTest.java?rev=1223033&r1=1223032&r2=1223033&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/SMTPServerTest.java (original)
+++ james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/SMTPServerTest.java Sat Dec 24 22:37:17 2011
@@ -940,7 +940,7 @@ public class SMTPServerTest {
SMTPProtocolHandlerChain chain = new SMTPProtocolHandlerChain();
chain.addAll(0, Arrays.asList(handlers));
chain.wireExtensibleHandlers();
- return new SMTPProtocol(chain, new SMTPConfigurationImpl());
+ return new SMTPProtocol(chain, new SMTPConfigurationImpl(), new MockLogger());
}
protected static void checkEnvelope(MailEnvelope env, String sender, List<String> recipients, String msg) throws IOException {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org