Author: sebb
Date: Tue Apr 24 19:38:13 2012
New Revision: 1329962
URL: http://svn.apache.org/viewvc?rev=1329962&view=rev
Log:
Tab police
Modified:
commons/proper/email/trunk/src/changes/changes.xml
commons/proper/email/trunk/src/site/xdoc/release_1_1.xml
commons/proper/email/trunk/src/test/org/apache/commons/mail/HtmlEmailTest.java
commons/proper/email/trunk/src/test/org/apache/commons/mail/mocks/MockImageHtmlEmailConcrete.java
commons/proper/email/trunk/src/test/org/apache/commons/mail/settings/EmailConfiguration.java
Modified: commons/proper/email/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/changes/changes.xml?rev=1329962&r1=1329961&r2=1329962&view=diff
==============================================================================
--- commons/proper/email/trunk/src/changes/changes.xml (original)
+++ commons/proper/email/trunk/src/changes/changes.xml Tue Apr 24 19:38:13 2012
@@ -164,10 +164,10 @@
</release>
<release version="1.1" date="2007-09-27">
<action dev="bspeakmon" type="add" issue="EMAIL-35" due-to="Brandon
Wolfe">
- Support embedding of raw DataSource attachments in HtmlEmail.
+ Support embedding of raw DataSource attachments in HtmlEmail.
</action>
<action dev="bspeakmon" type="update" issue="EMAIL-64" due-to="Ben
Speakmon">
- Use wiser instead of dumbster for test cases. Original patch
supplied by Bindul Bhowmik.
+ Use wiser instead of dumbster for test cases. Original patch supplied
by Bindul Bhowmik.
</action>
<action dev="dion" type="fix" issue="EMAIL-62" due-to="Ben Speakmon">
Build patches to enforce source 1.4 and target 1.4 when compiling.
Modified: commons/proper/email/trunk/src/site/xdoc/release_1_1.xml
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/site/xdoc/release_1_1.xml?rev=1329962&r1=1329961&r2=1329962&view=diff
==============================================================================
--- commons/proper/email/trunk/src/site/xdoc/release_1_1.xml (original)
+++ commons/proper/email/trunk/src/site/xdoc/release_1_1.xml Tue Apr 24
19:38:13 2012
@@ -26,39 +26,39 @@
<section name="Introduction">
<p>
- Commons Email aims to provide a API for sending email. It builds on the
JavaMail
- API with the aim of presenting a simplified API which is easy for
developers who
- are not mail experts to use. It is a compact component with a small
number of
- classes.
+ Commons Email aims to provide a API for sending email. It builds on
the JavaMail
+ API with the aim of presenting a simplified API which is easy for
developers who
+ are not mail experts to use. It is a compact component with a small
number of
+ classes.
</p>
<p>
- The Commons Email website is the source for the most recent information,
- downloads, reports, and bug status:
+ The Commons Email website is the source for the most recent
information,
+ downloads, reports, and bug status:
</p>
<p>
- <a
href="http://commons.apache.org/email/";>http://commons.apache.org/email/</a>
+ <a
href="http://commons.apache.org/email/";>http://commons.apache.org/email/</a>
</p>
<p>
- This is a maintenance release which fixes several bugs present in the
1.0
- release and adds a number of small enhancements requested by
- users. All current users are encouraged to upgrade.
+ This is a maintenance release which fixes several bugs present in the
1.0
+ release and adds a number of small enhancements requested by
+ users. All current users are encouraged to upgrade.
</p>
</section>
<section name="Changes from 1.0">
<subsection name="Compatibility">
- <ul>
- <li>
- Java 1.4 or later is now required. Earlier versions are no longer
- supported by Sun.
- </li>
- <li>
- JavaMail 1.4 or later and JavaBeans Activation Framework 1.1 or
later are now
- required.
- </li>
- <li>
- The protected field
<code>org.apache.commons.mail.HtmlEmail.inlineImages</code>
+ <ul>
+ <li>
+ Java 1.4 or later is now required. Earlier versions are no longer
+ supported by Sun.
+ </li>
+ <li>
+ JavaMail 1.4 or later and JavaBeans Activation Framework 1.1 or
later are now
+ required.
+ </li>
+ <li>
+ The protected field
<code>org.apache.commons.mail.HtmlEmail.inlineImages</code>
is now deprecated. Its function is now performed by the
<code>org.apache.commons.mail.HtmlEmail.inlineEmbeds</code> field;
the new field
is a <code>Map</code> instead of a <code>List</code>. The change
was made
@@ -66,49 +66,49 @@
Clients that have subclassed <code>HtmlEmail</code> should change
their implementations
accordingly.
</li>
- </ul>
+ </ul>
</subsection>
<subsection name="Notable bugfixes">
- <ul>
- <li>
- <a
href="http://issues.apache.org/jira/browse/EMAIL-50";>EMAIL-50</a>:
- HtmlEmails were not being constructed correctly; several
- email clients were not displaying attachments or embedded images
- properly. As part of the same problem, duplicate embeds were not
- being handled correctly.
- </li>
- <li>
- <a href="http://issues.apache.org/jira/browse/EMAIL-1";>EMAIL-1</a>:
- Email.setContent() was not taking a specified charset into
- account. Additional setContent() overloadings were also added to
- address common use cases.
- </li>
- </ul>
+ <ul>
+ <li>
+ <a
href="http://issues.apache.org/jira/browse/EMAIL-50";>EMAIL-50</a>:
+ HtmlEmails were not being constructed correctly; several
+ email clients were not displaying attachments or embedded images
+ properly. As part of the same problem, duplicate embeds were not
+ being handled correctly.
+ </li>
+ <li>
+ <a
href="http://issues.apache.org/jira/browse/EMAIL-1";>EMAIL-1</a>:
+ Email.setContent() was not taking a specified charset into
+ account. Additional setContent() overloadings were also added to
+ address common use cases.
+ </li>
+ </ul>
</subsection>
<subsection name="Notable enhancements">
- <ul>
- <li>
- <a
href="http://issues.apache.org/jira/browse/EMAIL-35";>EMAIL-35</a>:
- HtmlEmail now supports the embedding of any DataSource
- implementation. Specific methods were added for File and URL
- objects, removing the need for clumsy circumlocution.
- </li>
- <li>
- Character set handling and encoding has been overhauled to use the
- JDK 1.4 character set support. All charsets supported by the Java VM
- are now recognized and handled appropriately in Email.setCharset()
- and Email.setContent() calls.
- </li>
- <li>
- HtmlEmail performance has been slightly improved.
- </li>
- <li>
- The MIME structure of MultiPartEmail and HtmlEmail has
- been improved.
- </li>
- </ul>
+ <ul>
+ <li>
+ <a
href="http://issues.apache.org/jira/browse/EMAIL-35";>EMAIL-35</a>:
+ HtmlEmail now supports the embedding of any DataSource
+ implementation. Specific methods were added for File and URL
+ objects, removing the need for clumsy circumlocution.
+ </li>
+ <li>
+ Character set handling and encoding has been overhauled to use the
+ JDK 1.4 character set support. All charsets supported by the Java
VM
+ are now recognized and handled appropriately in Email.setCharset()
+ and Email.setContent() calls.
+ </li>
+ <li>
+ HtmlEmail performance has been slightly improved.
+ </li>
+ <li>
+ The MIME structure of MultiPartEmail and HtmlEmail has
+ been improved.
+ </li>
+ </ul>
</subsection>
</section>
@@ -116,47 +116,47 @@
<section name="Requirements">
<subsection name="J2SE environments">
- <p>
- Commons Email requires JavaMail 1.4 or later. The proprietary Sun
implementation
- is available at:
- </p>
- <p>
- <a
href="http://java.sun.com/products/javamail/";>http://java.sun.com/products/javamail/</a>
- </p>
- <p>
- However, the Apache Geronimo project (http://geronimo.apache.org)
- provides a J2EE-certified implementation of the JavaMail 1.4
- specification licensed under the Apache Software License.
- </p>
- <p>
- Commons Email also requires the JavaBeans Activation Framework. The
- proprietary Sun implementation is available at:
- </p>
- <p>
- <a
href="http://java.sun.com/products/javabeans/glasgow/jaf.html";>http://java.sun.com/products/javabeans/glasgow/jaf.html</a>
- </p>
- <p>
- Apache Geronimo likewise provides an implementation under the Apache
- Software License.
- </p>
- <p>
- Commons Email has been tested with JDK 1.4.2_15 and JDK 1.5.0_12.
- </p>
+ <p>
+ Commons Email requires JavaMail 1.4 or later. The proprietary Sun
implementation
+ is available at:
+ </p>
+ <p>
+ <a
href="http://java.sun.com/products/javamail/";>http://java.sun.com/products/javamail/</a>
+ </p>
+ <p>
+ However, the Apache Geronimo project (http://geronimo.apache.org)
+ provides a J2EE-certified implementation of the JavaMail 1.4
+ specification licensed under the Apache Software License.
+ </p>
+ <p>
+ Commons Email also requires the JavaBeans Activation Framework. The
+ proprietary Sun implementation is available at:
+ </p>
+ <p>
+ <a
href="http://java.sun.com/products/javabeans/glasgow/jaf.html";>http://java.sun.com/products/javabeans/glasgow/jaf.html</a>
+ </p>
+ <p>
+ Apache Geronimo likewise provides an implementation under the Apache
+ Software License.
+ </p>
+ <p>
+ Commons Email has been tested with JDK 1.4.2_15 and JDK 1.5.0_12.
+ </p>
</subsection>
<subsection name="J2EE environments">
- <p>
- Commons Email is compatible with all certified Java Enterprise Edition
- 5 implementations; no further dependencies are required.
- </p>
- <p>
- Java 2 Enterprise Edition 1.4 users must ensure that the versions of
- JavaMail and JAF indicated above are available to their applications;
- the J2EE 1.4 specification only requires earlier versions.
- </p>
- <p>
- Earlier versions of J2EE are not supported.
- </p>
+ <p>
+ Commons Email is compatible with all certified Java Enterprise
Edition
+ 5 implementations; no further dependencies are required.
+ </p>
+ <p>
+ Java 2 Enterprise Edition 1.4 users must ensure that the versions of
+ JavaMail and JAF indicated above are available to their applications;
+ the J2EE 1.4 specification only requires earlier versions.
+ </p>
+ <p>
+ Earlier versions of J2EE are not supported.
+ </p>
</subsection>
</section>
Modified:
commons/proper/email/trunk/src/test/org/apache/commons/mail/HtmlEmailTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/org/apache/commons/mail/HtmlEmailTest.java?rev=1329962&r1=1329961&r2=1329962&view=diff
==============================================================================
---
commons/proper/email/trunk/src/test/org/apache/commons/mail/HtmlEmailTest.java
(original)
+++
commons/proper/email/trunk/src/test/org/apache/commons/mail/HtmlEmailTest.java
Tue Apr 24 19:38:13 2012
@@ -628,8 +628,8 @@ public class HtmlEmailTest extends BaseE
*
* see https://issues.apache.org/jira/browse/EMAIL-101
*/
- public void _testEmbedFileWithCID() throws Exception
- {
+ public void _testEmbedFileWithCID() throws Exception
+ {
//
====================================================================
// Test Success
//
====================================================================
Modified:
commons/proper/email/trunk/src/test/org/apache/commons/mail/mocks/MockImageHtmlEmailConcrete.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/org/apache/commons/mail/mocks/MockImageHtmlEmailConcrete.java?rev=1329962&r1=1329961&r2=1329962&view=diff
==============================================================================
---
commons/proper/email/trunk/src/test/org/apache/commons/mail/mocks/MockImageHtmlEmailConcrete.java
(original)
+++
commons/proper/email/trunk/src/test/org/apache/commons/mail/mocks/MockImageHtmlEmailConcrete.java
Tue Apr 24 19:38:13 2012
@@ -71,7 +71,7 @@ public class MockImageHtmlEmailConcrete
/**
* @return inlineEmbeds
*/
- public Map getInlineEmbeds()
+ public Map getInlineEmbeds()
{
return inlineEmbeds;
}
Modified:
commons/proper/email/trunk/src/test/org/apache/commons/mail/settings/EmailConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/org/apache/commons/mail/settings/EmailConfiguration.java?rev=1329962&r1=1329961&r2=1329962&view=diff
==============================================================================
---
commons/proper/email/trunk/src/test/org/apache/commons/mail/settings/EmailConfiguration.java
(original)
+++
commons/proper/email/trunk/src/test/org/apache/commons/mail/settings/EmailConfiguration.java
Tue Apr 24 19:38:13 2012
@@ -43,8 +43,8 @@ public final class EmailConfiguration
// port 587 - MAIL_USE_STARTTLS, MAIL_STARTTLS_REQUIRED
public static final boolean MAIL_FORCE_SEND = false;
- public static final boolean MAIL_DEBUG = false;
- public static final String MAIL_CHARSET =
EmailConstants.UTF_8;
+ public static final boolean MAIL_DEBUG = false;
+ public static final String MAIL_CHARSET =
EmailConstants.UTF_8;
public static final String MAIL_SERVER = "localhost";
public static final int MAIL_SERVER_PORT = 25;
public static final String TEST_FROM =
"[email protected]";
