Author: norman
Date: Tue Oct 13 14:11:36 2009
New Revision: 824774
URL: http://svn.apache.org/viewvc?rev=824774&view=rev
Log:
Inject logger via constructer
javadocs cleanup
Removed:
james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/AsyncSMTPServer.java
james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/TextLineCodecFactory.java
Modified:
james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java
james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/AbstractValidationFilter.java
james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/RequestValidationFilter.java
james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/ResponseValidationFilter.java
james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/SMTPCommandDispatcherIoHandler.java
james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/SMTPSessionImpl.java
Modified:
james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java?rev=824774&r1=824773&r2=824774&view=diff
==============================================================================
---
james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java
(original)
+++
james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/SMTPServer.java
Tue Oct 13 14:11:36 2009
@@ -45,11 +45,11 @@
import org.apache.james.smtpserver.mina.RequestValidationFilter;
import org.apache.james.smtpserver.mina.SMTPCommandDispatcherIoHandler;
import org.apache.james.smtpserver.mina.SMTPResponseFilter;
-import org.apache.james.smtpserver.mina.TextLineCodecFactory;
import org.apache.james.socket.configuration.JamesConfiguration;
import org.apache.mailet.MailetContext;
import org.apache.mina.core.session.IdleStatus;
import org.apache.mina.filter.codec.ProtocolCodecFilter;
+import org.apache.mina.filter.codec.textline.TextLineCodecFactory;
import org.apache.mina.filter.logging.LoggingFilter;
import org.apache.mina.transport.socket.SocketAcceptor;
import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
@@ -562,12 +562,13 @@
SocketAcceptor acceptor = new NioSocketAcceptor();
acceptor.setHandler(new SMTPCommandDispatcherIoHandler(handlerChain,
theConfigData));
- acceptor.getFilterChain().addLast("loggingFilter",new
LoggingFilter("blah"));
+ acceptor.getFilterChain().addLast("loggingFilter",new LoggingFilter());
acceptor.getFilterChain().addLast("protocolCodecFactory",
codecFactory);
acceptor.getFilterChain().addLast("smtpResponseFilter", new
SMTPResponseFilter());
- acceptor.getFilterChain().addLast("requestValidationFilter", new
RequestValidationFilter());
+ acceptor.getFilterChain().addLast("requestValidationFilter", new
RequestValidationFilter(new AvalonLogger(getLogger())));
acceptor.setBacklog(backlog);
- acceptor.getSessionConfig().setIdleTime( IdleStatus.BOTH_IDLE, 120 );
+ acceptor.setReuseAddress(true);
+ acceptor.getSessionConfig().setIdleTime( IdleStatus.BOTH_IDLE, timeout
);
acceptor.bind(new InetSocketAddress(bindTo,port));
}
Modified:
james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/AbstractValidationFilter.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/AbstractValidationFilter.java?rev=824774&r1=824773&r2=824774&view=diff
==============================================================================
---
james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/AbstractValidationFilter.java
(original)
+++
james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/AbstractValidationFilter.java
Tue Oct 13 14:11:36 2009
@@ -22,17 +22,16 @@
import org.apache.james.smtpserver.SMTPRequest;
import org.apache.james.smtpserver.SMTPResponse;
import org.apache.james.smtpserver.SMTPRetCode;
-import org.apache.james.socket.shared.LogEnabled;
import org.apache.mina.core.filterchain.IoFilterAdapter;
import org.apache.mina.core.session.IoSession;
import org.apache.mina.core.write.DefaultWriteRequest;
import org.apache.mina.core.write.WriteRequest;
-public class AbstractValidationFilter extends IoFilterAdapter implements
LogEnabled {
+public class AbstractValidationFilter extends IoFilterAdapter {
private Log logger;
- public void setLog(Log logger) {
+ public AbstractValidationFilter(Log logger) {
this.logger = logger;
}
Modified:
james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/RequestValidationFilter.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/RequestValidationFilter.java?rev=824774&r1=824773&r2=824774&view=diff
==============================================================================
---
james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/RequestValidationFilter.java
(original)
+++
james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/RequestValidationFilter.java
Tue Oct 13 14:11:36 2009
@@ -18,6 +18,7 @@
****************************************************************/
package org.apache.james.smtpserver.mina;
+import org.apache.commons.logging.Log;
import org.apache.james.smtpserver.SMTPRequest;
import org.apache.james.smtpserver.SMTPResponse;
import org.apache.james.smtpserver.SMTPRetCode;
@@ -30,23 +31,23 @@
*/
public class RequestValidationFilter extends AbstractValidationFilter {
+ public RequestValidationFilter(Log logger) {
+ super(logger);
+ }
+
/**
* @see
org.apache.mina.core.filterchain.IoFilterAdapter#messageReceived(org.apache.mina.core.filterchain.IoFilter.NextFilter,
* org.apache.mina.core.session.IoSession, java.lang.Object)
*/
public void messageReceived(NextFilter nextFilter, IoSession session,
Object message) throws Exception {
- // TODO Auto-generated method stub
if (message instanceof SMTPRequest) {
super.messageReceived(nextFilter, session, message);
} else {
- getLogger()
- .error(
- "The Received object is not an instance of
SMTPRequestImpl");
+ getLogger().error("The Received object is not an instance of
SMTPRequestImpl");
WriteRequest req = new DefaultWriteRequest(new SMTPResponse(
SMTPRetCode.TRANSACTION_FAILED,
- "Cannot handle Request of type "
- + (message != null ? message.getClass() :
"NULL")));
+ "Cannot handle Request of type " + (message != null ?
message.getClass() : "NULL")));
nextFilter.filterWrite(session, req);
}
}
Modified:
james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/ResponseValidationFilter.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/ResponseValidationFilter.java?rev=824774&r1=824773&r2=824774&view=diff
==============================================================================
---
james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/ResponseValidationFilter.java
(original)
+++
james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/ResponseValidationFilter.java
Tue Oct 13 14:11:36 2009
@@ -18,6 +18,7 @@
****************************************************************/
package org.apache.james.smtpserver.mina;
+import org.apache.commons.logging.Log;
import org.apache.james.smtpserver.SMTPResponse;
import org.apache.mina.core.session.IoSession;
import org.apache.mina.core.write.WriteRequest;
@@ -28,14 +29,20 @@
public class ResponseValidationFilter extends AbstractValidationFilter {
+ public ResponseValidationFilter(Log logger) {
+ super(logger);
+ }
+
+ /**
+ * @see
org.apache.mina.core.filterchain.IoFilterAdapter#messageSent(org.apache.mina.core.filterchain.IoFilter.NextFilter,
org.apache.mina.core.session.IoSession,
org.apache.mina.core.write.WriteRequest)
+ */
public void messageSent(NextFilter nextFilter, IoSession session,
WriteRequest writeRequest) throws Exception {
if (writeRequest.getMessage() instanceof SMTPResponse) {
super.messageReceived(nextFilter, session, writeRequest);
} else {
// TODO check what to do when we receive an invalid object.
- getLogger().error(
- "The Sent object is not an instance of SMTPResponseImpl");
+ getLogger().error("The Sent object is not an instance of
SMTPResponse");
}
}
Modified:
james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/SMTPCommandDispatcherIoHandler.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/SMTPCommandDispatcherIoHandler.java?rev=824774&r1=824773&r2=824774&view=diff
==============================================================================
---
james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/SMTPCommandDispatcherIoHandler.java
(original)
+++
james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/SMTPCommandDispatcherIoHandler.java
Tue Oct 13 14:11:36 2009
@@ -137,7 +137,7 @@
*/
public void messageSent(IoSession session, Object message) throws
Exception {
// Nothing todo here
-
+ System.err.println("SEND="+message);
}
/**
Modified:
james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/SMTPSessionImpl.java
URL:
http://svn.apache.org/viewvc/james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/SMTPSessionImpl.java?rev=824774&r1=824773&r2=824774&view=diff
==============================================================================
---
james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/SMTPSessionImpl.java
(original)
+++
james/server/sandbox/active/mina_experiments/smtpserver-function/src/main/java/org/apache/james/smtpserver/mina/SMTPSessionImpl.java
Tue Oct 13 14:11:36 2009
@@ -143,7 +143,7 @@
}
/**
- * @see
com.googlecode.asyncmail.smtpserver.SMTPSession#setUser(java.lang.String)
+ * @see
org.apache.james.socket.shared.TLSSupportedSession#setUser(java.lang.String)
*/
public void setUser(String user) {
this.user = user;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
