You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2012/12/04 19:38:34 UTC

svn commit: r1417105 - in /commons/proper/email/trunk/src: main/java/org/apache/commons/mail/ test/java/org/apache/commons/mail/mocks/

Author: sebb
Date: Tue Dec  4 18:38:34 2012
New Revision: 1417105

URL: http://svn.apache.org/viewvc?rev=1417105&view=rev
Log:
+= @Deprecated

Modified:
    commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java
    commons/proper/email/trunk/src/main/java/org/apache/commons/mail/EmailConstants.java
    commons/proper/email/trunk/src/main/java/org/apache/commons/mail/HtmlEmail.java
    commons/proper/email/trunk/src/test/java/org/apache/commons/mail/mocks/MockHtmlEmailConcrete.java

Modified: commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java
URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java?rev=1417105&r1=1417104&r2=1417105&view=diff
==============================================================================
--- commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java (original)
+++ commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java Tue Dec  4 18:38:34 2012
@@ -161,6 +161,7 @@ public abstract class Email implements E
      * Does server require TLS encryption for authentication?
      * @deprecated  since 1.3, use setStartTLSEnabled() instead
      */
+    @Deprecated
     protected boolean tls;
 
     /**
@@ -185,6 +186,7 @@ public abstract class Email implements E
      * Does the current transport use SSL/TLS encryption upon connection?
      * @deprecated since 1.3, use setSSLOnConnect() instead
      */
+    @Deprecated
     protected boolean ssl;
 
     /** does the current transport use SSL/TLS encryption upon connection? */
@@ -365,6 +367,7 @@ public abstract class Email implements E
      * @param withTLS true if STARTTLS requested, false otherwise
      * @since 1.1
      */
+    @Deprecated
     public void setTLS(boolean withTLS)
     {
         setStartTLSEnabled(withTLS);
@@ -1416,6 +1419,7 @@ public abstract class Email implements E
      * @return true if using STARTTLS for authentication, false otherwise
      * @since 1.1
      */
+    @Deprecated
     public boolean isTLS()
     {
         return isStartTLSEnabled();
@@ -1465,6 +1469,7 @@ public abstract class Email implements E
      * @deprecated since 1.3, use isSSLOnConnect() instead
      * @return true if SSL enabled for the transport
      */
+    @Deprecated
     public boolean isSSL()
     {
         return isSSLOnConnect();
@@ -1487,6 +1492,7 @@ public abstract class Email implements E
      * @deprecated since 1.3, use setSSLOnConnect() instead
      * @param ssl whether to enable the SSL transport
      */
+    @Deprecated
     public void setSSL(boolean ssl)
     {
         setSSLOnConnect(ssl);

Modified: commons/proper/email/trunk/src/main/java/org/apache/commons/mail/EmailConstants.java
URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/main/java/org/apache/commons/mail/EmailConstants.java?rev=1417105&r1=1417104&r2=1417105&view=diff
==============================================================================
--- commons/proper/email/trunk/src/main/java/org/apache/commons/mail/EmailConstants.java (original)
+++ commons/proper/email/trunk/src/main/java/org/apache/commons/mail/EmailConstants.java Tue Dec  4 18:38:34 2012
@@ -64,6 +64,7 @@ public interface EmailConstants
     /////////////////////////////////////////////////////////////////////////
 
     /** @deprecated since 1.3 */
+    @Deprecated
     String MAIL_TRANSPORT_TLS = "mail.smtp.starttls.enable";
 
     String MAIL_TRANSPORT_STARTTLS_ENABLE = "mail.smtp.starttls.enable";

Modified: commons/proper/email/trunk/src/main/java/org/apache/commons/mail/HtmlEmail.java
URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/main/java/org/apache/commons/mail/HtmlEmail.java?rev=1417105&r1=1417104&r2=1417105&view=diff
==============================================================================
--- commons/proper/email/trunk/src/main/java/org/apache/commons/mail/HtmlEmail.java (original)
+++ commons/proper/email/trunk/src/main/java/org/apache/commons/mail/HtmlEmail.java Tue Dec  4 18:38:34 2012
@@ -108,6 +108,7 @@ public class HtmlEmail extends MultiPart
      * @deprecated As of commons-email 1.1, no longer used. Inline embedded
      * objects are now stored in {@link #inlineEmbeds}.
      */
+    @Deprecated
     protected List inlineImages;
 
     /**

Modified: commons/proper/email/trunk/src/test/java/org/apache/commons/mail/mocks/MockHtmlEmailConcrete.java
URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/apache/commons/mail/mocks/MockHtmlEmailConcrete.java?rev=1417105&r1=1417104&r2=1417105&view=diff
==============================================================================
--- commons/proper/email/trunk/src/test/java/org/apache/commons/mail/mocks/MockHtmlEmailConcrete.java (original)
+++ commons/proper/email/trunk/src/test/java/org/apache/commons/mail/mocks/MockHtmlEmailConcrete.java Tue Dec  4 18:38:34 2012
@@ -76,6 +76,7 @@ public class MockHtmlEmailConcrete exten
     /**
      * @deprecated as of commons-email 1.1, replaced by {@link #getInlineEmbeds}.
      */
+    @Deprecated
     public List getInlineImages()
     {
         return inlineImages;