Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D3843E148 for ; Tue, 4 Dec 2012 18:38:59 +0000 (UTC) Received: (qmail 12114 invoked by uid 500); 4 Dec 2012 18:38:59 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 12047 invoked by uid 500); 4 Dec 2012 18:38:59 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 12040 invoked by uid 99); 4 Dec 2012 18:38:59 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Dec 2012 18:38:59 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Dec 2012 18:38:56 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 85FDE23889E0; Tue, 4 Dec 2012 18:38:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1417105 - in /commons/proper/email/trunk/src: main/java/org/apache/commons/mail/ test/java/org/apache/commons/mail/mocks/ Date: Tue, 04 Dec 2012 18:38:34 -0000 To: commits@commons.apache.org From: sebb@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121204183835.85FDE23889E0@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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;