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 2011/12/23 19:33:54 UTC
svn commit: r1222782 - in /james/protocols/trunk:
lmtp/src/main/java/org/apache/james/protocols/lmtp/
pop3/src/main/java/org/apache/james/protocols/pop3/core/
smtp/src/main/java/org/apache/james/protocols/smtp/
smtp/src/main/java/org/apache/james/proto...
Author: norman
Date: Fri Dec 23 18:33:54 2011
New Revision: 1222782
URL: http://svn.apache.org/viewvc?rev=1222782&view=rev
Log:
Only use CommandDispatcher and so remove sub-classes. See PROTOCOLS-70
Removed:
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/POP3CommandDispatcherLineHandler.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/SMTPCommandDispatcherLineHandler.java
Modified:
james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPProtocolHandlerChain.java
james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/CoreCmdHandlerLoader.java
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocolHandlerChain.java
Modified: james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPProtocolHandlerChain.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPProtocolHandlerChain.java?rev=1222782&r1=1222781&r2=1222782&view=diff
==============================================================================
--- james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPProtocolHandlerChain.java (original)
+++ james/protocols/trunk/lmtp/src/main/java/org/apache/james/protocols/lmtp/LMTPProtocolHandlerChain.java Fri Dec 23 18:33:54 2011
@@ -21,6 +21,7 @@ package org.apache.james.protocols.lmtp;
import java.util.ArrayList;
import java.util.List;
+import org.apache.james.protocols.api.handler.CommandDispatcher;
import org.apache.james.protocols.api.handler.ProtocolHandler;
import org.apache.james.protocols.api.handler.WiringException;
import org.apache.james.protocols.lmtp.core.DataLineMessageHookHandler;
@@ -28,6 +29,7 @@ import org.apache.james.protocols.lmtp.c
import org.apache.james.protocols.lmtp.core.LhloCmdHandler;
import org.apache.james.protocols.lmtp.core.WelcomeMessageHandler;
import org.apache.james.protocols.smtp.SMTPProtocolHandlerChain;
+import org.apache.james.protocols.smtp.SMTPSession;
import org.apache.james.protocols.smtp.core.DataCmdHandler;
import org.apache.james.protocols.smtp.core.ExpnCmdHandler;
import org.apache.james.protocols.smtp.core.HelpCmdHandler;
@@ -36,7 +38,6 @@ import org.apache.james.protocols.smtp.c
import org.apache.james.protocols.smtp.core.QuitCmdHandler;
import org.apache.james.protocols.smtp.core.RcptCmdHandler;
import org.apache.james.protocols.smtp.core.RsetCmdHandler;
-import org.apache.james.protocols.smtp.core.SMTPCommandDispatcherLineHandler;
import org.apache.james.protocols.smtp.core.UnknownCmdHandler;
import org.apache.james.protocols.smtp.core.VrfyCmdHandler;
import org.apache.james.protocols.smtp.core.esmtp.MailSizeEsmtpExtension;
@@ -65,7 +66,7 @@ public class LMTPProtocolHandlerChain ex
@Override
protected List<ProtocolHandler> initDefaultHandlers() {
List<ProtocolHandler> defaultHandlers = new ArrayList<ProtocolHandler>();
- defaultHandlers.add(new SMTPCommandDispatcherLineHandler());
+ defaultHandlers.add(new CommandDispatcher<SMTPSession>());
defaultHandlers.add(new ExpnCmdHandler());
defaultHandlers.add(new LhloCmdHandler());
defaultHandlers.add(new HelpCmdHandler());
Modified: james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/CoreCmdHandlerLoader.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/CoreCmdHandlerLoader.java?rev=1222782&r1=1222781&r2=1222782&view=diff
==============================================================================
--- james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/CoreCmdHandlerLoader.java (original)
+++ james/protocols/trunk/pop3/src/main/java/org/apache/james/protocols/pop3/core/CoreCmdHandlerLoader.java Fri Dec 23 18:33:54 2011
@@ -22,6 +22,7 @@ package org.apache.james.protocols.pop3.
import java.util.LinkedList;
import java.util.List;
+import org.apache.james.protocols.api.handler.CommandDispatcher;
import org.apache.james.protocols.api.handler.HandlersPackage;
public class CoreCmdHandlerLoader implements HandlersPackage {
@@ -42,7 +43,7 @@ public class CoreCmdHandlerLoader implem
private final static String UNKOWNCMDHANDLER = UnknownCmdHandler.class.getName();
private final static String STLSCMDHANDLER = StlsCmdHandler.class.getName();
- private final static String COMMANDDISPATCHER = POP3CommandDispatcherLineHandler.class.getName();
+ private final static String COMMANDDISPATCHER = CommandDispatcher.class.getName();
private final List<String> commands = new LinkedList<String>();
Modified: james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocolHandlerChain.java
URL: http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocolHandlerChain.java?rev=1222782&r1=1222781&r2=1222782&view=diff
==============================================================================
--- james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocolHandlerChain.java (original)
+++ james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/SMTPProtocolHandlerChain.java Fri Dec 23 18:33:54 2011
@@ -22,6 +22,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import org.apache.james.protocols.api.handler.CommandDispatcher;
import org.apache.james.protocols.api.handler.ExtensibleHandler;
import org.apache.james.protocols.api.handler.ProtocolHandler;
import org.apache.james.protocols.api.handler.ProtocolHandlerChain;
@@ -39,7 +40,6 @@ import org.apache.james.protocols.smtp.c
import org.apache.james.protocols.smtp.core.RcptCmdHandler;
import org.apache.james.protocols.smtp.core.ReceivedDataLineFilter;
import org.apache.james.protocols.smtp.core.RsetCmdHandler;
-import org.apache.james.protocols.smtp.core.SMTPCommandDispatcherLineHandler;
import org.apache.james.protocols.smtp.core.UnknownCmdHandler;
import org.apache.james.protocols.smtp.core.VrfyCmdHandler;
import org.apache.james.protocols.smtp.core.WelcomeMessageHandler;
@@ -90,7 +90,7 @@ public class SMTPProtocolHandlerChain ex
protected List<ProtocolHandler> initDefaultHandlers() {
List<ProtocolHandler> defaultHandlers = new ArrayList<ProtocolHandler>();
- defaultHandlers.add(new SMTPCommandDispatcherLineHandler());
+ defaultHandlers.add(new CommandDispatcher<SMTPSession>());
defaultHandlers.add(new ExpnCmdHandler());
defaultHandlers.add(new EhloCmdHandler());
defaultHandlers.add(new HeloCmdHandler());
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org