Author: norman
Date: Mon Nov 21 13:46:59 2011
New Revision: 1204493
URL: http://svn.apache.org/viewvc?rev=1204493&view=rev
Log:
Adjust for latest protocols changes. See PROTOCOLS-51
Modified:
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/netty/POP3Server.java
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.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/imapserver/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java?rev=1204493&r1=1204492&r2=1204493&view=diff
==============================================================================
---
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java
(original)
+++
james/server/trunk/imapserver/src/main/java/org/apache/james/imapserver/netty/IMAPServer.java
Mon Nov 21 13:46:59 2011
@@ -31,7 +31,7 @@ import org.apache.james.imap.api.ImapCon
import org.apache.james.imap.api.process.ImapProcessor;
import org.apache.james.imap.decode.ImapDecoder;
import org.apache.james.imap.encode.ImapEncoder;
-import org.apache.james.protocols.api.Secure;
+import org.apache.james.protocols.api.Encryption;
import org.apache.james.protocols.impl.ChannelGroupHandler;
import org.apache.james.protocols.impl.ConnectionLimitUpstreamHandler;
import org.apache.james.protocols.impl.ConnectionPerIpLimitUpstreamHandler;
@@ -141,7 +141,7 @@ public class IMAPServer extends Abstract
// don't strip the delimiter and use CRLF as delimiter
pipeline.addLast(FRAMER, new
DelimiterBasedFrameDecoder(maxLineLength, false, Delimiters.lineDelimiter()));
- Secure secure = getSecure();
+ Encryption secure = getEncryption();
if (secure != null && !secure.isStartTLS()) {
// We need to set clientMode to false.
// See https://issues.apache.org/jira/browse/JAMES-1025
@@ -176,7 +176,7 @@ public class IMAPServer extends Abstract
@Override
protected ChannelUpstreamHandler createCoreHandler() {
ImapChannelUpstreamHandler coreHandler;
- Secure secure = getSecure();
+ Encryption secure = getEncryption();
if (secure!= null && secure.isStartTLS()) {
coreHandler = new ImapChannelUpstreamHandler(hello, processor,
encoder, getLogger(), compress, plainAuthDisallowed, secure.getContext(),
getEnabledCipherSuites());
} else {
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=1204493&r1=1204492&r2=1204493&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
Mon Nov 21 13:46:59 2011
@@ -24,7 +24,7 @@ import org.apache.james.pop3server.jmx.J
import org.apache.james.protocols.api.handler.HandlersPackage;
import org.apache.james.protocols.impl.BasicChannelUpstreamHandler;
import org.apache.james.protocols.lib.netty.AbstractProtocolAsyncServer;
-import org.apache.james.protocols.pop3.POP3HandlerConfiguration;
+import org.apache.james.protocols.pop3.POP3Configuration;
import org.apache.james.protocols.pop3.POP3Protocol;
import org.jboss.netty.channel.ChannelPipeline;
import org.jboss.netty.channel.ChannelPipelineFactory;
@@ -39,7 +39,7 @@ public class POP3Server extends Abstract
/**
* The configuration data to be passed to the handler
*/
- private POP3HandlerConfiguration theConfigData = new
POP3HandlerConfigurationDataImpl();
+ private POP3Configuration theConfigData = new
POP3HandlerConfigurationDataImpl();
private BasicChannelUpstreamHandler coreHandler;
@Override
@@ -57,7 +57,7 @@ public class POP3Server extends Abstract
/**
* A class to provide POP3 handler configuration to the handlers
*/
- private class POP3HandlerConfigurationDataImpl implements
POP3HandlerConfiguration {
+ private class POP3HandlerConfigurationDataImpl implements
POP3Configuration {
/**
* @see
org.apache.james.pop3server.POP3HandlerConfiguration#getHelloName()
@@ -72,7 +72,7 @@ public class POP3Server extends Abstract
super.preInit();
POP3Protocol protocol = new POP3Protocol(getProtocolHandlerChain(),
theConfigData);
- coreHandler = new BasicChannelUpstreamHandler(protocol, getLogger(),
getSecure());
+ coreHandler = new BasicChannelUpstreamHandler(protocol, getLogger(),
getEncryption());
}
Modified:
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java?rev=1204493&r1=1204492&r2=1204493&view=diff
==============================================================================
---
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
(original)
+++
james/server/trunk/protocols-library/src/main/java/org/apache/james/protocols/lib/netty/AbstractConfigurableAsyncServer.java
Mon Nov 21 13:46:59 2011
@@ -43,7 +43,7 @@ import org.apache.james.filesystem.api.F
import org.apache.james.lifecycle.api.Configurable;
import org.apache.james.lifecycle.api.LogEnabled;
-import org.apache.james.protocols.api.Secure;
+import org.apache.james.protocols.api.Encryption;
import org.apache.james.protocols.impl.AbstractAsyncServer;
import org.apache.james.protocols.lib.jmx.ServerMBean;
import org.apache.james.util.concurrent.JMXEnabledThreadPoolExecutor;
@@ -102,7 +102,7 @@ public abstract class AbstractConfigurab
private String secret;
- private Secure secure;
+ private Encryption encryption;
protected String jmxName;
@@ -386,8 +386,8 @@ public abstract class AbstractConfigurab
return helloName;
}
- protected Secure getSecure() {
- return secure;
+ protected Encryption getEncryption() {
+ return encryption;
}
/**
@@ -412,9 +412,9 @@ public abstract class AbstractConfigurab
SSLContext context = SSLContext.getInstance("TLS");
context.init(kmf.getKeyManagers(), null, null);
if (useStartTLS) {
- secure = Secure.createStartTls(context,
enabledCipherSuites);
+ encryption = Encryption.createStartTls(context,
enabledCipherSuites);
} else {
- secure = Secure.createTls(context, enabledCipherSuites);
+ encryption = Encryption.createTls(context,
enabledCipherSuites);
}
} finally {
if (fis != null) {
@@ -439,7 +439,7 @@ public abstract class AbstractConfigurab
* @return the socket type ('plain' or 'secure')
*/
public String getSocketType() {
- if (secure != null && !secure.isStartTLS()) {
+ if (encryption != null && !encryption.isStartTLS()) {
return "secure";
}
return "plain";
@@ -449,7 +449,7 @@ public abstract class AbstractConfigurab
* @see
org.apache.james.protocols.lib.jmx.ServerMBean#getStartTLSSupported()
*/
public boolean getStartTLSSupported() {
- return secure != null && secure.isStartTLS();
+ return encryption != null && encryption.isStartTLS();
}
/**
@@ -581,16 +581,16 @@ public abstract class AbstractConfigurab
return new AbstractExecutorAwareChannelPipelineFactory(getTimeout(),
connectionLimit, connPerIP, group, enabledCipherSuites, getExecutionHandler()) {
@Override
protected SSLContext getSSLContext() {
- if (secure == null) {
+ if (encryption == null) {
return null;
} else {
- return secure.getContext();
+ return encryption.getContext();
}
}
@Override
protected boolean isSSLSocket() {
- return secure != null && !secure.isStartTLS();
+ return encryption != null && !encryption.isStartTLS();
}
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=1204493&r1=1204492&r2=1204493&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
Mon Nov 21 13:46:59 2011
@@ -19,8 +19,8 @@
package org.apache.james.smtpserver.netty;
import org.apache.james.lifecycle.api.LifecycleUtil;
+import org.apache.james.protocols.api.Encryption;
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;
@@ -36,8 +36,8 @@ import org.slf4j.Logger;
public class SMTPChannelUpstreamHandler extends BasicChannelUpstreamHandler {
- public SMTPChannelUpstreamHandler(Protocol protocol, Logger logger, Secure
secure) {
- super(protocol, logger, secure);
+ public SMTPChannelUpstreamHandler(Protocol protocol, Logger logger,
Encryption encryption) {
+ super(protocol, logger, encryption);
}
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=1204493&r1=1204492&r2=1204493&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
Mon Nov 21 13:46:59 2011
@@ -114,7 +114,7 @@ public class SMTPServer extends Abstract
}
};
- coreHandler = new SMTPChannelUpstreamHandler(transport, getLogger(),
getSecure());
+ coreHandler = new SMTPChannelUpstreamHandler(transport, getLogger(),
getEncryption());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
