Author: norman
Date: Tue Sep 27 11:57:04 2011
New Revision: 1176342
URL: http://svn.apache.org/viewvc?rev=1176342&view=rev
Log:
Fix for latest protocols changes
Modified:
james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3ChannelUpstreamHandler.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3Server.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPChannelUpstreamHandler.java
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java
Modified:
james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java?rev=1176342&r1=1176341&r2=1176342&view=diff
==============================================================================
---
james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java
(original)
+++
james/server/trunk/lmtpserver/src/main/java/org/apache/james/lmtpserver/netty/LMTPServer.java
Tue Sep 27 11:57:04 2011
@@ -198,7 +198,7 @@ public class LMTPServer extends Abstract
@Override
protected ChannelUpstreamHandler createCoreHandler() {
SMTPProtocol protocol = new SMTPProtocol(getProtocolHandlerChain(),
lmtpConfig);
- return new SMTPChannelUpstreamHandler(getProtocolHandlerChain(),
protocol, getLogger());
+ return new SMTPChannelUpstreamHandler(protocol, getLogger());
}
@Override
Modified:
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3ChannelUpstreamHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3ChannelUpstreamHandler.java?rev=1176342&r1=1176341&r2=1176342&view=diff
==============================================================================
---
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3ChannelUpstreamHandler.java
(original)
+++
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3ChannelUpstreamHandler.java
Tue Sep 27 11:57:04 2011
@@ -24,7 +24,6 @@ import javax.net.ssl.SSLEngine;
import org.apache.james.protocols.api.Protocol;
import org.apache.james.protocols.api.ProtocolSession;
-import org.apache.james.protocols.api.handler.ProtocolHandlerChain;
import org.apache.james.protocols.impl.BasicChannelUpstreamHandler;
import org.jboss.netty.channel.ChannelHandlerContext;
import org.slf4j.Logger;
@@ -33,13 +32,13 @@ public class POP3ChannelUpstreamHandler
private boolean zeroCopy;
- public POP3ChannelUpstreamHandler(ProtocolHandlerChain chain, Protocol
protocol, Logger logger, boolean zeroCopy) {
- super(chain, protocol, logger);
+ public POP3ChannelUpstreamHandler(Protocol protocol, Logger logger,
boolean zeroCopy) {
+ super(protocol, logger);
this.zeroCopy = zeroCopy;
}
- public POP3ChannelUpstreamHandler(ProtocolHandlerChain chain, Protocol
protocol, Logger logger, SSLContext context, String[] enabledCipherSuites,
boolean zeroCopy) {
- super(chain, protocol, logger, context, enabledCipherSuites);
+ public POP3ChannelUpstreamHandler(Protocol protocol, Logger logger,
SSLContext context, String[] enabledCipherSuites, boolean zeroCopy) {
+ super(protocol, logger, context, enabledCipherSuites);
this.zeroCopy = zeroCopy;
}
Modified:
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3Server.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3Server.java?rev=1176342&r1=1176341&r2=1176342&view=diff
==============================================================================
---
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3Server.java
(original)
+++
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3Server.java
Tue Sep 27 11:57:04 2011
@@ -85,7 +85,7 @@ public class POP3Server extends Abstract
protected void preInit() throws Exception {
super.preInit();
POP3Protocol protocol = new POP3Protocol(getProtocolHandlerChain(),
theConfigData, getLogger());
- coreHandler = new
POP3ChannelUpstreamHandler(getProtocolHandlerChain(), protocol, getLogger(),
getSSLContext(), getEnabledCipherSuites(), false);
+ coreHandler = new POP3ChannelUpstreamHandler(protocol, getLogger(),
getSSLContext(), getEnabledCipherSuites(), false);
}
Modified:
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPChannelUpstreamHandler.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPChannelUpstreamHandler.java?rev=1176342&r1=1176341&r2=1176342&view=diff
==============================================================================
---
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPChannelUpstreamHandler.java
(original)
+++
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPChannelUpstreamHandler.java
Tue Sep 27 11:57:04 2011
@@ -22,7 +22,6 @@ import javax.net.ssl.SSLContext;
import org.apache.james.lifecycle.api.LifecycleUtil;
import org.apache.james.protocols.api.Protocol;
-import org.apache.james.protocols.api.handler.ProtocolHandlerChain;
import org.apache.james.protocols.impl.BasicChannelUpstreamHandler;
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.smtpserver.SMTPConstants;
@@ -38,12 +37,12 @@ import org.slf4j.Logger;
public class SMTPChannelUpstreamHandler extends BasicChannelUpstreamHandler {
- public SMTPChannelUpstreamHandler(ProtocolHandlerChain chain, Protocol
protocol, Logger logger, SSLContext context, String[] enabledCipherSuites) {
- super(chain, protocol, logger, context, enabledCipherSuites);
+ public SMTPChannelUpstreamHandler(Protocol protocol, Logger logger,
SSLContext context, String[] enabledCipherSuites) {
+ super(protocol, logger, context, enabledCipherSuites);
}
- public SMTPChannelUpstreamHandler(ProtocolHandlerChain chain, Protocol
protocol, Logger logger) {
- super(chain, protocol, logger);
+ public SMTPChannelUpstreamHandler(Protocol protocol, Logger logger) {
+ super(protocol, logger);
}
/**
Modified:
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java?rev=1176342&r1=1176341&r2=1176342&view=diff
==============================================================================
---
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java
(original)
+++
james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java
Tue Sep 27 11:57:04 2011
@@ -121,7 +121,7 @@ public class SMTPServer extends Abstract
}
};
- coreHandler = new
SMTPChannelUpstreamHandler(getProtocolHandlerChain(), transport, getLogger(),
getSSLContext(), getEnabledCipherSuites());
+ coreHandler = new SMTPChannelUpstreamHandler(transport, getLogger(),
getSSLContext(), getEnabledCipherSuites());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
