You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by no...@apache.org on 2010/02/01 13:22:56 UTC
svn commit: r905270 [2/2] - in /james/protocols/trunk/smtp/src:
main/java/org/apache/james/dsn/ main/java/org/apache/james/protocols/
main/java/org/apache/james/protocols/smtp/
main/java/org/apache/james/protocols/smtp/core/
main/java/org/apache/james/...
Copied: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java (from r905227, james/protocols/trunk/smtp/src/main/java/org/apache/james/smtpserver/protocol/core/esmtp/MailSizeEsmtpExtension.java)
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java?p2=james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java&p1=james/protocols/trunk/smtp/src/main/java/org/apache/james/smtpserver/protocol/core/esmtp/MailSizeEsmtpExtension.java&r1=905227&r2=905270&rev=905270&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/smtpserver/protocol/core/esmtp/MailSizeEsmtpExtension.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/MailSizeEsmtpExtension.java Mon Feb 1 12:22:54 2010
@@ -1,21 +1,21 @@
/**
*
*/
-package org.apache.james.smtpserver.protocol.core.esmtp;
+package org.apache.james.protocols.smtp.core.esmtp;
import java.util.LinkedList;
import java.util.List;
-import org.apache.james.dsn.DSNStatus;
import org.apache.james.protocols.api.LineHandler;
-import org.apache.james.smtpserver.protocol.MailEnvelope;
-import org.apache.james.smtpserver.protocol.SMTPRetCode;
-import org.apache.james.smtpserver.protocol.SMTPSession;
-import org.apache.james.smtpserver.protocol.core.DataLineFilter;
-import org.apache.james.smtpserver.protocol.hook.HookResult;
-import org.apache.james.smtpserver.protocol.hook.HookReturnCode;
-import org.apache.james.smtpserver.protocol.hook.MailParametersHook;
-import org.apache.james.smtpserver.protocol.hook.MessageHook;
+import org.apache.james.protocols.smtp.MailEnvelope;
+import org.apache.james.protocols.smtp.SMTPRetCode;
+import org.apache.james.protocols.smtp.SMTPSession;
+import org.apache.james.protocols.smtp.core.DataLineFilter;
+import org.apache.james.protocols.smtp.dsn.DSNStatus;
+import org.apache.james.protocols.smtp.hook.HookResult;
+import org.apache.james.protocols.smtp.hook.HookReturnCode;
+import org.apache.james.protocols.smtp.hook.MailParametersHook;
+import org.apache.james.protocols.smtp.hook.MessageHook;
/**
* Handle the ESMTP SIZE extension.
@@ -27,7 +27,7 @@
/**
- * @see org.apache.james.smtpserver.protocol.hook.MailParametersHook#doMailParameter(org.apache.james.smtpserver.protocol.SMTPSession, java.lang.String, java.lang.String)
+ * @see org.apache.james.protocols.smtp.hook.MailParametersHook#doMailParameter(org.apache.james.protocols.smtp.SMTPSession, java.lang.String, java.lang.String)
*/
public HookResult doMailParameter(SMTPSession session, String paramName,
String paramValue) {
@@ -37,14 +37,14 @@
}
/**
- * @see org.apache.james.smtpserver.protocol.hook.MailParametersHook#getMailParamNames()
+ * @see org.apache.james.protocols.smtp.hook.MailParametersHook#getMailParamNames()
*/
public String[] getMailParamNames() {
return new String[] { "SIZE" };
}
/**
- * @see org.apache.james.smtpserver.protocol.core.esmtp.EhloExtension#getImplementedEsmtpFeatures(org.apache.james.smtpserver.protocol.SMTPSession)
+ * @see org.apache.james.protocols.smtp.core.esmtp.EhloExtension#getImplementedEsmtpFeatures(org.apache.james.protocols.smtp.SMTPSession)
*/
public List<String> getImplementedEsmtpFeatures(SMTPSession session) {
LinkedList<String> resp = new LinkedList<String>();
@@ -157,7 +157,7 @@
}
/**
- * @see org.apache.james.smtpserver.protocol.hook.MessageHook#onMessage(org.apache.james.smtpserver.protocol.SMTPSession, org.apache.james.smtpserver.protocol.MailEnvelopeImpl)
+ * @see org.apache.james.protocols.smtp.hook.MessageHook#onMessage(org.apache.james.protocols.smtp.SMTPSession, org.apache.james.protocols.smtp.MailEnvelopeImpl)
*/
public HookResult onMessage(SMTPSession session, MailEnvelope mail) {
Boolean failed = (Boolean) session.getState().get(MESG_FAILED);
Copied: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/StartTlsCmdHandler.java (from r905227, james/protocols/trunk/smtp/src/main/java/org/apache/james/smtpserver/protocol/core/esmtp/StartTlsCmdHandler.java)
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/StartTlsCmdHandler.java?p2=james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/StartTlsCmdHandler.java&p1=james/protocols/trunk/smtp/src/main/java/org/apache/james/smtpserver/protocol/core/esmtp/StartTlsCmdHandler.java&r1=905227&r2=905270&rev=905270&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/smtpserver/protocol/core/esmtp/StartTlsCmdHandler.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/StartTlsCmdHandler.java Mon Feb 1 12:22:54 2010
@@ -17,20 +17,20 @@
* under the License. *
****************************************************************/
-package org.apache.james.smtpserver.protocol.core.esmtp;
+package org.apache.james.protocols.smtp.core.esmtp;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import org.apache.james.dsn.DSNStatus;
import org.apache.james.protocols.api.CommandHandler;
import org.apache.james.protocols.api.Request;
import org.apache.james.protocols.api.Response;
-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.protocols.smtp.SMTPResponse;
+import org.apache.james.protocols.smtp.SMTPRetCode;
+import org.apache.james.protocols.smtp.SMTPSession;
+import org.apache.james.protocols.smtp.dsn.DSNStatus;
/**
* Handles STARTTLS command
@@ -92,7 +92,7 @@
}
/**
- * @see org.apache.james.smtpserver.protocol.core.esmtp.EhloExtension#getImplementedEsmtpFeatures(org.apache.james.smtpserver.protocol.SMTPSession)
+ * @see org.apache.james.protocols.smtp.core.esmtp.EhloExtension#getImplementedEsmtpFeatures(org.apache.james.protocols.smtp.SMTPSession)
*/
public List<String> getImplementedEsmtpFeatures(SMTPSession session) {
List<String> esmtpextensions = new ArrayList<String>();
Copied: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractGreylistHandler.java (from r905227, james/protocols/trunk/smtp/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/AbstractGreylistHandler.java)
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractGreylistHandler.java?p2=james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractGreylistHandler.java&p1=james/protocols/trunk/smtp/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/AbstractGreylistHandler.java&r1=905227&r2=905270&rev=905270&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/AbstractGreylistHandler.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractGreylistHandler.java Mon Feb 1 12:22:54 2010
@@ -17,16 +17,16 @@
* under the License. *
****************************************************************/
-package org.apache.james.smtpserver.protocol.core.fastfail;
+package org.apache.james.protocols.smtp.core.fastfail;
import java.util.Iterator;
-import org.apache.james.dsn.DSNStatus;
-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.protocols.smtp.SMTPRetCode;
+import org.apache.james.protocols.smtp.SMTPSession;
+import org.apache.james.protocols.smtp.dsn.DSNStatus;
+import org.apache.james.protocols.smtp.hook.HookResult;
+import org.apache.james.protocols.smtp.hook.HookReturnCode;
+import org.apache.james.protocols.smtp.hook.RcptHook;
import org.apache.mailet.MailAddress;
@@ -202,7 +202,7 @@
/**
- * @see org.apache.james.smtpserver.protocol.hook.RcptHook#doRcpt(org.apache.james.smtpserver.protocol.SMTPSession, org.apache.mailet.MailAddress, org.apache.mailet.MailAddress)
+ * @see org.apache.james.protocols.smtp.hook.RcptHook#doRcpt(org.apache.james.protocols.smtp.SMTPSession, org.apache.mailet.MailAddress, org.apache.mailet.MailAddress)
*/
public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) {
if (!session.isRelayingAllowed()) {
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractValidRcptHandler.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractValidRcptHandler.java?rev=905270&r1=905226&r2=905270&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractValidRcptHandler.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/AbstractValidRcptHandler.java Mon Feb 1 12:22:54 2010
@@ -20,14 +20,14 @@
-package org.apache.james.smtpserver.protocol.core.fastfail;
+package org.apache.james.protocols.smtp.core.fastfail;
-import org.apache.james.dsn.DSNStatus;
-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.protocols.smtp.SMTPRetCode;
+import org.apache.james.protocols.smtp.SMTPSession;
+import org.apache.james.protocols.smtp.dsn.DSNStatus;
+import org.apache.james.protocols.smtp.hook.HookResult;
+import org.apache.james.protocols.smtp.hook.HookReturnCode;
+import org.apache.james.protocols.smtp.hook.RcptHook;
import org.apache.mailet.MailAddress;
@@ -39,7 +39,7 @@
/**
- * @see org.apache.james.smtpserver.protocol.hook.RcptHook#doRcpt(org.apache.james.smtpserver.protocol.SMTPSession, org.apache.mailet.MailAddress, org.apache.mailet.MailAddress)
+ * @see org.apache.james.protocols.smtp.hook.RcptHook#doRcpt(org.apache.james.protocols.smtp.SMTPSession, org.apache.mailet.MailAddress, org.apache.mailet.MailAddress)
*/
public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) {
Copied: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandler.java (from r905227, james/protocols/trunk/smtp/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/DNSRBLHandler.java)
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandler.java?p2=james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandler.java&p1=james/protocols/trunk/smtp/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/DNSRBLHandler.java&r1=905227&r2=905270&rev=905270&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/smtpserver/protocol/core/fastfail/DNSRBLHandler.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandler.java Mon Feb 1 12:22:54 2010
@@ -19,18 +19,18 @@
-package org.apache.james.smtpserver.protocol.core.fastfail;
+package org.apache.james.protocols.smtp.core.fastfail;
import java.util.Collection;
import java.util.StringTokenizer;
-import org.apache.james.dsn.DSNStatus;
import org.apache.james.protocols.api.ConnectHandler;
-import org.apache.james.smtpserver.protocol.DNSService;
-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.protocols.smtp.DNSService;
+import org.apache.james.protocols.smtp.SMTPSession;
+import org.apache.james.protocols.smtp.dsn.DSNStatus;
+import org.apache.james.protocols.smtp.hook.HookResult;
+import org.apache.james.protocols.smtp.hook.HookReturnCode;
+import org.apache.james.protocols.smtp.hook.RcptHook;
import org.apache.mailet.MailAddress;
/**
@@ -178,7 +178,7 @@
}
/**
- * @see org.apache.james.smtpserver.protocol.hook.RcptHook#doRcpt(org.apache.james.smtpserver.protocol.SMTPSession, org.apache.mailet.MailAddress, org.apache.mailet.MailAddress)
+ * @see org.apache.james.protocols.smtp.hook.RcptHook#doRcpt(org.apache.james.protocols.smtp.SMTPSession, org.apache.mailet.MailAddress, org.apache.mailet.MailAddress)
*/
public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) {
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandler.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandler.java?rev=905270&r1=905226&r2=905270&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandler.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandler.java Mon Feb 1 12:22:54 2010
@@ -19,15 +19,15 @@
-package org.apache.james.smtpserver.protocol.core.fastfail;
+package org.apache.james.protocols.smtp.core.fastfail;
-import org.apache.james.dsn.DSNStatus;
-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.protocols.smtp.SMTPRetCode;
+import org.apache.james.protocols.smtp.SMTPSession;
+import org.apache.james.protocols.smtp.dsn.DSNStatus;
+import org.apache.james.protocols.smtp.hook.HookResult;
+import org.apache.james.protocols.smtp.hook.HookReturnCode;
+import org.apache.james.protocols.smtp.hook.RcptHook;
import org.apache.mailet.MailAddress;
public class MaxRcptHandler implements RcptHook {
@@ -46,7 +46,7 @@
}
/**
- * @see org.apache.james.smtpserver.protocol.hook.RcptHook#doRcpt(org.apache.james.smtpserver.protocol.SMTPSession, org.apache.mailet.MailAddress, org.apache.mailet.MailAddress)
+ * @see org.apache.james.protocols.smtp.hook.RcptHook#doRcpt(org.apache.james.protocols.smtp.SMTPSession, org.apache.mailet.MailAddress, org.apache.mailet.MailAddress)
*/
public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) {
if ((session.getRcptCount() + 1) > maxRcpt) {
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandler.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandler.java?rev=905270&r1=905226&r2=905270&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandler.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandler.java Mon Feb 1 12:22:54 2010
@@ -17,19 +17,19 @@
* under the License. *
****************************************************************/
-package org.apache.james.smtpserver.protocol.core.fastfail;
+package org.apache.james.protocols.smtp.core.fastfail;
import java.net.UnknownHostException;
-import org.apache.james.dsn.DSNStatus;
-import org.apache.james.smtpserver.protocol.DNSService;
-import org.apache.james.smtpserver.protocol.SMTPRetCode;
-import org.apache.james.smtpserver.protocol.SMTPSession;
-import org.apache.james.smtpserver.protocol.hook.HeloHook;
-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.protocols.smtp.DNSService;
+import org.apache.james.protocols.smtp.SMTPRetCode;
+import org.apache.james.protocols.smtp.SMTPSession;
+import org.apache.james.protocols.smtp.dsn.DSNStatus;
+import org.apache.james.protocols.smtp.hook.HeloHook;
+import org.apache.james.protocols.smtp.hook.HookResult;
+import org.apache.james.protocols.smtp.hook.HookReturnCode;
+import org.apache.james.protocols.smtp.hook.RcptHook;
import org.apache.mailet.MailAddress;
@@ -92,7 +92,7 @@
}
/**
- * @see org.apache.james.smtpserver.core.filter.fastfail.AbstractJunkHandler#check(org.apache.james.smtpserver.protocol.SMTPSession)
+ * @see org.apache.james.smtpserver.core.filter.fastfail.AbstractJunkHandler#check(org.apache.james.protocols.smtp.SMTPSession)
*/
protected boolean check(SMTPSession session,MailAddress rcpt) {
// not reject it
@@ -104,7 +104,7 @@
}
/**
- * @see org.apache.james.smtpserver.protocol.hook.RcptHook#doRcpt(org.apache.james.smtpserver.protocol.SMTPSession, org.apache.mailet.MailAddress, org.apache.mailet.MailAddress)
+ * @see org.apache.james.protocols.smtp.hook.RcptHook#doRcpt(org.apache.james.protocols.smtp.SMTPSession, org.apache.mailet.MailAddress, org.apache.mailet.MailAddress)
*/
public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) {
if (check(session,rcpt)) {
@@ -116,7 +116,7 @@
}
/**
- * @see org.apache.james.smtpserver.protocol.hook.HeloHook#doHelo(org.apache.james.smtpserver.protocol.SMTPSession, java.lang.String)
+ * @see org.apache.james.protocols.smtp.hook.HeloHook#doHelo(org.apache.james.protocols.smtp.SMTPSession, java.lang.String)
*/
public HookResult doHelo(SMTPSession session, String helo) {
checkEhloHelo(session, helo);
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ReverseEqualsEhloHeloHandler.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ReverseEqualsEhloHeloHandler.java?rev=905270&r1=905226&r2=905270&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ReverseEqualsEhloHeloHandler.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ReverseEqualsEhloHeloHandler.java Mon Feb 1 12:22:54 2010
@@ -17,9 +17,9 @@
* under the License. *
****************************************************************/
-package org.apache.james.smtpserver.protocol.core.fastfail;
+package org.apache.james.protocols.smtp.core.fastfail;
-import org.apache.james.smtpserver.protocol.SMTPSession;
+import org.apache.james.protocols.smtp.SMTPSession;
import java.net.UnknownHostException;
@@ -28,7 +28,7 @@
public class ReverseEqualsEhloHeloHandler extends ResolvableEhloHeloHandler {
/**
- * @see org.apache.james.smtpserver.protocol.core.fastfail.ResolvableEhloHeloHandler#isBadHelo(org.apache.james.smtpserver.protocol.SMTPSession, java.lang.String)
+ * @see org.apache.james.protocols.smtp.core.fastfail.ResolvableEhloHeloHandler#isBadHelo(org.apache.james.protocols.smtp.SMTPSession, java.lang.String)
*/
protected boolean isBadHelo(SMTPSession session, String argument) {
try {
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandler.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandler.java?rev=905270&r1=905226&r2=905270&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandler.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandler.java Mon Feb 1 12:22:54 2010
@@ -18,17 +18,17 @@
****************************************************************/
-package org.apache.james.smtpserver.protocol.core.fastfail;
+package org.apache.james.protocols.smtp.core.fastfail;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
-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.protocols.smtp.SMTPSession;
+import org.apache.james.protocols.smtp.hook.HookResult;
+import org.apache.james.protocols.smtp.hook.HookReturnCode;
+import org.apache.james.protocols.smtp.hook.RcptHook;
import org.apache.mailet.MailAddress;
/**
@@ -55,7 +55,7 @@
}
/**
- * @see org.apache.james.smtpserver.protocol.hook.RcptHook#doRcpt(org.apache.james.smtpserver.protocol.SMTPSession, org.apache.mailet.MailAddress, org.apache.mailet.MailAddress)
+ * @see org.apache.james.protocols.smtp.hook.RcptHook#doRcpt(org.apache.james.protocols.smtp.SMTPSession, org.apache.mailet.MailAddress, org.apache.mailet.MailAddress)
*/
public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) {
if (isBlocked(session.getRemoteIPAddress(), session)) {
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SupressDuplicateRcptHandler.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SupressDuplicateRcptHandler.java?rev=905270&r1=905226&r2=905270&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SupressDuplicateRcptHandler.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/SupressDuplicateRcptHandler.java Mon Feb 1 12:22:54 2010
@@ -20,16 +20,16 @@
-package org.apache.james.smtpserver.protocol.core.fastfail;
+package org.apache.james.protocols.smtp.core.fastfail;
import java.util.Collection;
-import org.apache.james.dsn.DSNStatus;
-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.protocols.smtp.SMTPRetCode;
+import org.apache.james.protocols.smtp.SMTPSession;
+import org.apache.james.protocols.smtp.dsn.DSNStatus;
+import org.apache.james.protocols.smtp.hook.HookResult;
+import org.apache.james.protocols.smtp.hook.HookReturnCode;
+import org.apache.james.protocols.smtp.hook.RcptHook;
import org.apache.mailet.MailAddress;
/**
@@ -39,7 +39,7 @@
public class SupressDuplicateRcptHandler implements RcptHook {
/**
- * @see org.apache.james.smtpserver.protocol.hook.RcptHook#doRcpt(org.apache.james.smtpserver.protocol.SMTPSession, org.apache.mailet.MailAddress, org.apache.mailet.MailAddress)
+ * @see org.apache.james.protocols.smtp.hook.RcptHook#doRcpt(org.apache.james.protocols.smtp.SMTPSession, org.apache.mailet.MailAddress, org.apache.mailet.MailAddress)
*/
@SuppressWarnings("unchecked")
public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) {
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/TarpitHandler.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/TarpitHandler.java?rev=905270&r1=905226&r2=905270&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/TarpitHandler.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/TarpitHandler.java Mon Feb 1 12:22:54 2010
@@ -19,13 +19,13 @@
-package org.apache.james.smtpserver.protocol.core.fastfail;
+package org.apache.james.protocols.smtp.core.fastfail;
-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.protocols.smtp.SMTPSession;
+import org.apache.james.protocols.smtp.hook.HookResult;
+import org.apache.james.protocols.smtp.hook.HookReturnCode;
+import org.apache.james.protocols.smtp.hook.RcptHook;
import org.apache.mailet.MailAddress;
/**
@@ -61,7 +61,7 @@
}
/**
- * @see org.apache.james.smtpserver.protocol.hook.RcptHook#doRcpt(org.apache.james.smtpserver.protocol.SMTPSession, org.apache.mailet.MailAddress, org.apache.mailet.MailAddress)
+ * @see org.apache.james.protocols.smtp.hook.RcptHook#doRcpt(org.apache.james.protocols.smtp.SMTPSession, org.apache.mailet.MailAddress, org.apache.mailet.MailAddress)
*/
public HookResult doRcpt(SMTPSession session, MailAddress sender, MailAddress rcpt) {
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandler.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandler.java?rev=905270&r1=905226&r2=905270&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandler.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandler.java Mon Feb 1 12:22:54 2010
@@ -16,18 +16,18 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.smtpserver.protocol.core.fastfail;
+package org.apache.james.protocols.smtp.core.fastfail;
import java.util.Collection;
-import org.apache.james.dsn.DSNStatus;
-import org.apache.james.smtpserver.protocol.DNSService;
-import org.apache.james.smtpserver.protocol.SMTPRetCode;
-import org.apache.james.smtpserver.protocol.SMTPSession;
-import org.apache.james.smtpserver.protocol.TemporaryResolutionException;
-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.protocols.smtp.DNSService;
+import org.apache.james.protocols.smtp.SMTPRetCode;
+import org.apache.james.protocols.smtp.SMTPSession;
+import org.apache.james.protocols.smtp.TemporaryResolutionException;
+import org.apache.james.protocols.smtp.dsn.DSNStatus;
+import org.apache.james.protocols.smtp.hook.HookResult;
+import org.apache.james.protocols.smtp.hook.HookReturnCode;
+import org.apache.james.protocols.smtp.hook.MailHook;
import org.apache.mailet.MailAddress;
/**
@@ -71,7 +71,7 @@
}
/**
- * @see org.apache.james.smtpserver.protocol.hook.MailHook#doMail(org.apache.james.smtpserver.protocol.SMTPSession, org.apache.mailet.MailAddress)
+ * @see org.apache.james.protocols.smtp.hook.MailHook#doMail(org.apache.james.protocols.smtp.SMTPSession, org.apache.mailet.MailAddress)
*/
public HookResult doMail(SMTPSession session, MailAddress sender) {
if (check(session,sender)) {
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/dsn/DSNStatus.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/dsn/DSNStatus.java?rev=905270&r1=905226&r2=905270&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/dsn/DSNStatus.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/dsn/DSNStatus.java Mon Feb 1 12:22:54 2010
@@ -19,7 +19,7 @@
-package org.apache.james.dsn;
+package org.apache.james.protocols.smtp.dsn;
/**
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/hook/AuthHook.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/hook/AuthHook.java?rev=905270&r1=905226&r2=905270&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/hook/AuthHook.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/hook/AuthHook.java Mon Feb 1 12:22:54 2010
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.smtpserver.protocol.hook;
+package org.apache.james.protocols.smtp.hook;
-import org.apache.james.smtpserver.protocol.SMTPSession;
+import org.apache.james.protocols.smtp.SMTPSession;
/**
* Implement this interfaces to hook in the AUTH Command
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/hook/HeloHook.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/hook/HeloHook.java?rev=905270&r1=905226&r2=905270&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/hook/HeloHook.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/hook/HeloHook.java Mon Feb 1 12:22:54 2010
@@ -20,9 +20,9 @@
-package org.apache.james.smtpserver.protocol.hook;
+package org.apache.james.protocols.smtp.hook;
-import org.apache.james.smtpserver.protocol.SMTPSession;
+import org.apache.james.protocols.smtp.SMTPSession;
/**
* Implement this interfaces to hook in the HELO Command
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/hook/HookResult.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/hook/HookResult.java?rev=905270&r1=905226&r2=905270&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/hook/HookResult.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/hook/HookResult.java Mon Feb 1 12:22:54 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.smtpserver.protocol.hook;
+package org.apache.james.protocols.smtp.hook;
/**
* Result which get used for hooks
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/hook/HookResultHook.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/hook/HookResultHook.java?rev=905270&r1=905226&r2=905270&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/hook/HookResultHook.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/hook/HookResultHook.java Mon Feb 1 12:22:54 2010
@@ -18,9 +18,9 @@
****************************************************************/
-package org.apache.james.smtpserver.protocol.hook;
+package org.apache.james.protocols.smtp.hook;
-import org.apache.james.smtpserver.protocol.SMTPSession;
+import org.apache.james.protocols.smtp.SMTPSession;
public interface HookResultHook {
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/hook/HookReturnCode.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/hook/HookReturnCode.java?rev=905270&r1=905226&r2=905270&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/hook/HookReturnCode.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/hook/HookReturnCode.java Mon Feb 1 12:22:54 2010
@@ -20,7 +20,7 @@
-package org.apache.james.smtpserver.protocol.hook;
+package org.apache.james.protocols.smtp.hook;
public class HookReturnCode {
public final static int OK = 0;
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/hook/MailHook.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/hook/MailHook.java?rev=905270&r1=905226&r2=905270&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/hook/MailHook.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/hook/MailHook.java Mon Feb 1 12:22:54 2010
@@ -21,9 +21,9 @@
-package org.apache.james.smtpserver.protocol.hook;
+package org.apache.james.protocols.smtp.hook;
-import org.apache.james.smtpserver.protocol.SMTPSession;
+import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.mailet.MailAddress;
/**
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/hook/MailParametersHook.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/hook/MailParametersHook.java?rev=905270&r1=905226&r2=905270&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/hook/MailParametersHook.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/hook/MailParametersHook.java Mon Feb 1 12:22:54 2010
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.smtpserver.protocol.hook;
+package org.apache.james.protocols.smtp.hook;
-import org.apache.james.smtpserver.protocol.SMTPSession;
+import org.apache.james.protocols.smtp.SMTPSession;
/**
* Implement this interfaces to hook in the MAIL Command
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/hook/MessageHook.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/hook/MessageHook.java?rev=905270&r1=905226&r2=905270&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/hook/MessageHook.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/hook/MessageHook.java Mon Feb 1 12:22:54 2010
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.smtpserver.protocol.hook;
+package org.apache.james.protocols.smtp.hook;
-import org.apache.james.smtpserver.protocol.MailEnvelope;
-import org.apache.james.smtpserver.protocol.SMTPSession;
+import org.apache.james.protocols.smtp.MailEnvelope;
+import org.apache.james.protocols.smtp.SMTPSession;
/**
* Custom message handlers must implement this interface The message hooks will
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/hook/QuitHook.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/hook/QuitHook.java?rev=905270&r1=905226&r2=905270&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/hook/QuitHook.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/hook/QuitHook.java Mon Feb 1 12:22:54 2010
@@ -20,9 +20,9 @@
-package org.apache.james.smtpserver.protocol.hook;
+package org.apache.james.protocols.smtp.hook;
-import org.apache.james.smtpserver.protocol.SMTPSession;
+import org.apache.james.protocols.smtp.SMTPSession;
/**
* Implement this interfaces to hook in the MAIL Command
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/hook/RcptHook.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/hook/RcptHook.java?rev=905270&r1=905226&r2=905270&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/hook/RcptHook.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/hook/RcptHook.java Mon Feb 1 12:22:54 2010
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.smtpserver.protocol.hook;
+package org.apache.james.protocols.smtp.hook;
-import org.apache.james.smtpserver.protocol.SMTPSession;
+import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.mailet.MailAddress;
/**
Copied: james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/BaseFakeDNSService.java (from r905226, james/protocols/trunk/smtp/src/test/java/org/apache/james/smtpserver/protocol/BaseFakeDNSService.java)
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/BaseFakeDNSService.java?p2=james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/BaseFakeDNSService.java&p1=james/protocols/trunk/smtp/src/test/java/org/apache/james/smtpserver/protocol/BaseFakeDNSService.java&r1=905226&r2=905270&rev=905270&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/test/java/org/apache/james/smtpserver/protocol/BaseFakeDNSService.java (original)
+++ james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/BaseFakeDNSService.java Mon Feb 1 12:22:54 2010
@@ -16,13 +16,15 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.smtpserver.protocol;
+package org.apache.james.protocols.smtp;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.Collection;
import java.util.Iterator;
+import org.apache.james.protocols.smtp.DNSService;
+import org.apache.james.protocols.smtp.TemporaryResolutionException;
import org.apache.mailet.HostAddress;
public class BaseFakeDNSService implements DNSService{
Copied: james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/BaseFakeSMTPSession.java (from r905227, james/protocols/trunk/smtp/src/test/java/org/apache/james/smtpserver/protocol/BaseFakeSMTPSession.java)
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/BaseFakeSMTPSession.java?p2=james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/BaseFakeSMTPSession.java&p1=james/protocols/trunk/smtp/src/test/java/org/apache/james/smtpserver/protocol/BaseFakeSMTPSession.java&r1=905227&r2=905270&rev=905270&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/test/java/org/apache/james/smtpserver/protocol/BaseFakeSMTPSession.java (original)
+++ james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/BaseFakeSMTPSession.java Mon Feb 1 12:22:54 2010
@@ -18,7 +18,7 @@
****************************************************************/
-package org.apache.james.smtpserver.protocol;
+package org.apache.james.protocols.smtp;
import java.io.IOException;
import java.util.Map;
@@ -27,8 +27,8 @@
import org.apache.commons.logging.LogFactory;
import org.apache.james.protocols.api.LineHandler;
import org.apache.james.protocols.api.Response;
-import org.apache.james.smtpserver.protocol.SMTPConfiguration;
-import org.apache.james.smtpserver.protocol.SMTPSession;
+import org.apache.james.protocols.smtp.SMTPConfiguration;
+import org.apache.james.protocols.smtp.SMTPSession;
/**
* Abstract class to simplify the mocks
@@ -38,91 +38,91 @@
private static final Log log = LogFactory.getLog(BaseFakeSMTPSession.class);
/**
- * @see org.apache.james.smtpserver.protocol.SMTPSession#getConfigurationData()
+ * @see org.apache.james.protocols.smtp.SMTPSession#getConfigurationData()
*/
public SMTPConfiguration getConfigurationData() {
throw new UnsupportedOperationException("Unimplemented Stub Method");
}
/**
- * @see org.apache.james.smtpserver.protocol.SMTPSession#getConnectionState()
+ * @see org.apache.james.protocols.smtp.SMTPSession#getConnectionState()
*/
public Map<String, Object> getConnectionState() {
throw new UnsupportedOperationException("Unimplemented Stub Method");
}
/**
- * @see org.apache.james.smtpserver.protocol.SMTPSession#getRcptCount()
+ * @see org.apache.james.protocols.smtp.SMTPSession#getRcptCount()
*/
public int getRcptCount() {
throw new UnsupportedOperationException("Unimplemented Stub Method");
}
/**
- * @see org.apache.james.smtpserver.protocol.SMTPSession#getRemoteHost()
+ * @see org.apache.james.protocols.smtp.SMTPSession#getRemoteHost()
*/
public String getRemoteHost() {
throw new UnsupportedOperationException("Unimplemented Stub Method");
}
/**
- * @see org.apache.james.smtpserver.protocol.SMTPSession#getRemoteIPAddress()
+ * @see org.apache.james.protocols.smtp.SMTPSession#getRemoteIPAddress()
*/
public String getRemoteIPAddress() {
throw new UnsupportedOperationException("Unimplemented Stub Method");
}
/**
- * @see org.apache.james.smtpserver.protocol.SMTPSession#getSessionID()
+ * @see org.apache.james.protocols.smtp.SMTPSession#getSessionID()
*/
public String getSessionID() {
throw new UnsupportedOperationException("Unimplemented Stub Method");
}
/**
- * @see org.apache.james.smtpserver.protocol.SMTPSession#getState()
+ * @see org.apache.james.protocols.smtp.SMTPSession#getState()
*/
public Map<String, Object> getState() {
throw new UnsupportedOperationException("Unimplemented Stub Method");
}
/**
- * @see org.apache.james.smtpserver.protocol.SMTPSession#getUser()
+ * @see org.apache.james.protocols.smtp.SMTPSession#getUser()
*/
public String getUser() {
throw new UnsupportedOperationException("Unimplemented Stub Method");
}
/**
- * @see org.apache.james.smtpserver.protocol.SMTPSession#isAuthSupported()
+ * @see org.apache.james.protocols.smtp.SMTPSession#isAuthSupported()
*/
public boolean isAuthSupported() {
throw new UnsupportedOperationException("Unimplemented Stub Method");
}
/**
- * @see org.apache.james.smtpserver.protocol.SMTPSession#isRelayingAllowed()
+ * @see org.apache.james.protocols.smtp.SMTPSession#isRelayingAllowed()
*/
public boolean isRelayingAllowed() {
throw new UnsupportedOperationException("Unimplemented Stub Method");
}
/**
- * @see org.apache.james.smtpserver.protocol.SMTPSession#resetState()
+ * @see org.apache.james.protocols.smtp.SMTPSession#resetState()
*/
public void resetState() {
throw new UnsupportedOperationException("Unimplemented Stub Method");
}
/**
- * @see org.apache.james.smtpserver.protocol.SMTPSession#setRelayingAllowed(boolean)
+ * @see org.apache.james.protocols.smtp.SMTPSession#setRelayingAllowed(boolean)
*/
public void setRelayingAllowed(boolean relayingAllowed) {
throw new UnsupportedOperationException("Unimplemented Stub Method");
}
/**
- * @see org.apache.james.smtpserver.protocol.SMTPSession#setUser(java.lang.String)
+ * @see org.apache.james.protocols.smtp.SMTPSession#setUser(java.lang.String)
*/
public void setUser(String user) {
throw new UnsupportedOperationException("Unimplemented Stub Method");
@@ -130,7 +130,7 @@
/**
- * @see org.apache.james.smtpserver.protocol.SMTPSession#popLineHandler()
+ * @see org.apache.james.protocols.smtp.SMTPSession#popLineHandler()
*/
public void popLineHandler() {
throw new UnsupportedOperationException("Unimplemented Stub Method");
@@ -153,7 +153,7 @@
}
/**
- * @see org.apache.james.smtpserver.protocol.SMTPSession#sleep(long)
+ * @see org.apache.james.protocols.smtp.SMTPSession#sleep(long)
*/
public void sleep(long ms) {
throw new UnsupportedOperationException("Unimplemented Stub Method");
@@ -180,7 +180,7 @@
}
/**
- * @see org.apache.james.smtpserver.protocol.SMTPSession#getLogger()
+ * @see org.apache.james.protocols.smtp.SMTPSession#getLogger()
*/
public Log getLogger() {
return log;
Modified: james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandlerTest.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandlerTest.java?rev=905270&r1=905226&r2=905270&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandlerTest.java (original)
+++ james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/DNSRBLHandlerTest.java Mon Feb 1 12:22:54 2010
@@ -18,7 +18,7 @@
****************************************************************/
-package org.apache.james.smtpserver.protocol.core.fastfail;
+package org.apache.james.protocols.smtp.core.fastfail;
import java.net.InetAddress;
import java.net.UnknownHostException;
@@ -32,10 +32,11 @@
import junit.framework.TestCase;
-import org.apache.james.smtpserver.protocol.BaseFakeDNSService;
-import org.apache.james.smtpserver.protocol.BaseFakeSMTPSession;
-import org.apache.james.smtpserver.protocol.DNSService;
-import org.apache.james.smtpserver.protocol.SMTPSession;
+import org.apache.james.protocols.smtp.BaseFakeDNSService;
+import org.apache.james.protocols.smtp.BaseFakeSMTPSession;
+import org.apache.james.protocols.smtp.DNSService;
+import org.apache.james.protocols.smtp.SMTPSession;
+import org.apache.james.protocols.smtp.core.fastfail.DNSRBLHandler;
import org.apache.mailet.MailAddress;
public class DNSRBLHandlerTest extends TestCase {
Modified: james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandlerTest.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandlerTest.java?rev=905270&r1=905226&r2=905270&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandlerTest.java (original)
+++ james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MaxRcptHandlerTest.java Mon Feb 1 12:22:54 2010
@@ -20,7 +20,7 @@
-package org.apache.james.smtpserver.protocol.core.fastfail;
+package org.apache.james.protocols.smtp.core.fastfail;
import java.util.HashMap;
import java.util.Map;
@@ -29,10 +29,10 @@
import junit.framework.TestCase;
-import org.apache.james.smtpserver.protocol.BaseFakeSMTPSession;
-import org.apache.james.smtpserver.protocol.SMTPSession;
-import org.apache.james.smtpserver.protocol.core.fastfail.MaxRcptHandler;
-import org.apache.james.smtpserver.protocol.hook.HookReturnCode;
+import org.apache.james.protocols.smtp.BaseFakeSMTPSession;
+import org.apache.james.protocols.smtp.SMTPSession;
+import org.apache.james.protocols.smtp.core.fastfail.MaxRcptHandler;
+import org.apache.james.protocols.smtp.hook.HookReturnCode;
import org.apache.mailet.MailAddress;
Modified: james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MockLog.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MockLog.java?rev=905270&r1=905226&r2=905270&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MockLog.java (original)
+++ james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/MockLog.java Mon Feb 1 12:22:54 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.smtpserver.protocol.core.fastfail;
+package org.apache.james.protocols.smtp.core.fastfail;
import org.apache.commons.logging.Log;
Modified: james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java?rev=905270&r1=905226&r2=905270&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java (original)
+++ james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ResolvableEhloHeloHandlerTest.java Mon Feb 1 12:22:54 2010
@@ -19,7 +19,7 @@
-package org.apache.james.smtpserver.protocol.core.fastfail;
+package org.apache.james.protocols.smtp.core.fastfail;
import java.net.InetAddress;
import java.net.UnknownHostException;
@@ -30,12 +30,12 @@
import junit.framework.TestCase;
-import org.apache.james.smtpserver.protocol.BaseFakeDNSService;
-import org.apache.james.smtpserver.protocol.BaseFakeSMTPSession;
-import org.apache.james.smtpserver.protocol.DNSService;
-import org.apache.james.smtpserver.protocol.SMTPSession;
-import org.apache.james.smtpserver.protocol.core.fastfail.ResolvableEhloHeloHandler;
-import org.apache.james.smtpserver.protocol.hook.HookReturnCode;
+import org.apache.james.protocols.smtp.BaseFakeDNSService;
+import org.apache.james.protocols.smtp.BaseFakeSMTPSession;
+import org.apache.james.protocols.smtp.DNSService;
+import org.apache.james.protocols.smtp.SMTPSession;
+import org.apache.james.protocols.smtp.core.fastfail.ResolvableEhloHeloHandler;
+import org.apache.james.protocols.smtp.hook.HookReturnCode;
import org.apache.mailet.MailAddress;
public class ResolvableEhloHeloHandlerTest extends TestCase {
Modified: james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandlerTest.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandlerTest.java?rev=905270&r1=905226&r2=905270&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandlerTest.java (original)
+++ james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/SpamTrapHandlerTest.java Mon Feb 1 12:22:54 2010
@@ -18,16 +18,16 @@
****************************************************************/
-package org.apache.james.smtpserver.protocol.core.fastfail;
+package org.apache.james.protocols.smtp.core.fastfail;
import java.util.ArrayList;
import javax.mail.internet.ParseException;
-import org.apache.james.smtpserver.protocol.BaseFakeSMTPSession;
-import org.apache.james.smtpserver.protocol.SMTPSession;
-import org.apache.james.smtpserver.protocol.core.fastfail.SpamTrapHandler;
-import org.apache.james.smtpserver.protocol.hook.HookReturnCode;
+import org.apache.james.protocols.smtp.BaseFakeSMTPSession;
+import org.apache.james.protocols.smtp.SMTPSession;
+import org.apache.james.protocols.smtp.core.fastfail.SpamTrapHandler;
+import org.apache.james.protocols.smtp.hook.HookReturnCode;
import org.apache.mailet.MailAddress;
import junit.framework.TestCase;
Modified: james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/TarpitHandlerTest.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/TarpitHandlerTest.java?rev=905270&r1=905226&r2=905270&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/TarpitHandlerTest.java (original)
+++ james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/TarpitHandlerTest.java Mon Feb 1 12:22:54 2010
@@ -16,14 +16,15 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.smtpserver.protocol.core.fastfail;
+package org.apache.james.protocols.smtp.core.fastfail;
import javax.mail.internet.ParseException;
import junit.framework.TestCase;
-import org.apache.james.smtpserver.protocol.BaseFakeSMTPSession;
-import org.apache.james.smtpserver.protocol.SMTPSession;
+import org.apache.james.protocols.smtp.BaseFakeSMTPSession;
+import org.apache.james.protocols.smtp.SMTPSession;
+import org.apache.james.protocols.smtp.core.fastfail.TarpitHandler;
import org.apache.mailet.MailAddress;
public class TarpitHandlerTest extends TestCase {
Modified: james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java?rev=905270&r1=905226&r2=905270&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java (original)
+++ james/protocols/trunk/smtp/src/test/java/org/apache/james/protocols/smtp/core/fastfail/ValidSenderDomainHandlerTest.java Mon Feb 1 12:22:54 2010
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.smtpserver.protocol.core.fastfail;
+package org.apache.james.protocols.smtp.core.fastfail;
import java.util.ArrayList;
import java.util.Collection;
@@ -28,12 +28,12 @@
import junit.framework.TestCase;
-import org.apache.james.smtpserver.protocol.BaseFakeDNSService;
-import org.apache.james.smtpserver.protocol.BaseFakeSMTPSession;
-import org.apache.james.smtpserver.protocol.DNSService;
-import org.apache.james.smtpserver.protocol.SMTPSession;
-import org.apache.james.smtpserver.protocol.core.fastfail.ValidSenderDomainHandler;
-import org.apache.james.smtpserver.protocol.hook.HookReturnCode;
+import org.apache.james.protocols.smtp.BaseFakeDNSService;
+import org.apache.james.protocols.smtp.BaseFakeSMTPSession;
+import org.apache.james.protocols.smtp.DNSService;
+import org.apache.james.protocols.smtp.SMTPSession;
+import org.apache.james.protocols.smtp.core.fastfail.ValidSenderDomainHandler;
+import org.apache.james.protocols.smtp.hook.HookReturnCode;
import org.apache.mailet.MailAddress;
public class ValidSenderDomainHandlerTest extends TestCase {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org