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 er...@apache.org on 2012/01/20 11:57:42 UTC
svn commit: r1233859 - in /james/server/trunk: ./
protocols-lmtp/src/main/java/org/apache/james/lmtpserver/
protocols-pop3/src/main/java/org/apache/james/pop3server/core/
protocols-smtp/src/main/java/org/apache/james/smtpserver/
protocols-smtp/src/test...
Author: eric
Date: Fri Jan 20 10:57:41 2012
New Revision: 1233859
URL: http://svn.apache.org/viewvc?rev=1233859&view=rev
Log:
Bump to protocols 1.6.2-SNAPSHOT (JAMES-1368)
Removed:
james/server/trunk/protocols-pop3/src/main/java/org/apache/james/pop3server/core/POP3CommandHandlerResultLogger.java
james/server/trunk/protocols-smtp/src/main/java/org/apache/james/smtpserver/SMTPCommandHandlerResultLogger.java
Modified:
james/server/trunk/pom.xml
james/server/trunk/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/CoreCmdHandlerLoader.java
james/server/trunk/protocols-pop3/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java
james/server/trunk/protocols-smtp/src/main/java/org/apache/james/smtpserver/CoreCmdHandlerLoader.java
james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/POP3BeforeSMTPHandlerTest.java
james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java
james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java
james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java
james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java
james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java
Modified: james/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=1233859&r1=1233858&r2=1233859&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Fri Jan 20 10:57:41 2012
@@ -106,7 +106,7 @@
<jsieve.version>0.4</jsieve.version>
<mailbox.version>0.4-SNAPSHOT</mailbox.version>
<productName>Apache-James Mail Server</productName>
- <protocols.version>1.6.1-SNAPSHOT</protocols.version>
+ <protocols.version>1.6.2-SNAPSHOT</protocols.version>
<spring.version>3.0.5.RELEASE</spring.version>
</properties>
Modified: james/server/trunk/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/CoreCmdHandlerLoader.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/CoreCmdHandlerLoader.java?rev=1233859&r1=1233858&r2=1233859&view=diff
==============================================================================
--- james/server/trunk/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/CoreCmdHandlerLoader.java (original)
+++ james/server/trunk/protocols-lmtp/src/main/java/org/apache/james/lmtpserver/CoreCmdHandlerLoader.java Fri Jan 20 10:57:41 2012
@@ -24,6 +24,7 @@ import java.util.List;
import org.apache.james.lmtpserver.hook.MailboxDeliverToRecipientHandler;
import org.apache.james.protocols.api.handler.CommandDispatcher;
+import org.apache.james.protocols.api.handler.CommandHandlerResultLogger;
import org.apache.james.protocols.lib.handler.HandlersPackage;
import org.apache.james.protocols.lmtp.core.LhloCmdHandler;
import org.apache.james.protocols.lmtp.core.WelcomeMessageHandler;
@@ -40,7 +41,6 @@ import org.apache.james.smtpserver.AuthR
import org.apache.james.smtpserver.JamesDataCmdHandler;
import org.apache.james.smtpserver.JamesMailCmdHandler;
import org.apache.james.smtpserver.JamesRcptCmdHandler;
-import org.apache.james.smtpserver.SMTPCommandHandlerResultLogger;
import org.apache.james.smtpserver.fastfail.ValidRcptHandler;
/**
@@ -69,7 +69,7 @@ public class CoreCmdHandlerLoader implem
private final String DELIVERTORECIPIENTHANDLER = MailboxDeliverToRecipientHandler.class.getName();
// logging stuff
- private final String COMMANDHANDLERRESULTLOGGER = SMTPCommandHandlerResultLogger.class.getName();
+ private final String COMMANDHANDLERRESULTLOGGER = CommandHandlerResultLogger.class.getName();
private final String HOOKRESULTLOGGER = HookResultLogger.class.getName();
private final List<String> commands = new LinkedList<String>();
Modified: james/server/trunk/protocols-pop3/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-pop3/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java?rev=1233859&r1=1233858&r2=1233859&view=diff
==============================================================================
--- james/server/trunk/protocols-pop3/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java (original)
+++ james/server/trunk/protocols-pop3/src/main/java/org/apache/james/pop3server/core/CoreCmdHandlerLoader.java Fri Jan 20 10:57:41 2012
@@ -23,6 +23,7 @@ import java.util.LinkedList;
import java.util.List;
import org.apache.james.protocols.api.handler.CommandDispatcher;
+import org.apache.james.protocols.api.handler.CommandHandlerResultLogger;
import org.apache.james.protocols.lib.handler.HandlersPackage;
import org.apache.james.protocols.pop3.core.CapaCmdHandler;
import org.apache.james.protocols.pop3.core.DeleCmdHandler;
@@ -60,7 +61,7 @@ public class CoreCmdHandlerLoader implem
private final static String COMMANDDISPATCHER = CommandDispatcher.class.getName();
// logging stuff
- private final static String COMMANDHANDLERRESULTLOGGER = POP3CommandHandlerResultLogger.class.getName();
+ private final static String COMMANDHANDLERRESULTLOGGER = CommandHandlerResultLogger.class.getName();
private final List<String> commands = new LinkedList<String>();
Modified: james/server/trunk/protocols-smtp/src/main/java/org/apache/james/smtpserver/CoreCmdHandlerLoader.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-smtp/src/main/java/org/apache/james/smtpserver/CoreCmdHandlerLoader.java?rev=1233859&r1=1233858&r2=1233859&view=diff
==============================================================================
--- james/server/trunk/protocols-smtp/src/main/java/org/apache/james/smtpserver/CoreCmdHandlerLoader.java (original)
+++ james/server/trunk/protocols-smtp/src/main/java/org/apache/james/smtpserver/CoreCmdHandlerLoader.java Fri Jan 20 10:57:41 2012
@@ -23,6 +23,7 @@ import java.util.LinkedList;
import java.util.List;
import org.apache.james.protocols.api.handler.CommandDispatcher;
+import org.apache.james.protocols.api.handler.CommandHandlerResultLogger;
import org.apache.james.protocols.lib.handler.HandlersPackage;
import org.apache.james.protocols.smtp.core.ExpnCmdHandler;
import org.apache.james.protocols.smtp.core.HeloCmdHandler;
@@ -72,7 +73,7 @@ public class CoreCmdHandlerLoader implem
private final String SENDMAILHANDLER = SendMailHandler.class.getName();
// logging stuff
- private final String COMMANDHANDLERRESULTLOGGER = SMTPCommandHandlerResultLogger.class.getName();
+ private final String COMMANDHANDLERRESULTLOGGER = CommandHandlerResultLogger.class.getName();
private final String HOOKRESULTLOGGER = HookResultLogger.class.getName();
private final List<String> commands = new LinkedList<String>();
Modified: james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/POP3BeforeSMTPHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/POP3BeforeSMTPHandlerTest.java?rev=1233859&r1=1233858&r2=1233859&view=diff
==============================================================================
--- james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/POP3BeforeSMTPHandlerTest.java (original)
+++ james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/POP3BeforeSMTPHandlerTest.java Fri Jan 20 10:57:41 2012
@@ -21,12 +21,11 @@ package org.apache.james.smtpserver;
import java.net.InetSocketAddress;
+import junit.framework.TestCase;
+
import org.apache.james.protocols.lib.POP3BeforeSMTPHelper;
-import org.apache.james.protocols.smtp.BaseFakeSMTPSession;
import org.apache.james.protocols.smtp.SMTPSession;
-import org.apache.james.smtpserver.POP3BeforeSMTPHandler;
-
-import junit.framework.TestCase;
+import org.apache.james.protocols.smtp.utils.BaseFakeSMTPSession;
public class POP3BeforeSMTPHandlerTest extends TestCase {
Modified: james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java?rev=1233859&r1=1233858&r2=1233859&view=diff
==============================================================================
--- james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java (original)
+++ james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/SPFHandlerTest.java Fri Jan 20 10:57:41 2012
@@ -28,10 +28,10 @@ import junit.framework.TestCase;
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.protocols.smtp.BaseFakeSMTPSession;
import org.apache.james.protocols.smtp.MailAddress;
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.hook.HookReturnCode;
+import org.apache.james.protocols.smtp.utils.BaseFakeSMTPSession;
import org.apache.james.smtpserver.fastfail.SPFHandler;
public class SPFHandlerTest extends TestCase {
Modified: james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java?rev=1233859&r1=1233858&r2=1233859&view=diff
==============================================================================
--- james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java (original)
+++ james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java Fri Jan 20 10:57:41 2012
@@ -19,16 +19,15 @@
package org.apache.james.smtpserver;
+import javax.mail.MessagingException;
+import javax.mail.internet.MimeMessage;
+
import junit.framework.TestCase;
-import org.apache.james.protocols.smtp.BaseFakeSMTPSession;
import org.apache.james.protocols.smtp.SMTPSession;
-import org.apache.james.smtpserver.SetMimeHeaderHandler;
+import org.apache.james.protocols.smtp.utils.BaseFakeSMTPSession;
import org.apache.mailet.Mail;
-import javax.mail.MessagingException;
-import javax.mail.internet.MimeMessage;
-
public class SetMimeHeaderHandlerTest extends TestCase {
private SMTPSession mockedSMTPSession;
Modified: james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java?rev=1233859&r1=1233858&r2=1233859&view=diff
==============================================================================
--- james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java (original)
+++ james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java Fri Jan 20 10:57:41 2012
@@ -28,10 +28,10 @@ import javax.mail.internet.MimeMessage;
import junit.framework.TestCase;
import org.apache.james.protocols.lib.PortUtil;
-import org.apache.james.protocols.smtp.BaseFakeSMTPSession;
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.utils.BaseFakeSMTPSession;
import org.apache.james.smtpserver.fastfail.SpamAssassinHandler;
import org.apache.james.smtpserver.mock.MockMimeMessage;
import org.apache.james.smtpserver.mock.mailet.MockMail;
Modified: james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java?rev=1233859&r1=1233858&r2=1233859&view=diff
==============================================================================
--- james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java (original)
+++ james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java Fri Jan 20 10:57:41 2012
@@ -38,10 +38,10 @@ import junit.framework.TestCase;
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.dnsservice.api.mock.MockDNSService;
-import org.apache.james.protocols.smtp.BaseFakeSMTPSession;
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.utils.BaseFakeSMTPSession;
import org.apache.james.smtpserver.fastfail.URIRBLHandler;
import org.apache.james.smtpserver.mock.MockMimeMessage;
import org.apache.james.smtpserver.mock.mailet.MockMail;
Modified: james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java?rev=1233859&r1=1233858&r2=1233859&view=diff
==============================================================================
--- james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java (original)
+++ james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptHandlerTest.java Fri Jan 20 10:57:41 2012
@@ -28,11 +28,11 @@ import junit.framework.TestCase;
import org.apache.james.domainlist.api.mock.SimpleDomainList;
import org.apache.james.protocols.api.ProtocolSession.State;
-import org.apache.james.protocols.smtp.BaseFakeSMTPSession;
import org.apache.james.protocols.smtp.MailAddress;
import org.apache.james.protocols.smtp.SMTPConfiguration;
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.hook.HookReturnCode;
+import org.apache.james.protocols.smtp.utils.BaseFakeSMTPSession;
import org.apache.james.rrt.api.RecipientRewriteTable;
import org.apache.james.rrt.api.RecipientRewriteTableException;
import org.apache.james.smtpserver.fastfail.ValidRcptHandler;
Modified: james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java?rev=1233859&r1=1233858&r2=1233859&view=diff
==============================================================================
--- james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java (original)
+++ james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/ValidRcptMXTest.java Fri Jan 20 10:57:41 2012
@@ -31,11 +31,11 @@ import junit.framework.TestCase;
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.dnsservice.api.mock.MockDNSService;
-import org.apache.james.protocols.smtp.BaseFakeSMTPSession;
import org.apache.james.protocols.smtp.MailAddress;
import org.apache.james.protocols.smtp.MailAddressException;
import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.hook.HookReturnCode;
+import org.apache.james.protocols.smtp.utils.BaseFakeSMTPSession;
import org.apache.james.smtpserver.fastfail.ValidRcptMX;
public class ValidRcptMXTest extends TestCase {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org