Author: norman Date: Sat Sep 17 16:54:03 2011 New Revision: 1172016 URL: http://svn.apache.org/viewvc?rev=1172016&view=rev Log: Rename SMTPNettySession to ExtendedSMTPSession and move it out of the netty package
Added: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/ExtendedSMTPSession.java - copied, changed from r1171969, james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPNettySession.java Removed: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPNettySession.java Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPServer.java Copied: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/ExtendedSMTPSession.java (from r1171969, james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPNettySession.java) URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/ExtendedSMTPSession.java?p2=james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/ExtendedSMTPSession.java&p1=james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPNettySession.java&r1=1171969&r2=1172016&rev=1172016&view=diff ============================================================================== --- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/netty/SMTPNettySession.java (original) +++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/ExtendedSMTPSession.java Sat Sep 17 16:54:03 2011 @@ -16,23 +16,24 @@ * specific language governing permissions and limitations * * under the License. * ****************************************************************/ -package org.apache.james.smtpserver.netty; +package org.apache.james.smtpserver; import org.apache.james.protocols.api.ProtocolTransport; import org.apache.james.protocols.smtp.SMTPConfiguration; import org.apache.james.protocols.smtp.SMTPSession; +import org.apache.james.smtpserver.netty.SMTPServer; import org.apache.james.smtpserver.netty.SMTPServer.SMTPHandlerConfigurationDataImpl; import org.slf4j.Logger; /** * {@link SMTPSession} implementation for use with Netty */ -public class SMTPNettySession extends org.apache.james.protocols.smtp.SMTPSessionImpl { +public class ExtendedSMTPSession extends org.apache.james.protocols.smtp.SMTPSessionImpl { private SMTPConfiguration theConfigData; - public SMTPNettySession(SMTPConfiguration theConfigData, Logger logger, ProtocolTransport transport) { + public ExtendedSMTPSession(SMTPConfiguration theConfigData, Logger logger, ProtocolTransport transport) { super(theConfigData, logger, transport); this.theConfigData = theConfigData; } Modified: james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java?rev=1172016&r1=1172015&r2=1172016&view=diff ============================================================================== --- james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java (original) +++ james/server/trunk/smtpserver/src/main/java/org/apache/james/smtpserver/SenderAuthIdentifyVerificationRcptHook.java Sat Sep 17 16:54:03 2011 @@ -26,7 +26,6 @@ import org.apache.james.protocols.smtp.S import org.apache.james.protocols.smtp.core.AbstractSenderAuthIdentifyVerificationRcptHook; import org.apache.james.protocols.smtp.hook.HookResult; import org.apache.james.protocols.smtp.hook.HookReturnCode; -import org.apache.james.smtpserver.netty.SMTPNettySession; import org.apache.james.user.api.UsersRepository; import org.apache.james.user.api.UsersRepositoryException; import org.apache.mailet.MailAddress; @@ -51,7 +50,7 @@ public class SenderAuthIdentifyVerificat @Override public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) { - SMTPNettySession nSession = (SMTPNettySession) session; + ExtendedSMTPSession nSession = (ExtendedSMTPSession) session; if (nSession.verifyIdentity()) { return super.doRcpt(session, sender, rcpt); } else { 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=1172016&r1=1172015&r2=1172016&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 Sep 17 16:54:03 2011 @@ -36,6 +36,7 @@ import org.apache.james.protocols.smtp.S import org.apache.james.protocols.smtp.SMTPProtocol; import org.apache.james.protocols.smtp.SMTPResponse; import org.apache.james.smtpserver.CoreCmdHandlerLoader; +import org.apache.james.smtpserver.ExtendedSMTPSession; import org.apache.james.smtpserver.jmx.JMXHandlersLoader; import org.jboss.netty.channel.ChannelUpstreamHandler; import org.jboss.netty.handler.codec.oneone.OneToOneEncoder; @@ -123,7 +124,7 @@ public class SMTPServer extends Abstract @Override public ProtocolSession newSession(ProtocolTransport transport) { - return new SMTPNettySession(theConfigData, getLogger(), transport); + return new ExtendedSMTPSession(theConfigData, getLogger(), transport); } }; } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org