Author: norman
Date: Sat Nov 19 20:07:08 2011
New Revision: 1204061
URL: http://svn.apache.org/viewvc?rev=1204061&view=rev
Log:
Adjust for latest protocols changes which was introduced by PROTCOLS-51
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/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=1204061&r1=1204060&r2=1204061&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
Sat Nov 19 20:07:08 2011
@@ -104,14 +104,6 @@ public class LMTPServer extends Abstract
public String getSMTPGreeting() {
return LMTPServer.this.lmtpGreeting;
}
-
-
-
- @Override
- public boolean isStartTLSSupported() {
- return false;
- }
-
}
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=1204061&r1=1204060&r2=1204061&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
Sat Nov 19 20:07:08 2011
@@ -21,6 +21,7 @@ package org.apache.james.pop3server.nett
import org.apache.james.pop3server.core.CoreCmdHandlerLoader;
import org.apache.james.pop3server.jmx.JMXHandlersLoader;
+import org.apache.james.protocols.api.Secure;
import org.apache.james.protocols.api.handler.HandlersPackage;
import org.apache.james.protocols.impl.BasicChannelUpstreamHandler;
import org.apache.james.protocols.lib.netty.AbstractProtocolAsyncServer;
@@ -77,8 +78,14 @@ public class POP3Server extends Abstract
@Override
protected void preInit() throws Exception {
super.preInit();
- POP3Protocol protocol = new POP3Protocol(getProtocolHandlerChain(),
theConfigData, getLogger());
- coreHandler = new BasicChannelUpstreamHandler(protocol, getLogger(),
getSSLContext(), getEnabledCipherSuites());
+ POP3Protocol protocol = new POP3Protocol(getProtocolHandlerChain(),
theConfigData);
+ Secure secure;
+ if (isStartTLSSupported()) {
+ secure = Secure.createStartTls(getSSLContext(),
getEnabledCipherSuites());
+ } else {
+ secure = Secure.createTls(getSSLContext(),
getEnabledCipherSuites());
+ }
+ coreHandler = new BasicChannelUpstreamHandler(protocol, getLogger(),
secure);
}
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=1204061&r1=1204060&r2=1204061&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
Sat Nov 19 20:07:08 2011
@@ -18,10 +18,9 @@
****************************************************************/
package org.apache.james.smtpserver.netty;
-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.Secure;
import org.apache.james.protocols.impl.BasicChannelUpstreamHandler;
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.smtpserver.SMTPConstants;
@@ -37,8 +36,8 @@ import org.slf4j.Logger;
public class SMTPChannelUpstreamHandler extends BasicChannelUpstreamHandler {
- public SMTPChannelUpstreamHandler(Protocol protocol, Logger logger,
SSLContext context, String[] enabledCipherSuites) {
- super(protocol, logger, context, enabledCipherSuites);
+ public SMTPChannelUpstreamHandler(Protocol protocol, Logger logger, Secure
secure) {
+ super(protocol, logger, secure);
}
public SMTPChannelUpstreamHandler(Protocol protocol, Logger 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=1204061&r1=1204060&r2=1204061&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
Sat Nov 19 20:07:08 2011
@@ -28,6 +28,7 @@ import org.apache.james.dnsservice.api.D
import org.apache.james.dnsservice.library.netmatcher.NetMatcher;
import org.apache.james.protocols.api.ProtocolSession;
import org.apache.james.protocols.api.ProtocolTransport;
+import org.apache.james.protocols.api.Secure;
import org.apache.james.protocols.api.handler.HandlersPackage;
import org.apache.james.protocols.lib.netty.AbstractProtocolAsyncServer;
import org.apache.james.protocols.smtp.SMTPConfiguration;
@@ -120,7 +121,13 @@ public class SMTPServer extends Abstract
}
};
- coreHandler = new SMTPChannelUpstreamHandler(transport, getLogger(),
getSSLContext(), getEnabledCipherSuites());
+ Secure secure;
+ if (isStartTLSSupported()) {
+ secure = Secure.createStartTls(getSSLContext(),
getEnabledCipherSuites());
+ } else {
+ secure = Secure.createTls(getSSLContext(),
getEnabledCipherSuites());
+ }
+ coreHandler = new SMTPChannelUpstreamHandler(transport, getLogger(),
secure);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
