svn commit: r1086961 - in /commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp: SMTPCommand.java SMTPSClient.java

[sebb]

Author: sebb
Date: Wed Mar 30 14:15:04 2011
New Revision: 1086961

URL: http://svn.apache.org/viewvc?rev=1086961&view=rev
Log:
Does not make sense to allow client code to issue STARTTLS directly, so remove 
from list.

Modified:
    
commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp/SMTPCommand.java
    
commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp/SMTPSClient.java

Modified: 
commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp/SMTPCommand.java
URL: 
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp/SMTPCommand.java?rev=1086961&r1=1086960&r2=1086961&view=diff
==============================================================================
--- 
commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp/SMTPCommand.java
 (original)
+++ 
commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp/SMTPCommand.java
 Wed Mar 30 14:15:04 2011
@@ -49,22 +49,16 @@ public final class SMTPCommand
     public static final int QUIT = 13;
 
     /** 
-     * The TLS start command.
-     * @since 3.0 
-     */
-    public static final int STLS = 14 ;
-
-    /** 
      * The authorization command
      * @since 3.0 
      */
-    public static final int AUTH = 15 ;
+    public static final int AUTH = 14 ;
 
     /** 
      * The extended hello command
      * @since 3.0 
      */
-    public static final int EHLO = 16 ;
+    public static final int EHLO = 15 ;
 
     private static final int _NEXT_ = EHLO + 1; // update as necessary when 
adding new entries
 
@@ -92,7 +86,7 @@ public final class SMTPCommand
     private static final String[] _commands = {
                                           "HELO", "MAIL FROM:", "RCPT TO:", 
"DATA", "SEND FROM:", "SOML FROM:",
                                           "SAML FROM:", "RSET", "VRFY", 
"EXPN", "HELP", "NOOP", "TURN", "QUIT",
-                                          "STARTTLS", "AUTH", "EHLO"
+                                          "AUTH", "EHLO"
                                       };
 
 

Modified: 
commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp/SMTPSClient.java
URL: 
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp/SMTPSClient.java?rev=1086961&r1=1086960&r2=1086961&view=diff
==============================================================================
--- 
commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp/SMTPSClient.java
 (original)
+++ 
commons/proper/net/trunk/src/main/java/org/apache/commons/net/smtp/SMTPSClient.java
 Wed Mar 30 14:15:04 2011
@@ -259,7 +259,7 @@ public class SMTPSClient extends SMTPCli
      */
     public boolean execTLS() throws SSLException, IOException
     {
-        if (!SMTPReply.isPositiveCompletion(sendCommand(SMTPCommand.STLS)))
+        if (!SMTPReply.isPositiveCompletion(sendCommand("STARTTLS")))
         {
             return false;
             //throw new SSLException(getReplyString());