Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/SupressDuplicateRcptHandler.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/SupressDuplicateRcptHandler.java?rev=825212&r1=825198&r2=825212&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/SupressDuplicateRcptHandler.java (original) +++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/SupressDuplicateRcptHandler.java Wed Oct 14 18:31:34 2009 @@ -20,16 +20,16 @@ -package org.apache.james.smtpserver.core.filter.fastfail; +package org.apache.james.smtpserver.protocol.core.filter.fastfail; import java.util.Collection; import org.apache.james.dsn.DSNStatus; -import org.apache.james.smtpserver.SMTPRetCode; -import org.apache.james.smtpserver.SMTPSession; -import org.apache.james.smtpserver.hook.HookResult; -import org.apache.james.smtpserver.hook.HookReturnCode; -import org.apache.james.smtpserver.hook.RcptHook; +import org.apache.james.smtpserver.protocol.SMTPRetCode; +import org.apache.james.smtpserver.protocol.SMTPSession; +import org.apache.james.smtpserver.protocol.hook.HookResult; +import org.apache.james.smtpserver.protocol.hook.HookReturnCode; +import org.apache.james.smtpserver.protocol.hook.RcptHook; import org.apache.mailet.MailAddress; /** @@ -39,7 +39,7 @@ public class SupressDuplicateRcptHandler implements RcptHook { /** - * @see org.apache.james.smtpserver.hook.RcptHook#doRcpt(org.apache.james.smtpserver.SMTPSession, org.apache.mailet.MailAddress, org.apache.mailet.MailAddress) + * @see org.apache.james.smtpserver.protocol.hook.RcptHook#doRcpt(org.apache.james.smtpserver.protocol.SMTPSession, org.apache.mailet.MailAddress, org.apache.mailet.MailAddress) */ @SuppressWarnings("unchecked") public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) {
Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/TLDLookup.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/TLDLookup.java?rev=825212&r1=825198&r2=825212&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/TLDLookup.java (original) +++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/TLDLookup.java Wed Oct 14 18:31:34 2009 @@ -20,7 +20,7 @@ -package org.apache.james.smtpserver.core.filter.fastfail; +package org.apache.james.smtpserver.protocol.core.filter.fastfail; import java.util.HashSet; Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/TarpitHandler.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/TarpitHandler.java?rev=825212&r1=825198&r2=825212&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/TarpitHandler.java (original) +++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/TarpitHandler.java Wed Oct 14 18:31:34 2009 @@ -19,15 +19,15 @@ -package org.apache.james.smtpserver.core.filter.fastfail; +package org.apache.james.smtpserver.protocol.core.filter.fastfail; import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.ConfigurationException; -import org.apache.james.smtpserver.SMTPSession; -import org.apache.james.smtpserver.hook.HookResult; -import org.apache.james.smtpserver.hook.HookReturnCode; -import org.apache.james.smtpserver.hook.RcptHook; +import org.apache.james.smtpserver.protocol.SMTPSession; +import org.apache.james.smtpserver.protocol.hook.HookResult; +import org.apache.james.smtpserver.protocol.hook.HookReturnCode; +import org.apache.james.smtpserver.protocol.hook.RcptHook; import org.apache.james.socket.configuration.Configurable; import org.apache.mailet.MailAddress; @@ -81,7 +81,7 @@ } /** - * @see org.apache.james.smtpserver.hook.RcptHook#doRcpt(org.apache.james.smtpserver.SMTPSession, org.apache.mailet.MailAddress, org.apache.mailet.MailAddress) + * @see org.apache.james.smtpserver.protocol.hook.RcptHook#doRcpt(org.apache.james.smtpserver.protocol.SMTPSession, org.apache.mailet.MailAddress, org.apache.mailet.MailAddress) */ public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) { Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/URIRBLHandler.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/URIRBLHandler.java?rev=825212&r1=825198&r2=825212&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/URIRBLHandler.java (original) +++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/URIRBLHandler.java Wed Oct 14 18:31:34 2009 @@ -20,7 +20,7 @@ -package org.apache.james.smtpserver.core.filter.fastfail; +package org.apache.james.smtpserver.protocol.core.filter.fastfail; import java.io.IOException; import java.net.UnknownHostException; @@ -42,10 +42,10 @@ import org.apache.commons.logging.LogFactory; import org.apache.james.api.dnsservice.DNSService; import org.apache.james.dsn.DSNStatus; -import org.apache.james.smtpserver.SMTPSession; -import org.apache.james.smtpserver.hook.HookResult; -import org.apache.james.smtpserver.hook.HookReturnCode; -import org.apache.james.smtpserver.hook.MessageHook; +import org.apache.james.smtpserver.protocol.SMTPSession; +import org.apache.james.smtpserver.protocol.hook.HookResult; +import org.apache.james.smtpserver.protocol.hook.HookReturnCode; +import org.apache.james.smtpserver.protocol.hook.MessageHook; import org.apache.james.socket.configuration.Configurable; import org.apache.james.socket.shared.LogEnabled; import org.apache.mailet.Mail; @@ -155,7 +155,7 @@ } /** - * @see org.apache.james.smtpserver.hook.MessageHook#onMessage(org.apache.james.smtpserver.SMTPSession, org.apache.mailet.Mail) + * @see org.apache.james.smtpserver.protocol.hook.MessageHook#onMessage(org.apache.james.smtpserver.protocol.SMTPSession, org.apache.mailet.Mail) */ public HookResult onMessage(SMTPSession session, Mail mail) { if (check(session, mail)) { Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/URIScanner.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/URIScanner.java?rev=825212&r1=825198&r2=825212&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/URIScanner.java (original) +++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/URIScanner.java Wed Oct 14 18:31:34 2009 @@ -20,7 +20,7 @@ -package org.apache.james.smtpserver.core.filter.fastfail; +package org.apache.james.smtpserver.protocol.core.filter.fastfail; import java.net.URI; import java.net.URISyntaxException; Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ValidRcptHandler.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ValidRcptHandler.java?rev=825212&r1=825198&r2=825212&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ValidRcptHandler.java (original) +++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ValidRcptHandler.java Wed Oct 14 18:31:34 2009 @@ -20,7 +20,7 @@ -package org.apache.james.smtpserver.core.filter.fastfail; +package org.apache.james.smtpserver.protocol.core.filter.fastfail; import java.util.ArrayList; import java.util.Collection; @@ -37,12 +37,12 @@ import org.apache.james.api.vut.VirtualUserTable; import org.apache.james.api.vut.VirtualUserTableStore; import org.apache.james.dsn.DSNStatus; -import org.apache.james.smtpserver.SMTPResponse; -import org.apache.james.smtpserver.SMTPRetCode; -import org.apache.james.smtpserver.SMTPSession; -import org.apache.james.smtpserver.hook.HookResult; -import org.apache.james.smtpserver.hook.HookReturnCode; -import org.apache.james.smtpserver.hook.RcptHook; +import org.apache.james.smtpserver.protocol.SMTPResponse; +import org.apache.james.smtpserver.protocol.SMTPRetCode; +import org.apache.james.smtpserver.protocol.SMTPSession; +import org.apache.james.smtpserver.protocol.hook.HookResult; +import org.apache.james.smtpserver.protocol.hook.HookReturnCode; +import org.apache.james.smtpserver.protocol.hook.RcptHook; import org.apache.james.socket.configuration.Configurable; import org.apache.james.socket.shared.LogEnabled; import org.apache.mailet.MailAddress; @@ -195,7 +195,7 @@ } /** - * @see org.apache.james.smtpserver.hook.RcptHook#doRcpt(org.apache.james.smtpserver.SMTPSession, org.apache.mailet.MailAddress, org.apache.mailet.MailAddress) + * @see org.apache.james.smtpserver.protocol.hook.RcptHook#doRcpt(org.apache.james.smtpserver.protocol.SMTPSession, org.apache.mailet.MailAddress, org.apache.mailet.MailAddress) */ public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) { Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ValidRcptMX.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ValidRcptMX.java?rev=825212&r1=825198&r2=825212&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ValidRcptMX.java (original) +++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ValidRcptMX.java Wed Oct 14 18:31:34 2009 @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.smtpserver.core.filter.fastfail; +package org.apache.james.smtpserver.protocol.core.filter.fastfail; import java.net.UnknownHostException; import java.util.ArrayList; @@ -35,11 +35,11 @@ import org.apache.james.api.dnsservice.TemporaryResolutionException; import org.apache.james.api.dnsservice.util.NetMatcher; import org.apache.james.dsn.DSNStatus; -import org.apache.james.smtpserver.SMTPRetCode; -import org.apache.james.smtpserver.SMTPSession; -import org.apache.james.smtpserver.hook.HookResult; -import org.apache.james.smtpserver.hook.HookReturnCode; -import org.apache.james.smtpserver.hook.RcptHook; +import org.apache.james.smtpserver.protocol.SMTPRetCode; +import org.apache.james.smtpserver.protocol.SMTPSession; +import org.apache.james.smtpserver.protocol.hook.HookResult; +import org.apache.james.smtpserver.protocol.hook.HookReturnCode; +import org.apache.james.smtpserver.protocol.hook.RcptHook; import org.apache.james.socket.configuration.Configurable; import org.apache.james.socket.shared.LogEnabled; import org.apache.mailet.MailAddress; @@ -132,7 +132,7 @@ } /** - * @see org.apache.james.smtpserver.hook.RcptHook#doRcpt(org.apache.james.smtpserver.SMTPSession, org.apache.mailet.MailAddress, org.apache.mailet.MailAddress) + * @see org.apache.james.smtpserver.protocol.hook.RcptHook#doRcpt(org.apache.james.smtpserver.protocol.SMTPSession, org.apache.mailet.MailAddress, org.apache.mailet.MailAddress) */ public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) { Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ValidSenderDomainHandler.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ValidSenderDomainHandler.java?rev=825212&r1=825198&r2=825212&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ValidSenderDomainHandler.java (original) +++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/core/filter/fastfail/ValidSenderDomainHandler.java Wed Oct 14 18:31:34 2009 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * * under the License. * ****************************************************************/ -package org.apache.james.smtpserver.core.filter.fastfail; +package org.apache.james.smtpserver.protocol.core.filter.fastfail; import java.util.Collection; @@ -27,11 +27,11 @@ import org.apache.james.api.dnsservice.DNSService; import org.apache.james.api.dnsservice.TemporaryResolutionException; import org.apache.james.dsn.DSNStatus; -import org.apache.james.smtpserver.SMTPRetCode; -import org.apache.james.smtpserver.SMTPSession; -import org.apache.james.smtpserver.hook.HookResult; -import org.apache.james.smtpserver.hook.HookReturnCode; -import org.apache.james.smtpserver.hook.MailHook; +import org.apache.james.smtpserver.protocol.SMTPRetCode; +import org.apache.james.smtpserver.protocol.SMTPSession; +import org.apache.james.smtpserver.protocol.hook.HookResult; +import org.apache.james.smtpserver.protocol.hook.HookReturnCode; +import org.apache.james.smtpserver.protocol.hook.MailHook; import org.apache.james.socket.configuration.Configurable; import org.apache.mailet.MailAddress; @@ -107,7 +107,7 @@ } /** - * @see org.apache.james.smtpserver.hook.MailHook#doMail(org.apache.james.smtpserver.SMTPSession, org.apache.mailet.MailAddress) + * @see org.apache.james.smtpserver.protocol.hook.MailHook#doMail(org.apache.james.smtpserver.protocol.SMTPSession, org.apache.mailet.MailAddress) */ public HookResult doMail(SMTPSession session, MailAddress sender) { if (check(session,sender)) { Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/hook/AuthHook.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/hook/AuthHook.java?rev=825212&r1=825198&r2=825212&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/hook/AuthHook.java (original) +++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/hook/AuthHook.java Wed Oct 14 18:31:34 2009 @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * * under the License. * ****************************************************************/ -package org.apache.james.smtpserver.hook; +package org.apache.james.smtpserver.protocol.hook; -import org.apache.james.smtpserver.SMTPSession; +import org.apache.james.smtpserver.protocol.SMTPSession; /** * Implement this interfaces to hook in the AUTH Command Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/hook/HeloHook.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/hook/HeloHook.java?rev=825212&r1=825198&r2=825212&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/hook/HeloHook.java (original) +++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/hook/HeloHook.java Wed Oct 14 18:31:34 2009 @@ -20,9 +20,9 @@ -package org.apache.james.smtpserver.hook; +package org.apache.james.smtpserver.protocol.hook; -import org.apache.james.smtpserver.SMTPSession; +import org.apache.james.smtpserver.protocol.SMTPSession; /** * Implement this interfaces to hook in the HELO Command Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/hook/HookResult.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/hook/HookResult.java?rev=825212&r1=825198&r2=825212&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/hook/HookResult.java (original) +++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/hook/HookResult.java Wed Oct 14 18:31:34 2009 @@ -17,7 +17,7 @@ * under the License. * ****************************************************************/ -package org.apache.james.smtpserver.hook; +package org.apache.james.smtpserver.protocol.hook; /** * Result which get used for hooks Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/hook/HookResultHook.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/hook/HookResultHook.java?rev=825212&r1=825198&r2=825212&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/hook/HookResultHook.java (original) +++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/hook/HookResultHook.java Wed Oct 14 18:31:34 2009 @@ -18,9 +18,9 @@ ****************************************************************/ -package org.apache.james.smtpserver.hook; +package org.apache.james.smtpserver.protocol.hook; -import org.apache.james.smtpserver.SMTPSession; +import org.apache.james.smtpserver.protocol.SMTPSession; public interface HookResultHook { Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/hook/HookReturnCode.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/hook/HookReturnCode.java?rev=825212&r1=825198&r2=825212&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/hook/HookReturnCode.java (original) +++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/hook/HookReturnCode.java Wed Oct 14 18:31:34 2009 @@ -20,7 +20,7 @@ -package org.apache.james.smtpserver.hook; +package org.apache.james.smtpserver.protocol.hook; public class HookReturnCode { public final static int OK = 0; Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/hook/MailHook.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/hook/MailHook.java?rev=825212&r1=825198&r2=825212&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/hook/MailHook.java (original) +++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/hook/MailHook.java Wed Oct 14 18:31:34 2009 @@ -21,9 +21,9 @@ -package org.apache.james.smtpserver.hook; +package org.apache.james.smtpserver.protocol.hook; -import org.apache.james.smtpserver.SMTPSession; +import org.apache.james.smtpserver.protocol.SMTPSession; import org.apache.mailet.MailAddress; /** Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/hook/MailParametersHook.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/hook/MailParametersHook.java?rev=825212&r1=825198&r2=825212&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/hook/MailParametersHook.java (original) +++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/hook/MailParametersHook.java Wed Oct 14 18:31:34 2009 @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * * under the License. * ****************************************************************/ -package org.apache.james.smtpserver.hook; +package org.apache.james.smtpserver.protocol.hook; -import org.apache.james.smtpserver.SMTPSession; +import org.apache.james.smtpserver.protocol.SMTPSession; /** * Implement this interfaces to hook in the MAIL Command Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/hook/MessageHook.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/hook/MessageHook.java?rev=825212&r1=825198&r2=825212&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/hook/MessageHook.java (original) +++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/hook/MessageHook.java Wed Oct 14 18:31:34 2009 @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * * under the License. * ****************************************************************/ -package org.apache.james.smtpserver.hook; +package org.apache.james.smtpserver.protocol.hook; -import org.apache.james.smtpserver.SMTPSession; +import org.apache.james.smtpserver.protocol.SMTPSession; import org.apache.mailet.Mail; /** Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/hook/QuitHook.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/hook/QuitHook.java?rev=825212&r1=825198&r2=825212&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/hook/QuitHook.java (original) +++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/hook/QuitHook.java Wed Oct 14 18:31:34 2009 @@ -20,9 +20,9 @@ -package org.apache.james.smtpserver.hook; +package org.apache.james.smtpserver.protocol.hook; -import org.apache.james.smtpserver.SMTPSession; +import org.apache.james.smtpserver.protocol.SMTPSession; /** * Implement this interfaces to hook in the MAIL Command Modified: james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/hook/RcptHook.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/hook/RcptHook.java?rev=825212&r1=825198&r2=825212&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/hook/RcptHook.java (original) +++ james/server/trunk/smtpserver-function/src/main/java/org/apache/james/smtpserver/protocol/hook/RcptHook.java Wed Oct 14 18:31:34 2009 @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * * under the License. * ****************************************************************/ -package org.apache.james.smtpserver.hook; +package org.apache.james.smtpserver.protocol.hook; -import org.apache.james.smtpserver.SMTPSession; +import org.apache.james.smtpserver.protocol.SMTPSession; import org.apache.mailet.MailAddress; /** Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/AsyncSMTPServerTest.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/AsyncSMTPServerTest.java?rev=825212&r1=825211&r2=825212&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/AsyncSMTPServerTest.java (original) +++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/AsyncSMTPServerTest.java Wed Oct 14 18:31:34 2009 @@ -26,6 +26,7 @@ import org.apache.james.api.user.UsersRepository; import org.apache.james.services.FileSystem; import org.apache.james.services.MailServer; +import org.apache.james.smtpserver.mina.AsyncSMTPServer; import org.apache.james.test.mock.avalon.MockLogger; import org.apache.james.test.mock.avalon.MockStore; import org.apache.james.test.mock.james.MockFileSystem; Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/BaseFakeSMTPSession.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/BaseFakeSMTPSession.java?rev=825212&r1=825211&r2=825212&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/BaseFakeSMTPSession.java (original) +++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/BaseFakeSMTPSession.java Wed Oct 14 18:31:34 2009 @@ -25,6 +25,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.james.smtpserver.protocol.LineHandler; +import org.apache.james.smtpserver.protocol.SMTPConfiguration; +import org.apache.james.smtpserver.protocol.SMTPResponse; +import org.apache.james.smtpserver.protocol.SMTPSession; /** * Abstract class to simplify the mocks @@ -34,91 +38,91 @@ private static final Log log = LogFactory.getLog(BaseFakeSMTPSession.class); /** - * @see org.apache.james.smtpserver.SMTPSession#getConfigurationData() + * @see org.apache.james.smtpserver.protocol.SMTPSession#getConfigurationData() */ public SMTPConfiguration getConfigurationData() { throw new UnsupportedOperationException("Unimplemented Stub Method"); } /** - * @see org.apache.james.smtpserver.SMTPSession#getConnectionState() + * @see org.apache.james.smtpserver.protocol.SMTPSession#getConnectionState() */ public Map<String, Object> getConnectionState() { throw new UnsupportedOperationException("Unimplemented Stub Method"); } /** - * @see org.apache.james.smtpserver.SMTPSession#getRcptCount() + * @see org.apache.james.smtpserver.protocol.SMTPSession#getRcptCount() */ public int getRcptCount() { throw new UnsupportedOperationException("Unimplemented Stub Method"); } /** - * @see org.apache.james.smtpserver.SMTPSession#getRemoteHost() + * @see org.apache.james.smtpserver.protocol.SMTPSession#getRemoteHost() */ public String getRemoteHost() { throw new UnsupportedOperationException("Unimplemented Stub Method"); } /** - * @see org.apache.james.smtpserver.SMTPSession#getRemoteIPAddress() + * @see org.apache.james.smtpserver.protocol.SMTPSession#getRemoteIPAddress() */ public String getRemoteIPAddress() { throw new UnsupportedOperationException("Unimplemented Stub Method"); } /** - * @see org.apache.james.smtpserver.SMTPSession#getSessionID() + * @see org.apache.james.smtpserver.protocol.SMTPSession#getSessionID() */ public String getSessionID() { throw new UnsupportedOperationException("Unimplemented Stub Method"); } /** - * @see org.apache.james.smtpserver.SMTPSession#getState() + * @see org.apache.james.smtpserver.protocol.SMTPSession#getState() */ public Map<String, Object> getState() { throw new UnsupportedOperationException("Unimplemented Stub Method"); } /** - * @see org.apache.james.smtpserver.SMTPSession#getUser() + * @see org.apache.james.smtpserver.protocol.SMTPSession#getUser() */ public String getUser() { throw new UnsupportedOperationException("Unimplemented Stub Method"); } /** - * @see org.apache.james.smtpserver.SMTPSession#isAuthSupported() + * @see org.apache.james.smtpserver.protocol.SMTPSession#isAuthSupported() */ public boolean isAuthSupported() { throw new UnsupportedOperationException("Unimplemented Stub Method"); } /** - * @see org.apache.james.smtpserver.SMTPSession#isRelayingAllowed() + * @see org.apache.james.smtpserver.protocol.SMTPSession#isRelayingAllowed() */ public boolean isRelayingAllowed() { throw new UnsupportedOperationException("Unimplemented Stub Method"); } /** - * @see org.apache.james.smtpserver.SMTPSession#resetState() + * @see org.apache.james.smtpserver.protocol.SMTPSession#resetState() */ public void resetState() { throw new UnsupportedOperationException("Unimplemented Stub Method"); } /** - * @see org.apache.james.smtpserver.SMTPSession#setRelayingAllowed(boolean) + * @see org.apache.james.smtpserver.protocol.SMTPSession#setRelayingAllowed(boolean) */ public void setRelayingAllowed(boolean relayingAllowed) { throw new UnsupportedOperationException("Unimplemented Stub Method"); } /** - * @see org.apache.james.smtpserver.SMTPSession#setUser(java.lang.String) + * @see org.apache.james.smtpserver.protocol.SMTPSession#setUser(java.lang.String) */ public void setUser(String user) { throw new UnsupportedOperationException("Unimplemented Stub Method"); @@ -126,28 +130,28 @@ /** - * @see org.apache.james.smtpserver.SMTPSession#popLineHandler() + * @see org.apache.james.smtpserver.protocol.SMTPSession#popLineHandler() */ public void popLineHandler() { throw new UnsupportedOperationException("Unimplemented Stub Method"); } /** - * @see org.apache.james.smtpserver.SMTPSession#pushLineHandler(org.apache.james.smtpserver.LineHandler) + * @see org.apache.james.smtpserver.protocol.SMTPSession#pushLineHandler(org.apache.james.smtpserver.protocol.LineHandler) */ public void pushLineHandler(LineHandler overrideCommandHandler) { throw new UnsupportedOperationException("Unimplemented Stub Method"); } /** - * @see org.apache.james.smtpserver.SMTPSession#writeSMTPResponse(org.apache.james.smtpserver.SMTPResponse) + * @see org.apache.james.smtpserver.protocol.SMTPSession#writeSMTPResponse(org.apache.james.smtpserver.protocol.SMTPResponse) */ public void writeSMTPResponse(SMTPResponse response) { throw new UnsupportedOperationException("Unimplemented Stub Method"); } /** - * @see org.apache.james.smtpserver.SMTPSession#sleep(long) + * @see org.apache.james.smtpserver.protocol.SMTPSession#sleep(long) */ public void sleep(long ms) { throw new UnsupportedOperationException("Unimplemented Stub Method"); @@ -174,7 +178,7 @@ } /** - * @see org.apache.james.smtpserver.SMTPSession#getLogger() + * @see org.apache.james.smtpserver.protocol.SMTPSession#getLogger() */ public Log getLogger() { return log; Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/DNSRBLHandlerTest.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/DNSRBLHandlerTest.java?rev=825212&r1=825211&r2=825212&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/DNSRBLHandlerTest.java (original) +++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/DNSRBLHandlerTest.java Wed Oct 14 18:31:34 2009 @@ -41,7 +41,8 @@ import org.apache.commons.configuration.ConfigurationException; import org.apache.james.api.dnsservice.AbstractDNSServer; import org.apache.james.api.dnsservice.DNSService; -import org.apache.james.smtpserver.core.filter.fastfail.DNSRBLHandler; +import org.apache.james.smtpserver.protocol.SMTPSession; +import org.apache.james.smtpserver.protocol.core.filter.fastfail.DNSRBLHandler; import org.apache.james.test.mock.avalon.MockLogger; import org.apache.mailet.MailAddress; Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/MaxRcptHandlerTest.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/MaxRcptHandlerTest.java?rev=825212&r1=825211&r2=825212&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/MaxRcptHandlerTest.java (original) +++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/MaxRcptHandlerTest.java Wed Oct 14 18:31:34 2009 @@ -30,9 +30,10 @@ import junit.framework.TestCase; import org.apache.avalon.framework.container.ContainerUtil; -import org.apache.james.smtpserver.core.filter.fastfail.MaxRcptHandler; -import org.apache.james.smtpserver.hook.HookReturnCode; -import org.apache.james.smtpserver.hook.RcptHook; +import org.apache.james.smtpserver.protocol.SMTPSession; +import org.apache.james.smtpserver.protocol.core.filter.fastfail.MaxRcptHandler; +import org.apache.james.smtpserver.protocol.hook.HookReturnCode; +import org.apache.james.smtpserver.protocol.hook.RcptHook; import org.apache.james.test.mock.avalon.MockLogger; import org.apache.mailet.MailAddress; Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/POP3BeforeSMTPHandlerTest.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/POP3BeforeSMTPHandlerTest.java?rev=825212&r1=825211&r2=825212&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/POP3BeforeSMTPHandlerTest.java (original) +++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/POP3BeforeSMTPHandlerTest.java Wed Oct 14 18:31:34 2009 @@ -21,7 +21,8 @@ package org.apache.james.smtpserver; import org.apache.avalon.framework.container.ContainerUtil; -import org.apache.james.smtpserver.core.POP3BeforeSMTPHandler; +import org.apache.james.smtpserver.protocol.SMTPSession; +import org.apache.james.smtpserver.protocol.core.POP3BeforeSMTPHandler; import org.apache.james.test.mock.avalon.MockLogger; import org.apache.james.util.POP3BeforeSMTPHelper; Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ResolvableEhloHeloHandlerTest.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ResolvableEhloHeloHandlerTest.java?rev=825212&r1=825211&r2=825212&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ResolvableEhloHeloHandlerTest.java (original) +++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ResolvableEhloHeloHandlerTest.java Wed Oct 14 18:31:34 2009 @@ -33,8 +33,9 @@ import org.apache.avalon.framework.container.ContainerUtil; import org.apache.james.api.dnsservice.AbstractDNSServer; import org.apache.james.api.dnsservice.DNSService; -import org.apache.james.smtpserver.core.filter.fastfail.ResolvableEhloHeloHandler; -import org.apache.james.smtpserver.hook.HookReturnCode; +import org.apache.james.smtpserver.protocol.SMTPSession; +import org.apache.james.smtpserver.protocol.core.filter.fastfail.ResolvableEhloHeloHandler; +import org.apache.james.smtpserver.protocol.hook.HookReturnCode; import org.apache.james.test.mock.avalon.MockLogger; import org.apache.mailet.MailAddress; Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerComposedTest.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerComposedTest.java?rev=825212&r1=825211&r2=825212&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerComposedTest.java (original) +++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPServerComposedTest.java Wed Oct 14 18:31:34 2009 @@ -20,6 +20,7 @@ package org.apache.james.smtpserver; import org.apache.avalon.framework.container.ContainerUtil; +import org.apache.james.smtpserver.protocol.SMTPServerComposed; import org.apache.james.test.mock.avalon.MockLogger; public class SMTPServerComposedTest extends SMTPServerTest { Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java?rev=825212&r1=825211&r2=825212&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java (original) +++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SMTPTestConfiguration.java Wed Oct 14 18:31:34 2009 @@ -23,12 +23,12 @@ import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.avalon.framework.configuration.DefaultConfiguration; -import org.apache.james.smtpserver.core.CoreCmdHandlerLoader; -import org.apache.james.smtpserver.core.filter.fastfail.DNSRBLHandler; -import org.apache.james.smtpserver.core.filter.fastfail.MaxRcptHandler; -import org.apache.james.smtpserver.core.filter.fastfail.ResolvableEhloHeloHandler; -import org.apache.james.smtpserver.core.filter.fastfail.ReverseEqualsEhloHeloHandler; -import org.apache.james.smtpserver.core.filter.fastfail.ValidSenderDomainHandler; +import org.apache.james.smtpserver.protocol.core.CoreCmdHandlerLoader; +import org.apache.james.smtpserver.protocol.core.filter.fastfail.DNSRBLHandler; +import org.apache.james.smtpserver.protocol.core.filter.fastfail.MaxRcptHandler; +import org.apache.james.smtpserver.protocol.core.filter.fastfail.ResolvableEhloHeloHandler; +import org.apache.james.smtpserver.protocol.core.filter.fastfail.ReverseEqualsEhloHeloHandler; +import org.apache.james.smtpserver.protocol.core.filter.fastfail.ValidSenderDomainHandler; import org.apache.james.test.mock.util.AttrValConfiguration; import org.apache.james.test.util.Util; Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java?rev=825212&r1=825211&r2=825212&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java (original) +++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java Wed Oct 14 18:31:34 2009 @@ -29,8 +29,9 @@ import org.apache.james.jspf.core.DNSRequest; import org.apache.james.jspf.core.DNSService; import org.apache.james.jspf.core.exceptions.TimeoutException; -import org.apache.james.smtpserver.core.filter.fastfail.SPFHandler; -import org.apache.james.smtpserver.hook.HookReturnCode; +import org.apache.james.smtpserver.protocol.SMTPSession; +import org.apache.james.smtpserver.protocol.core.filter.fastfail.SPFHandler; +import org.apache.james.smtpserver.protocol.hook.HookReturnCode; import org.apache.james.test.mock.avalon.MockLogger; import org.apache.mailet.base.test.FakeMail; import org.apache.mailet.Mail; Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java?rev=825212&r1=825211&r2=825212&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java (original) +++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java Wed Oct 14 18:31:34 2009 @@ -22,7 +22,8 @@ import junit.framework.TestCase; import org.apache.avalon.framework.container.ContainerUtil; -import org.apache.james.smtpserver.core.SetMimeHeaderHandler; +import org.apache.james.smtpserver.protocol.SMTPSession; +import org.apache.james.smtpserver.protocol.core.SetMimeHeaderHandler; import org.apache.james.test.mock.avalon.MockLogger; import org.apache.mailet.Mail; Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java?rev=825212&r1=825211&r2=825212&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java (original) +++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java Wed Oct 14 18:31:34 2009 @@ -30,9 +30,10 @@ import junit.framework.TestCase; import org.apache.avalon.framework.container.ContainerUtil; -import org.apache.james.smtpserver.core.filter.fastfail.SpamAssassinHandler; -import org.apache.james.smtpserver.hook.HookResult; -import org.apache.james.smtpserver.hook.HookReturnCode; +import org.apache.james.smtpserver.protocol.SMTPSession; +import org.apache.james.smtpserver.protocol.core.filter.fastfail.SpamAssassinHandler; +import org.apache.james.smtpserver.protocol.hook.HookResult; +import org.apache.james.smtpserver.protocol.hook.HookReturnCode; import org.apache.james.test.mock.MockMimeMessage; import org.apache.james.test.mock.avalon.MockLogger; import org.apache.james.test.mock.mailet.MockMail; Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SpamTrapHandlerTest.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SpamTrapHandlerTest.java?rev=825212&r1=825211&r2=825212&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SpamTrapHandlerTest.java (original) +++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/SpamTrapHandlerTest.java Wed Oct 14 18:31:34 2009 @@ -25,8 +25,9 @@ import javax.mail.internet.ParseException; import org.apache.avalon.framework.container.ContainerUtil; -import org.apache.james.smtpserver.core.filter.fastfail.SpamTrapHandler; -import org.apache.james.smtpserver.hook.HookReturnCode; +import org.apache.james.smtpserver.protocol.SMTPSession; +import org.apache.james.smtpserver.protocol.core.filter.fastfail.SpamTrapHandler; +import org.apache.james.smtpserver.protocol.hook.HookReturnCode; import org.apache.james.test.mock.avalon.MockLogger; import org.apache.mailet.MailAddress; Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/TarpitHandlerTest.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/TarpitHandlerTest.java?rev=825212&r1=825211&r2=825212&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/TarpitHandlerTest.java (original) +++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/TarpitHandlerTest.java Wed Oct 14 18:31:34 2009 @@ -21,7 +21,8 @@ import javax.mail.internet.ParseException; import org.apache.avalon.framework.container.ContainerUtil; -import org.apache.james.smtpserver.core.filter.fastfail.TarpitHandler; +import org.apache.james.smtpserver.protocol.SMTPSession; +import org.apache.james.smtpserver.protocol.core.filter.fastfail.TarpitHandler; import org.apache.james.test.mock.avalon.MockLogger; import org.apache.mailet.MailAddress; Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java?rev=825212&r1=825211&r2=825212&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java (original) +++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java Wed Oct 14 18:31:34 2009 @@ -41,9 +41,10 @@ import org.apache.avalon.framework.container.ContainerUtil; import org.apache.james.api.dnsservice.AbstractDNSServer; import org.apache.james.api.dnsservice.DNSService; -import org.apache.james.smtpserver.core.filter.fastfail.URIRBLHandler; -import org.apache.james.smtpserver.hook.HookResult; -import org.apache.james.smtpserver.hook.HookReturnCode; +import org.apache.james.smtpserver.protocol.SMTPSession; +import org.apache.james.smtpserver.protocol.core.filter.fastfail.URIRBLHandler; +import org.apache.james.smtpserver.protocol.hook.HookResult; +import org.apache.james.smtpserver.protocol.hook.HookReturnCode; import org.apache.james.test.mock.MockMimeMessage; import org.apache.james.test.mock.avalon.MockLogger; import org.apache.james.test.mock.mailet.MockMail; Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java?rev=825212&r1=825211&r2=825212&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java (original) +++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java Wed Oct 14 18:31:34 2009 @@ -34,8 +34,10 @@ import org.apache.james.api.vut.ErrorMappingException; import org.apache.james.api.vut.VirtualUserTable; import org.apache.james.api.vut.VirtualUserTableStore; -import org.apache.james.smtpserver.core.filter.fastfail.ValidRcptHandler; -import org.apache.james.smtpserver.hook.HookReturnCode; +import org.apache.james.smtpserver.protocol.SMTPConfiguration; +import org.apache.james.smtpserver.protocol.SMTPSession; +import org.apache.james.smtpserver.protocol.core.filter.fastfail.ValidRcptHandler; +import org.apache.james.smtpserver.protocol.hook.HookReturnCode; import org.apache.james.test.mock.avalon.MockLogger; import org.apache.james.test.mock.james.MockVirtualUserTableStore; import org.apache.james.userrepository.MockUsersRepository; Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java?rev=825212&r1=825211&r2=825212&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java (original) +++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java Wed Oct 14 18:31:34 2009 @@ -31,8 +31,9 @@ import org.apache.avalon.framework.container.ContainerUtil; import org.apache.james.api.dnsservice.AbstractDNSServer; import org.apache.james.api.dnsservice.DNSService; -import org.apache.james.smtpserver.core.filter.fastfail.ValidRcptMX; -import org.apache.james.smtpserver.hook.HookReturnCode; +import org.apache.james.smtpserver.protocol.SMTPSession; +import org.apache.james.smtpserver.protocol.core.filter.fastfail.ValidRcptMX; +import org.apache.james.smtpserver.protocol.hook.HookReturnCode; import org.apache.james.test.mock.avalon.MockLogger; import org.apache.mailet.MailAddress; Modified: james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidSenderDomainHandlerTest.java URL: http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidSenderDomainHandlerTest.java?rev=825212&r1=825211&r2=825212&view=diff ============================================================================== --- james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidSenderDomainHandlerTest.java (original) +++ james/server/trunk/smtpserver-function/src/test/java/org/apache/james/smtpserver/ValidSenderDomainHandlerTest.java Wed Oct 14 18:31:34 2009 @@ -31,8 +31,9 @@ import org.apache.avalon.framework.container.ContainerUtil; import org.apache.james.api.dnsservice.AbstractDNSServer; import org.apache.james.api.dnsservice.DNSService; -import org.apache.james.smtpserver.core.filter.fastfail.ValidSenderDomainHandler; -import org.apache.james.smtpserver.hook.HookReturnCode; +import org.apache.james.smtpserver.protocol.SMTPSession; +import org.apache.james.smtpserver.protocol.core.filter.fastfail.ValidSenderDomainHandler; +import org.apache.james.smtpserver.protocol.hook.HookReturnCode; import org.apache.james.test.mock.avalon.MockLogger; import org.apache.mailet.MailAddress; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
