Author: norman
Date: Tue Sep 27 10:10:09 2011
New Revision: 1176307
URL: http://svn.apache.org/viewvc?rev=1176307&view=rev
Log:
Merge ProtocolSessionFactory and Protocol interfaces
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/POP3Protocol.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=1176307&r1=1176306&r2=1176307&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 10:10:09 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.getProtocolSessionFactory(), getLogger());
+ return new SMTPChannelUpstreamHandler(getProtocolHandlerChain(),
protocol, getLogger());
}
@Override
Modified:
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Protocol.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Protocol.java?rev=1176307&r1=1176306&r2=1176307&view=diff
==============================================================================
---
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Protocol.java
(original)
+++
james/server/trunk/pop3server/src/main/java/org/apache/james/pop3server/POP3Protocol.java
Tue Sep 27 10:10:09 2011
@@ -21,7 +21,6 @@ package org.apache.james.pop3server;
import org.apache.james.protocols.api.Protocol;
import org.apache.james.protocols.api.ProtocolSession;
-import org.apache.james.protocols.api.ProtocolSessionFactory;
import org.apache.james.protocols.api.ProtocolTransport;
import org.apache.james.protocols.api.handler.ProtocolHandlerChain;
import org.slf4j.Logger;
@@ -42,15 +41,10 @@ public class POP3Protocol implements Pro
return chain;
}
+
@Override
- public ProtocolSessionFactory getProtocolSessionFactory() {
- return new ProtocolSessionFactory() {
-
- @Override
- public ProtocolSession newSession(ProtocolTransport transport) {
- return new POP3SessionImpl(logger, transport, config);
- }
- };
+ public ProtocolSession newSession(ProtocolTransport transport) {
+ return new POP3SessionImpl(logger, transport, config);
}
@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=1176307&r1=1176306&r2=1176307&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 10:10:09 2011
@@ -22,8 +22,8 @@ package org.apache.james.pop3server.nett
import javax.net.ssl.SSLContext;
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.ProtocolSessionFactory;
import org.apache.james.protocols.api.handler.ProtocolHandlerChain;
import org.apache.james.protocols.impl.BasicChannelUpstreamHandler;
import org.jboss.netty.channel.ChannelHandlerContext;
@@ -33,13 +33,13 @@ public class POP3ChannelUpstreamHandler
private boolean zeroCopy;
- public POP3ChannelUpstreamHandler(ProtocolHandlerChain chain,
ProtocolSessionFactory sessionFactory, Logger logger, boolean zeroCopy) {
- super(chain, sessionFactory, logger);
+ public POP3ChannelUpstreamHandler(ProtocolHandlerChain chain, Protocol
protocol, Logger logger, boolean zeroCopy) {
+ super(chain, protocol, logger);
this.zeroCopy = zeroCopy;
}
- public POP3ChannelUpstreamHandler(ProtocolHandlerChain chain,
ProtocolSessionFactory sessionFactory, Logger logger, SSLContext context,
String[] enabledCipherSuites, boolean zeroCopy) {
- super(chain, sessionFactory, logger, context, enabledCipherSuites);
+ public POP3ChannelUpstreamHandler(ProtocolHandlerChain chain, Protocol
protocol, Logger logger, SSLContext context, String[] enabledCipherSuites,
boolean zeroCopy) {
+ super(chain, protocol, logger, context, enabledCipherSuites);
this.zeroCopy = zeroCopy;
}
@@ -53,7 +53,7 @@ public class POP3ChannelUpstreamHandler
}
}
- return sessionFactory.newSession(new
POP3ProtocolTransport(ctx.getChannel(), engine, zeroCopy));
+ return protocol.newSession(new POP3ProtocolTransport(ctx.getChannel(),
engine, 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=1176307&r1=1176306&r2=1176307&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 10:10:09 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.getProtocolSessionFactory(), getLogger(), getSSLContext(),
getEnabledCipherSuites(), false);
+ coreHandler = new
POP3ChannelUpstreamHandler(getProtocolHandlerChain(), 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=1176307&r1=1176306&r2=1176307&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 10:10:09 2011
@@ -21,7 +21,7 @@ package org.apache.james.smtpserver.nett
import javax.net.ssl.SSLContext;
import org.apache.james.lifecycle.api.LifecycleUtil;
-import org.apache.james.protocols.api.ProtocolSessionFactory;
+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;
@@ -38,12 +38,12 @@ import org.slf4j.Logger;
public class SMTPChannelUpstreamHandler extends BasicChannelUpstreamHandler {
- public SMTPChannelUpstreamHandler(ProtocolHandlerChain chain,
ProtocolSessionFactory sessionFactory, Logger logger, SSLContext context,
String[] enabledCipherSuites) {
- super(chain, sessionFactory, logger, context, enabledCipherSuites);
+ public SMTPChannelUpstreamHandler(ProtocolHandlerChain chain, Protocol
protocol, Logger logger, SSLContext context, String[] enabledCipherSuites) {
+ super(chain, protocol, logger, context, enabledCipherSuites);
}
- public SMTPChannelUpstreamHandler(ProtocolHandlerChain chain,
ProtocolSessionFactory sessionFactory, Logger logger) {
- super(chain, sessionFactory, logger);
+ public SMTPChannelUpstreamHandler(ProtocolHandlerChain chain, Protocol
protocol, Logger logger) {
+ super(chain, 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=1176307&r1=1176306&r2=1176307&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 10:10:09 2011
@@ -27,7 +27,6 @@ import org.apache.commons.configuration.
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.dnsservice.library.netmatcher.NetMatcher;
import org.apache.james.protocols.api.ProtocolSession;
-import org.apache.james.protocols.api.ProtocolSessionFactory;
import org.apache.james.protocols.api.ProtocolTransport;
import org.apache.james.protocols.api.handler.HandlersPackage;
import org.apache.james.protocols.impl.ResponseEncoder;
@@ -119,18 +118,12 @@ public class SMTPServer extends Abstract
SMTPProtocol transport = new SMTPProtocol(getProtocolHandlerChain(),
theConfigData) {
@Override
- public ProtocolSessionFactory getProtocolSessionFactory() {
- return new ProtocolSessionFactory() {
-
- @Override
- public ProtocolSession newSession(ProtocolTransport
transport) {
- return new ExtendedSMTPSession(theConfigData,
getLogger(), transport);
- }
- };
+ public ProtocolSession newSession(ProtocolTransport transport) {
+ return new ExtendedSMTPSession(theConfigData, getLogger(),
transport);
}
};
- coreHandler = new
SMTPChannelUpstreamHandler(getProtocolHandlerChain(),
transport.getProtocolSessionFactory(), getLogger(), getSSLContext(),
getEnabledCipherSuites());
+ coreHandler = new
SMTPChannelUpstreamHandler(getProtocolHandlerChain(), 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
