Author: norman
Date: Wed Sep 21 05:06:46 2011
New Revision: 1173499

URL: http://svn.apache.org/viewvc?rev=1173499&view=rev
Log:
EhloCommandHandler should hook in its extensions also

Modified:
    
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java

Modified: 
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java
URL: 
http://svn.apache.org/viewvc/james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java?rev=1173499&r1=1173498&r2=1173499&view=diff
==============================================================================
--- 
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java
 (original)
+++ 
james/protocols/trunk/smtp/src/main/java/org/apache/james/protocols/smtp/core/esmtp/EhloCmdHandler.java
 Wed Sep 21 05:06:46 2011
@@ -23,6 +23,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
+import org.apache.james.protocols.api.handler.WiringException;
 import org.apache.james.protocols.smtp.SMTPResponse;
 import org.apache.james.protocols.smtp.SMTPRetCode;
 import org.apache.james.protocols.smtp.SMTPSession;
@@ -34,7 +35,7 @@ import org.apache.james.protocols.smtp.h
 /**
  * Handles EHLO command
  */
-public class EhloCmdHandler extends AbstractHookableCmdHandler<HeloHook> {
+public class EhloCmdHandler extends AbstractHookableCmdHandler<HeloHook> 
implements EhloExtension{
 
     /**
      * The name of the command handled by the command handler
@@ -63,10 +64,7 @@ public class EhloCmdHandler extends Abst
 
         processExtensions(session, resp);
 
-        resp.appendLine("PIPELINING");
-        resp.appendLine("ENHANCEDSTATUSCODES");
-        // see http://issues.apache.org/jira/browse/JAMES-419
-        resp.appendLine("8BITMIME");
+
  
         return resp;
 
@@ -166,4 +164,19 @@ public class EhloCmdHandler extends Abst
         return rawHook.doHelo(session, parameters);
     }
 
+
+
+    /*
+     * (non-Javadoc)
+     * @see 
org.apache.james.protocols.smtp.core.esmtp.EhloExtension#getImplementedEsmtpFeatures(org.apache.james.protocols.smtp.SMTPSession)
+     */
+    public List<String> getImplementedEsmtpFeatures(SMTPSession session) {
+        List<String> extensions = new ArrayList<String>();
+        extensions.add("PIPELINING");
+        extensions.add("ENHANCEDSTATUSCODES");
+        // see http://issues.apache.org/jira/browse/JAMES-419
+        extensions.add("8BITMIME");
+        return extensions;
+    }
+
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

Reply via email to