commons-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t.@apache.org
Subject svn commit: r952406 [15/42] - in /websites/production/commons/content/proper/commons-email: ./ apidocs/ apidocs/org/apache/commons/mail/ apidocs/org/apache/commons/mail/class-use/ apidocs/org/apache/commons/mail/resolver/ apidocs/org/apache/commons/mai...
Date Sat, 23 May 2015 06:51:00 GMT
Modified: websites/production/commons/content/proper/commons-email/apidocs/src-html/org/apache/commons/mail/EmailAttachment.html
==============================================================================
--- websites/production/commons/content/proper/commons-email/apidocs/src-html/org/apache/commons/mail/EmailAttachment.html (original)
+++ websites/production/commons/content/proper/commons-email/apidocs/src-html/org/apache/commons/mail/EmailAttachment.html Sat May 23 06:50:57 2015
@@ -232,4 +232,4 @@
 </pre>
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>

Modified: websites/production/commons/content/proper/commons-email/apidocs/src-html/org/apache/commons/mail/EmailConstants.html
==============================================================================
--- websites/production/commons/content/proper/commons-email/apidocs/src-html/org/apache/commons/mail/EmailConstants.html (original)
+++ websites/production/commons/content/proper/commons-email/apidocs/src-html/org/apache/commons/mail/EmailConstants.html Sat May 23 06:50:57 2015
@@ -32,7 +32,7 @@
 <span class="sourceLineNo">024</span> * http://java.sun.com/products/javamail/javadocs/com/sun/mail/smtp/package-summary.html&lt;/a&gt;.<a name="line.24"></a>
 <span class="sourceLineNo">025</span> *<a name="line.25"></a>
 <span class="sourceLineNo">026</span> * @since 1.3<a name="line.26"></a>
-<span class="sourceLineNo">027</span> * @version $Id: EmailConstants.java 1606700 2014-06-30 11:57:32Z ggregory $<a name="line.27"></a>
+<span class="sourceLineNo">027</span> * @version $Id: EmailConstants.java 1665699 2015-03-10 21:12:09Z tn $<a name="line.27"></a>
 <span class="sourceLineNo">028</span> */<a name="line.28"></a>
 <span class="sourceLineNo">029</span>public final class EmailConstants<a name="line.29"></a>
 <span class="sourceLineNo">030</span>{<a name="line.30"></a>
@@ -239,13 +239,24 @@
 <span class="sourceLineNo">231</span>     */<a name="line.231"></a>
 <span class="sourceLineNo">232</span>    public static final String MAIL_MIME_CHARSET = "mail.mime.charset";<a name="line.232"></a>
 <span class="sourceLineNo">233</span><a name="line.233"></a>
-<span class="sourceLineNo">234</span>    /** Hide constructor. */<a name="line.234"></a>
-<span class="sourceLineNo">235</span>    private EmailConstants()<a name="line.235"></a>
-<span class="sourceLineNo">236</span>    {<a name="line.236"></a>
-<span class="sourceLineNo">237</span>        // do nothing<a name="line.237"></a>
-<span class="sourceLineNo">238</span>    }<a name="line.238"></a>
-<span class="sourceLineNo">239</span><a name="line.239"></a>
-<span class="sourceLineNo">240</span>}<a name="line.240"></a>
+<span class="sourceLineNo">234</span>    /////////////////////////////////////////////////////////////////////////<a name="line.234"></a>
+<span class="sourceLineNo">235</span>    // since 1.4<a name="line.235"></a>
+<span class="sourceLineNo">236</span>    /////////////////////////////////////////////////////////////////////////<a name="line.236"></a>
+<span class="sourceLineNo">237</span><a name="line.237"></a>
+<span class="sourceLineNo">238</span>    /**<a name="line.238"></a>
+<span class="sourceLineNo">239</span>     * The from email address.<a name="line.239"></a>
+<span class="sourceLineNo">240</span>     * @since 1.4<a name="line.240"></a>
+<span class="sourceLineNo">241</span>     */<a name="line.241"></a>
+<span class="sourceLineNo">242</span>    public static final String MAIL_FROM = "mail.from";<a name="line.242"></a>
+<span class="sourceLineNo">243</span><a name="line.243"></a>
+<span class="sourceLineNo">244</span><a name="line.244"></a>
+<span class="sourceLineNo">245</span>    /** Hide constructor. */<a name="line.245"></a>
+<span class="sourceLineNo">246</span>    private EmailConstants()<a name="line.246"></a>
+<span class="sourceLineNo">247</span>    {<a name="line.247"></a>
+<span class="sourceLineNo">248</span>        // do nothing<a name="line.248"></a>
+<span class="sourceLineNo">249</span>    }<a name="line.249"></a>
+<span class="sourceLineNo">250</span><a name="line.250"></a>
+<span class="sourceLineNo">251</span>}<a name="line.251"></a>
 
 
 
@@ -309,4 +320,4 @@
 </pre>
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>

Modified: websites/production/commons/content/proper/commons-email/apidocs/src-html/org/apache/commons/mail/EmailException.html
==============================================================================
--- websites/production/commons/content/proper/commons-email/apidocs/src-html/org/apache/commons/mail/EmailException.html (original)
+++ websites/production/commons/content/proper/commons-email/apidocs/src-html/org/apache/commons/mail/EmailException.html Sat May 23 06:50:57 2015
@@ -194,4 +194,4 @@
 </pre>
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>

Modified: websites/production/commons/content/proper/commons-email/apidocs/src-html/org/apache/commons/mail/HtmlEmail.html
==============================================================================
--- websites/production/commons/content/proper/commons-email/apidocs/src-html/org/apache/commons/mail/HtmlEmail.html (original)
+++ websites/production/commons/content/proper/commons-email/apidocs/src-html/org/apache/commons/mail/HtmlEmail.html Sat May 23 06:50:57 2015
@@ -88,7 +88,7 @@
 <span class="sourceLineNo">080</span> * method defined on the &lt;code&gt;DataSource&lt;/code&gt;s to make the determination.<a name="line.80"></a>
 <span class="sourceLineNo">081</span> *<a name="line.81"></a>
 <span class="sourceLineNo">082</span> * @since 1.0<a name="line.82"></a>
-<span class="sourceLineNo">083</span> * @version $Id: HtmlEmail.java 1606709 2014-06-30 12:26:06Z ggregory $<a name="line.83"></a>
+<span class="sourceLineNo">083</span> * @version $Id: HtmlEmail.java 1647983 2014-12-26 14:25:27Z tn $<a name="line.83"></a>
 <span class="sourceLineNo">084</span> */<a name="line.84"></a>
 <span class="sourceLineNo">085</span>public class HtmlEmail extends MultiPartEmail<a name="line.85"></a>
 <span class="sourceLineNo">086</span>{<a name="line.86"></a>
@@ -282,421 +282,446 @@
 <span class="sourceLineNo">274</span>            {<a name="line.274"></a>
 <span class="sourceLineNo">275</span>                return ii.getCid();<a name="line.275"></a>
 <span class="sourceLineNo">276</span>            }<a name="line.276"></a>
-<span class="sourceLineNo">277</span>            else<a name="line.277"></a>
-<span class="sourceLineNo">278</span>            {<a name="line.278"></a>
-<span class="sourceLineNo">279</span>                throw new EmailException("embedded name '" + name<a name="line.279"></a>
-<span class="sourceLineNo">280</span>                    + "' is already bound to URL " + urlDataSource.getURL()<a name="line.280"></a>
-<span class="sourceLineNo">281</span>                    + "; existing names cannot be rebound");<a name="line.281"></a>
-<span class="sourceLineNo">282</span>            }<a name="line.282"></a>
-<span class="sourceLineNo">283</span>        }<a name="line.283"></a>
-<span class="sourceLineNo">284</span><a name="line.284"></a>
-<span class="sourceLineNo">285</span>        // verify that the URL is valid<a name="line.285"></a>
-<span class="sourceLineNo">286</span>        InputStream is = null;<a name="line.286"></a>
-<span class="sourceLineNo">287</span>        try<a name="line.287"></a>
-<span class="sourceLineNo">288</span>        {<a name="line.288"></a>
-<span class="sourceLineNo">289</span>            is = url.openStream();<a name="line.289"></a>
-<span class="sourceLineNo">290</span>        }<a name="line.290"></a>
-<span class="sourceLineNo">291</span>        catch (final IOException e)<a name="line.291"></a>
-<span class="sourceLineNo">292</span>        {<a name="line.292"></a>
-<span class="sourceLineNo">293</span>            throw new EmailException("Invalid URL", e);<a name="line.293"></a>
-<span class="sourceLineNo">294</span>        }<a name="line.294"></a>
-<span class="sourceLineNo">295</span>        finally<a name="line.295"></a>
-<span class="sourceLineNo">296</span>        {<a name="line.296"></a>
-<span class="sourceLineNo">297</span>            try<a name="line.297"></a>
-<span class="sourceLineNo">298</span>            {<a name="line.298"></a>
-<span class="sourceLineNo">299</span>                if (is != null)<a name="line.299"></a>
-<span class="sourceLineNo">300</span>                {<a name="line.300"></a>
-<span class="sourceLineNo">301</span>                    is.close();<a name="line.301"></a>
-<span class="sourceLineNo">302</span>                }<a name="line.302"></a>
-<span class="sourceLineNo">303</span>            }<a name="line.303"></a>
-<span class="sourceLineNo">304</span>            catch (final IOException ioe) // NOPMD<a name="line.304"></a>
-<span class="sourceLineNo">305</span>            { /* sigh */ }<a name="line.305"></a>
-<span class="sourceLineNo">306</span>        }<a name="line.306"></a>
+<span class="sourceLineNo">277</span>            throw new EmailException("embedded name '" + name<a name="line.277"></a>
+<span class="sourceLineNo">278</span>                + "' is already bound to URL " + urlDataSource.getURL()<a name="line.278"></a>
+<span class="sourceLineNo">279</span>                + "; existing names cannot be rebound");<a name="line.279"></a>
+<span class="sourceLineNo">280</span>        }<a name="line.280"></a>
+<span class="sourceLineNo">281</span><a name="line.281"></a>
+<span class="sourceLineNo">282</span>        // verify that the URL is valid<a name="line.282"></a>
+<span class="sourceLineNo">283</span>        InputStream is = null;<a name="line.283"></a>
+<span class="sourceLineNo">284</span>        try<a name="line.284"></a>
+<span class="sourceLineNo">285</span>        {<a name="line.285"></a>
+<span class="sourceLineNo">286</span>            is = url.openStream();<a name="line.286"></a>
+<span class="sourceLineNo">287</span>        }<a name="line.287"></a>
+<span class="sourceLineNo">288</span>        catch (final IOException e)<a name="line.288"></a>
+<span class="sourceLineNo">289</span>        {<a name="line.289"></a>
+<span class="sourceLineNo">290</span>            throw new EmailException("Invalid URL", e);<a name="line.290"></a>
+<span class="sourceLineNo">291</span>        }<a name="line.291"></a>
+<span class="sourceLineNo">292</span>        finally<a name="line.292"></a>
+<span class="sourceLineNo">293</span>        {<a name="line.293"></a>
+<span class="sourceLineNo">294</span>            try<a name="line.294"></a>
+<span class="sourceLineNo">295</span>            {<a name="line.295"></a>
+<span class="sourceLineNo">296</span>                if (is != null)<a name="line.296"></a>
+<span class="sourceLineNo">297</span>                {<a name="line.297"></a>
+<span class="sourceLineNo">298</span>                    is.close();<a name="line.298"></a>
+<span class="sourceLineNo">299</span>                }<a name="line.299"></a>
+<span class="sourceLineNo">300</span>            }<a name="line.300"></a>
+<span class="sourceLineNo">301</span>            catch (final IOException ioe) // NOPMD<a name="line.301"></a>
+<span class="sourceLineNo">302</span>            { /* sigh */ }<a name="line.302"></a>
+<span class="sourceLineNo">303</span>        }<a name="line.303"></a>
+<span class="sourceLineNo">304</span><a name="line.304"></a>
+<span class="sourceLineNo">305</span>        return embed(new URLDataSource(url), name);<a name="line.305"></a>
+<span class="sourceLineNo">306</span>    }<a name="line.306"></a>
 <span class="sourceLineNo">307</span><a name="line.307"></a>
-<span class="sourceLineNo">308</span>        return embed(new URLDataSource(url), name);<a name="line.308"></a>
-<span class="sourceLineNo">309</span>    }<a name="line.309"></a>
-<span class="sourceLineNo">310</span><a name="line.310"></a>
-<span class="sourceLineNo">311</span>    /**<a name="line.311"></a>
-<span class="sourceLineNo">312</span>     * Embeds a file in the HTML. This implementation delegates to<a name="line.312"></a>
-<span class="sourceLineNo">313</span>     * {@link #embed(File, String)}.<a name="line.313"></a>
-<span class="sourceLineNo">314</span>     *<a name="line.314"></a>
-<span class="sourceLineNo">315</span>     * @param file The &lt;code&gt;File&lt;/code&gt; object to embed<a name="line.315"></a>
-<span class="sourceLineNo">316</span>     * @return A String with the Content-ID of the file.<a name="line.316"></a>
-<span class="sourceLineNo">317</span>     * @throws EmailException when the supplied &lt;code&gt;File&lt;/code&gt; cannot be<a name="line.317"></a>
-<span class="sourceLineNo">318</span>     * used; also see {@link javax.mail.internet.MimeBodyPart} for definitions<a name="line.318"></a>
-<span class="sourceLineNo">319</span>     *<a name="line.319"></a>
-<span class="sourceLineNo">320</span>     * @see #embed(File, String)<a name="line.320"></a>
-<span class="sourceLineNo">321</span>     * @since 1.1<a name="line.321"></a>
-<span class="sourceLineNo">322</span>     */<a name="line.322"></a>
-<span class="sourceLineNo">323</span>    public String embed(final File file) throws EmailException<a name="line.323"></a>
-<span class="sourceLineNo">324</span>    {<a name="line.324"></a>
-<span class="sourceLineNo">325</span>        final String cid = EmailUtils.randomAlphabetic(HtmlEmail.CID_LENGTH).toLowerCase(Locale.ENGLISH);<a name="line.325"></a>
-<span class="sourceLineNo">326</span>        return embed(file, cid);<a name="line.326"></a>
-<span class="sourceLineNo">327</span>    }<a name="line.327"></a>
-<span class="sourceLineNo">328</span><a name="line.328"></a>
-<span class="sourceLineNo">329</span>    /**<a name="line.329"></a>
-<span class="sourceLineNo">330</span>     * Embeds a file in the HTML.<a name="line.330"></a>
-<span class="sourceLineNo">331</span>     *<a name="line.331"></a>
-<span class="sourceLineNo">332</span>     * &lt;p&gt;This method embeds a file located by an URL into<a name="line.332"></a>
-<span class="sourceLineNo">333</span>     * the mail body. It allows, for instance, to add inline images<a name="line.333"></a>
-<span class="sourceLineNo">334</span>     * to the email.  Inline files may be referenced with a<a name="line.334"></a>
-<span class="sourceLineNo">335</span>     * &lt;code&gt;cid:xxxxxx&lt;/code&gt; URL, where xxxxxx is the Content-ID<a name="line.335"></a>
-<span class="sourceLineNo">336</span>     * returned by the embed function. Files are bound to their names, which is<a name="line.336"></a>
-<span class="sourceLineNo">337</span>     * the value returned by {@link java.io.File#getName()}. If the same file<a name="line.337"></a>
-<span class="sourceLineNo">338</span>     * is embedded multiple times, the same CID is guaranteed to be returned.<a name="line.338"></a>
-<span class="sourceLineNo">339</span>     *<a name="line.339"></a>
-<span class="sourceLineNo">340</span>     * &lt;p&gt;While functionally the same as passing &lt;code&gt;FileDataSource&lt;/code&gt; to<a name="line.340"></a>
-<span class="sourceLineNo">341</span>     * {@link #embed(DataSource, String, String)}, this method attempts<a name="line.341"></a>
-<span class="sourceLineNo">342</span>     * to validate the file before embedding it in the message and will throw<a name="line.342"></a>
-<span class="sourceLineNo">343</span>     * &lt;code&gt;EmailException&lt;/code&gt; if the validation fails. In this case, the<a name="line.343"></a>
-<span class="sourceLineNo">344</span>     * &lt;code&gt;HtmlEmail&lt;/code&gt; object will not be changed.<a name="line.344"></a>
-<span class="sourceLineNo">345</span>     *<a name="line.345"></a>
-<span class="sourceLineNo">346</span>     * @param file The &lt;code&gt;File&lt;/code&gt; to embed<a name="line.346"></a>
-<span class="sourceLineNo">347</span>     * @param cid the Content-ID to use for the embedded &lt;code&gt;File&lt;/code&gt;<a name="line.347"></a>
-<span class="sourceLineNo">348</span>     * @return A String with the Content-ID of the file.<a name="line.348"></a>
-<span class="sourceLineNo">349</span>     * @throws EmailException when the supplied &lt;code&gt;File&lt;/code&gt; cannot be used<a name="line.349"></a>
-<span class="sourceLineNo">350</span>     *  or if the file has already been embedded;<a name="line.350"></a>
-<span class="sourceLineNo">351</span>     *  also see {@link javax.mail.internet.MimeBodyPart} for definitions<a name="line.351"></a>
-<span class="sourceLineNo">352</span>     * @since 1.1<a name="line.352"></a>
-<span class="sourceLineNo">353</span>     */<a name="line.353"></a>
-<span class="sourceLineNo">354</span>    public String embed(final File file, final String cid) throws EmailException<a name="line.354"></a>
-<span class="sourceLineNo">355</span>    {<a name="line.355"></a>
-<span class="sourceLineNo">356</span>        if (EmailUtils.isEmpty(file.getName()))<a name="line.356"></a>
-<span class="sourceLineNo">357</span>        {<a name="line.357"></a>
-<span class="sourceLineNo">358</span>            throw new EmailException("file name cannot be null or empty");<a name="line.358"></a>
-<span class="sourceLineNo">359</span>        }<a name="line.359"></a>
-<span class="sourceLineNo">360</span><a name="line.360"></a>
-<span class="sourceLineNo">361</span>        // verify that the File can provide a canonical path<a name="line.361"></a>
-<span class="sourceLineNo">362</span>        String filePath = null;<a name="line.362"></a>
-<span class="sourceLineNo">363</span>        try<a name="line.363"></a>
-<span class="sourceLineNo">364</span>        {<a name="line.364"></a>
-<span class="sourceLineNo">365</span>            filePath = file.getCanonicalPath();<a name="line.365"></a>
-<span class="sourceLineNo">366</span>        }<a name="line.366"></a>
-<span class="sourceLineNo">367</span>        catch (final IOException ioe)<a name="line.367"></a>
-<span class="sourceLineNo">368</span>        {<a name="line.368"></a>
-<span class="sourceLineNo">369</span>            throw new EmailException("couldn't get canonical path for "<a name="line.369"></a>
-<span class="sourceLineNo">370</span>                    + file.getName(), ioe);<a name="line.370"></a>
-<span class="sourceLineNo">371</span>        }<a name="line.371"></a>
-<span class="sourceLineNo">372</span><a name="line.372"></a>
-<span class="sourceLineNo">373</span>        // check if a FileDataSource for this name has already been attached;<a name="line.373"></a>
-<span class="sourceLineNo">374</span>        // if so, return the cached CID value.<a name="line.374"></a>
-<span class="sourceLineNo">375</span>        if (inlineEmbeds.containsKey(file.getName()))<a name="line.375"></a>
-<span class="sourceLineNo">376</span>        {<a name="line.376"></a>
-<span class="sourceLineNo">377</span>            final InlineImage ii = inlineEmbeds.get(file.getName());<a name="line.377"></a>
-<span class="sourceLineNo">378</span>            final FileDataSource fileDataSource = (FileDataSource) ii.getDataSource();<a name="line.378"></a>
-<span class="sourceLineNo">379</span>            // make sure the supplied file has the same canonical path<a name="line.379"></a>
-<span class="sourceLineNo">380</span>            // as the one already associated with this name.<a name="line.380"></a>
-<span class="sourceLineNo">381</span>            String existingFilePath = null;<a name="line.381"></a>
-<span class="sourceLineNo">382</span>            try<a name="line.382"></a>
-<span class="sourceLineNo">383</span>            {<a name="line.383"></a>
-<span class="sourceLineNo">384</span>                existingFilePath = fileDataSource.getFile().getCanonicalPath();<a name="line.384"></a>
-<span class="sourceLineNo">385</span>            }<a name="line.385"></a>
-<span class="sourceLineNo">386</span>            catch (final IOException ioe)<a name="line.386"></a>
-<span class="sourceLineNo">387</span>            {<a name="line.387"></a>
-<span class="sourceLineNo">388</span>                throw new EmailException("couldn't get canonical path for file "<a name="line.388"></a>
-<span class="sourceLineNo">389</span>                        + fileDataSource.getFile().getName()<a name="line.389"></a>
-<span class="sourceLineNo">390</span>                        + "which has already been embedded", ioe);<a name="line.390"></a>
-<span class="sourceLineNo">391</span>            }<a name="line.391"></a>
-<span class="sourceLineNo">392</span>            if (filePath.equals(existingFilePath))<a name="line.392"></a>
-<span class="sourceLineNo">393</span>            {<a name="line.393"></a>
-<span class="sourceLineNo">394</span>                return ii.getCid();<a name="line.394"></a>
-<span class="sourceLineNo">395</span>            }<a name="line.395"></a>
-<span class="sourceLineNo">396</span>            else<a name="line.396"></a>
-<span class="sourceLineNo">397</span>            {<a name="line.397"></a>
-<span class="sourceLineNo">398</span>                throw new EmailException("embedded name '" + file.getName()<a name="line.398"></a>
-<span class="sourceLineNo">399</span>                    + "' is already bound to file " + existingFilePath<a name="line.399"></a>
-<span class="sourceLineNo">400</span>                    + "; existing names cannot be rebound");<a name="line.400"></a>
-<span class="sourceLineNo">401</span>            }<a name="line.401"></a>
+<span class="sourceLineNo">308</span>    /**<a name="line.308"></a>
+<span class="sourceLineNo">309</span>     * Embeds a file in the HTML. This implementation delegates to<a name="line.309"></a>
+<span class="sourceLineNo">310</span>     * {@link #embed(File, String)}.<a name="line.310"></a>
+<span class="sourceLineNo">311</span>     *<a name="line.311"></a>
+<span class="sourceLineNo">312</span>     * @param file The &lt;code&gt;File&lt;/code&gt; object to embed<a name="line.312"></a>
+<span class="sourceLineNo">313</span>     * @return A String with the Content-ID of the file.<a name="line.313"></a>
+<span class="sourceLineNo">314</span>     * @throws EmailException when the supplied &lt;code&gt;File&lt;/code&gt; cannot be<a name="line.314"></a>
+<span class="sourceLineNo">315</span>     * used; also see {@link javax.mail.internet.MimeBodyPart} for definitions<a name="line.315"></a>
+<span class="sourceLineNo">316</span>     *<a name="line.316"></a>
+<span class="sourceLineNo">317</span>     * @see #embed(File, String)<a name="line.317"></a>
+<span class="sourceLineNo">318</span>     * @since 1.1<a name="line.318"></a>
+<span class="sourceLineNo">319</span>     */<a name="line.319"></a>
+<span class="sourceLineNo">320</span>    public String embed(final File file) throws EmailException<a name="line.320"></a>
+<span class="sourceLineNo">321</span>    {<a name="line.321"></a>
+<span class="sourceLineNo">322</span>        final String cid = EmailUtils.randomAlphabetic(HtmlEmail.CID_LENGTH).toLowerCase(Locale.ENGLISH);<a name="line.322"></a>
+<span class="sourceLineNo">323</span>        return embed(file, cid);<a name="line.323"></a>
+<span class="sourceLineNo">324</span>    }<a name="line.324"></a>
+<span class="sourceLineNo">325</span><a name="line.325"></a>
+<span class="sourceLineNo">326</span>    /**<a name="line.326"></a>
+<span class="sourceLineNo">327</span>     * Embeds a file in the HTML.<a name="line.327"></a>
+<span class="sourceLineNo">328</span>     *<a name="line.328"></a>
+<span class="sourceLineNo">329</span>     * &lt;p&gt;This method embeds a file located by an URL into<a name="line.329"></a>
+<span class="sourceLineNo">330</span>     * the mail body. It allows, for instance, to add inline images<a name="line.330"></a>
+<span class="sourceLineNo">331</span>     * to the email.  Inline files may be referenced with a<a name="line.331"></a>
+<span class="sourceLineNo">332</span>     * &lt;code&gt;cid:xxxxxx&lt;/code&gt; URL, where xxxxxx is the Content-ID<a name="line.332"></a>
+<span class="sourceLineNo">333</span>     * returned by the embed function. Files are bound to their names, which is<a name="line.333"></a>
+<span class="sourceLineNo">334</span>     * the value returned by {@link java.io.File#getName()}. If the same file<a name="line.334"></a>
+<span class="sourceLineNo">335</span>     * is embedded multiple times, the same CID is guaranteed to be returned.<a name="line.335"></a>
+<span class="sourceLineNo">336</span>     *<a name="line.336"></a>
+<span class="sourceLineNo">337</span>     * &lt;p&gt;While functionally the same as passing &lt;code&gt;FileDataSource&lt;/code&gt; to<a name="line.337"></a>
+<span class="sourceLineNo">338</span>     * {@link #embed(DataSource, String, String)}, this method attempts<a name="line.338"></a>
+<span class="sourceLineNo">339</span>     * to validate the file before embedding it in the message and will throw<a name="line.339"></a>
+<span class="sourceLineNo">340</span>     * &lt;code&gt;EmailException&lt;/code&gt; if the validation fails. In this case, the<a name="line.340"></a>
+<span class="sourceLineNo">341</span>     * &lt;code&gt;HtmlEmail&lt;/code&gt; object will not be changed.<a name="line.341"></a>
+<span class="sourceLineNo">342</span>     *<a name="line.342"></a>
+<span class="sourceLineNo">343</span>     * @param file The &lt;code&gt;File&lt;/code&gt; to embed<a name="line.343"></a>
+<span class="sourceLineNo">344</span>     * @param cid the Content-ID to use for the embedded &lt;code&gt;File&lt;/code&gt;<a name="line.344"></a>
+<span class="sourceLineNo">345</span>     * @return A String with the Content-ID of the file.<a name="line.345"></a>
+<span class="sourceLineNo">346</span>     * @throws EmailException when the supplied &lt;code&gt;File&lt;/code&gt; cannot be used<a name="line.346"></a>
+<span class="sourceLineNo">347</span>     *  or if the file has already been embedded;<a name="line.347"></a>
+<span class="sourceLineNo">348</span>     *  also see {@link javax.mail.internet.MimeBodyPart} for definitions<a name="line.348"></a>
+<span class="sourceLineNo">349</span>     * @since 1.1<a name="line.349"></a>
+<span class="sourceLineNo">350</span>     */<a name="line.350"></a>
+<span class="sourceLineNo">351</span>    public String embed(final File file, final String cid) throws EmailException<a name="line.351"></a>
+<span class="sourceLineNo">352</span>    {<a name="line.352"></a>
+<span class="sourceLineNo">353</span>        if (EmailUtils.isEmpty(file.getName()))<a name="line.353"></a>
+<span class="sourceLineNo">354</span>        {<a name="line.354"></a>
+<span class="sourceLineNo">355</span>            throw new EmailException("file name cannot be null or empty");<a name="line.355"></a>
+<span class="sourceLineNo">356</span>        }<a name="line.356"></a>
+<span class="sourceLineNo">357</span><a name="line.357"></a>
+<span class="sourceLineNo">358</span>        // verify that the File can provide a canonical path<a name="line.358"></a>
+<span class="sourceLineNo">359</span>        String filePath = null;<a name="line.359"></a>
+<span class="sourceLineNo">360</span>        try<a name="line.360"></a>
+<span class="sourceLineNo">361</span>        {<a name="line.361"></a>
+<span class="sourceLineNo">362</span>            filePath = file.getCanonicalPath();<a name="line.362"></a>
+<span class="sourceLineNo">363</span>        }<a name="line.363"></a>
+<span class="sourceLineNo">364</span>        catch (final IOException ioe)<a name="line.364"></a>
+<span class="sourceLineNo">365</span>        {<a name="line.365"></a>
+<span class="sourceLineNo">366</span>            throw new EmailException("couldn't get canonical path for "<a name="line.366"></a>
+<span class="sourceLineNo">367</span>                    + file.getName(), ioe);<a name="line.367"></a>
+<span class="sourceLineNo">368</span>        }<a name="line.368"></a>
+<span class="sourceLineNo">369</span><a name="line.369"></a>
+<span class="sourceLineNo">370</span>        // check if a FileDataSource for this name has already been attached;<a name="line.370"></a>
+<span class="sourceLineNo">371</span>        // if so, return the cached CID value.<a name="line.371"></a>
+<span class="sourceLineNo">372</span>        if (inlineEmbeds.containsKey(file.getName()))<a name="line.372"></a>
+<span class="sourceLineNo">373</span>        {<a name="line.373"></a>
+<span class="sourceLineNo">374</span>            final InlineImage ii = inlineEmbeds.get(file.getName());<a name="line.374"></a>
+<span class="sourceLineNo">375</span>            final FileDataSource fileDataSource = (FileDataSource) ii.getDataSource();<a name="line.375"></a>
+<span class="sourceLineNo">376</span>            // make sure the supplied file has the same canonical path<a name="line.376"></a>
+<span class="sourceLineNo">377</span>            // as the one already associated with this name.<a name="line.377"></a>
+<span class="sourceLineNo">378</span>            String existingFilePath = null;<a name="line.378"></a>
+<span class="sourceLineNo">379</span>            try<a name="line.379"></a>
+<span class="sourceLineNo">380</span>            {<a name="line.380"></a>
+<span class="sourceLineNo">381</span>                existingFilePath = fileDataSource.getFile().getCanonicalPath();<a name="line.381"></a>
+<span class="sourceLineNo">382</span>            }<a name="line.382"></a>
+<span class="sourceLineNo">383</span>            catch (final IOException ioe)<a name="line.383"></a>
+<span class="sourceLineNo">384</span>            {<a name="line.384"></a>
+<span class="sourceLineNo">385</span>                throw new EmailException("couldn't get canonical path for file "<a name="line.385"></a>
+<span class="sourceLineNo">386</span>                        + fileDataSource.getFile().getName()<a name="line.386"></a>
+<span class="sourceLineNo">387</span>                        + "which has already been embedded", ioe);<a name="line.387"></a>
+<span class="sourceLineNo">388</span>            }<a name="line.388"></a>
+<span class="sourceLineNo">389</span>            if (filePath.equals(existingFilePath))<a name="line.389"></a>
+<span class="sourceLineNo">390</span>            {<a name="line.390"></a>
+<span class="sourceLineNo">391</span>                return ii.getCid();<a name="line.391"></a>
+<span class="sourceLineNo">392</span>            }<a name="line.392"></a>
+<span class="sourceLineNo">393</span>            throw new EmailException("embedded name '" + file.getName()<a name="line.393"></a>
+<span class="sourceLineNo">394</span>                + "' is already bound to file " + existingFilePath<a name="line.394"></a>
+<span class="sourceLineNo">395</span>                + "; existing names cannot be rebound");<a name="line.395"></a>
+<span class="sourceLineNo">396</span>        }<a name="line.396"></a>
+<span class="sourceLineNo">397</span><a name="line.397"></a>
+<span class="sourceLineNo">398</span>        // verify that the file is valid<a name="line.398"></a>
+<span class="sourceLineNo">399</span>        if (!file.exists())<a name="line.399"></a>
+<span class="sourceLineNo">400</span>        {<a name="line.400"></a>
+<span class="sourceLineNo">401</span>            throw new EmailException("file " + filePath + " doesn't exist");<a name="line.401"></a>
 <span class="sourceLineNo">402</span>        }<a name="line.402"></a>
-<span class="sourceLineNo">403</span><a name="line.403"></a>
-<span class="sourceLineNo">404</span>        // verify that the file is valid<a name="line.404"></a>
-<span class="sourceLineNo">405</span>        if (!file.exists())<a name="line.405"></a>
-<span class="sourceLineNo">406</span>        {<a name="line.406"></a>
-<span class="sourceLineNo">407</span>            throw new EmailException("file " + filePath + " doesn't exist");<a name="line.407"></a>
-<span class="sourceLineNo">408</span>        }<a name="line.408"></a>
-<span class="sourceLineNo">409</span>        if (!file.isFile())<a name="line.409"></a>
-<span class="sourceLineNo">410</span>        {<a name="line.410"></a>
-<span class="sourceLineNo">411</span>            throw new EmailException("file " + filePath + " isn't a normal file");<a name="line.411"></a>
-<span class="sourceLineNo">412</span>        }<a name="line.412"></a>
-<span class="sourceLineNo">413</span>        if (!file.canRead())<a name="line.413"></a>
-<span class="sourceLineNo">414</span>        {<a name="line.414"></a>
-<span class="sourceLineNo">415</span>            throw new EmailException("file " + filePath + " isn't readable");<a name="line.415"></a>
-<span class="sourceLineNo">416</span>        }<a name="line.416"></a>
-<span class="sourceLineNo">417</span><a name="line.417"></a>
-<span class="sourceLineNo">418</span>        return embed(new FileDataSource(file), file.getName(), cid);<a name="line.418"></a>
-<span class="sourceLineNo">419</span>    }<a name="line.419"></a>
-<span class="sourceLineNo">420</span><a name="line.420"></a>
-<span class="sourceLineNo">421</span>    /**<a name="line.421"></a>
-<span class="sourceLineNo">422</span>     * Embeds the specified &lt;code&gt;DataSource&lt;/code&gt; in the HTML using a<a name="line.422"></a>
-<span class="sourceLineNo">423</span>     * randomly generated Content-ID. Returns the generated Content-ID string.<a name="line.423"></a>
-<span class="sourceLineNo">424</span>     *<a name="line.424"></a>
-<span class="sourceLineNo">425</span>     * @param dataSource the &lt;code&gt;DataSource&lt;/code&gt; to embed<a name="line.425"></a>
-<span class="sourceLineNo">426</span>     * @param name the name that will be set in the filename header field<a name="line.426"></a>
-<span class="sourceLineNo">427</span>     * @return the generated Content-ID for this &lt;code&gt;DataSource&lt;/code&gt;<a name="line.427"></a>
-<span class="sourceLineNo">428</span>     * @throws EmailException if the embedding fails or if &lt;code&gt;name&lt;/code&gt; is<a name="line.428"></a>
-<span class="sourceLineNo">429</span>     * null or empty<a name="line.429"></a>
-<span class="sourceLineNo">430</span>     * @see #embed(DataSource, String, String)<a name="line.430"></a>
-<span class="sourceLineNo">431</span>     * @since 1.1<a name="line.431"></a>
-<span class="sourceLineNo">432</span>     */<a name="line.432"></a>
-<span class="sourceLineNo">433</span>    public String embed(final DataSource dataSource, final String name) throws EmailException<a name="line.433"></a>
-<span class="sourceLineNo">434</span>    {<a name="line.434"></a>
-<span class="sourceLineNo">435</span>        // check if the DataSource has already been attached;<a name="line.435"></a>
-<span class="sourceLineNo">436</span>        // if so, return the cached CID value.<a name="line.436"></a>
-<span class="sourceLineNo">437</span>        if (inlineEmbeds.containsKey(name))<a name="line.437"></a>
-<span class="sourceLineNo">438</span>        {<a name="line.438"></a>
-<span class="sourceLineNo">439</span>            final InlineImage ii = inlineEmbeds.get(name);<a name="line.439"></a>
-<span class="sourceLineNo">440</span>            // make sure the supplied URL points to the same thing<a name="line.440"></a>
-<span class="sourceLineNo">441</span>            // as the one already associated with this name.<a name="line.441"></a>
-<span class="sourceLineNo">442</span>            if (dataSource.equals(ii.getDataSource()))<a name="line.442"></a>
-<span class="sourceLineNo">443</span>            {<a name="line.443"></a>
-<span class="sourceLineNo">444</span>                return ii.getCid();<a name="line.444"></a>
-<span class="sourceLineNo">445</span>            }<a name="line.445"></a>
-<span class="sourceLineNo">446</span>            else<a name="line.446"></a>
-<span class="sourceLineNo">447</span>            {<a name="line.447"></a>
-<span class="sourceLineNo">448</span>                throw new EmailException("embedded DataSource '" + name<a name="line.448"></a>
-<span class="sourceLineNo">449</span>                    + "' is already bound to name " + ii.getDataSource().toString()<a name="line.449"></a>
-<span class="sourceLineNo">450</span>                    + "; existing names cannot be rebound");<a name="line.450"></a>
-<span class="sourceLineNo">451</span>            }<a name="line.451"></a>
-<span class="sourceLineNo">452</span>        }<a name="line.452"></a>
-<span class="sourceLineNo">453</span><a name="line.453"></a>
-<span class="sourceLineNo">454</span>        final String cid = EmailUtils.randomAlphabetic(HtmlEmail.CID_LENGTH).toLowerCase();<a name="line.454"></a>
-<span class="sourceLineNo">455</span>        return embed(dataSource, name, cid);<a name="line.455"></a>
-<span class="sourceLineNo">456</span>    }<a name="line.456"></a>
-<span class="sourceLineNo">457</span><a name="line.457"></a>
-<span class="sourceLineNo">458</span>    /**<a name="line.458"></a>
-<span class="sourceLineNo">459</span>     * Embeds the specified &lt;code&gt;DataSource&lt;/code&gt; in the HTML using the<a name="line.459"></a>
-<span class="sourceLineNo">460</span>     * specified Content-ID. Returns the specified Content-ID string.<a name="line.460"></a>
-<span class="sourceLineNo">461</span>     *<a name="line.461"></a>
-<span class="sourceLineNo">462</span>     * @param dataSource the &lt;code&gt;DataSource&lt;/code&gt; to embed<a name="line.462"></a>
-<span class="sourceLineNo">463</span>     * @param name the name that will be set in the filename header field<a name="line.463"></a>
-<span class="sourceLineNo">464</span>     * @param cid the Content-ID to use for this &lt;code&gt;DataSource&lt;/code&gt;<a name="line.464"></a>
-<span class="sourceLineNo">465</span>     * @return the URL encoded Content-ID for this &lt;code&gt;DataSource&lt;/code&gt;<a name="line.465"></a>
-<span class="sourceLineNo">466</span>     * @throws EmailException if the embedding fails or if &lt;code&gt;name&lt;/code&gt; is<a name="line.466"></a>
-<span class="sourceLineNo">467</span>     * null or empty<a name="line.467"></a>
-<span class="sourceLineNo">468</span>     * @since 1.1<a name="line.468"></a>
-<span class="sourceLineNo">469</span>     */<a name="line.469"></a>
-<span class="sourceLineNo">470</span>    public String embed(final DataSource dataSource, final String name, String cid)<a name="line.470"></a>
-<span class="sourceLineNo">471</span>        throws EmailException<a name="line.471"></a>
-<span class="sourceLineNo">472</span>    {<a name="line.472"></a>
-<span class="sourceLineNo">473</span>        if (EmailUtils.isEmpty(name))<a name="line.473"></a>
-<span class="sourceLineNo">474</span>        {<a name="line.474"></a>
-<span class="sourceLineNo">475</span>            throw new EmailException("name cannot be null or empty");<a name="line.475"></a>
-<span class="sourceLineNo">476</span>        }<a name="line.476"></a>
-<span class="sourceLineNo">477</span><a name="line.477"></a>
-<span class="sourceLineNo">478</span>        final MimeBodyPart mbp = new MimeBodyPart();<a name="line.478"></a>
-<span class="sourceLineNo">479</span><a name="line.479"></a>
-<span class="sourceLineNo">480</span>        try<a name="line.480"></a>
-<span class="sourceLineNo">481</span>        {<a name="line.481"></a>
-<span class="sourceLineNo">482</span>            // url encode the cid according to rfc 2392<a name="line.482"></a>
-<span class="sourceLineNo">483</span>            cid = EmailUtils.encodeUrl(cid);<a name="line.483"></a>
-<span class="sourceLineNo">484</span><a name="line.484"></a>
-<span class="sourceLineNo">485</span>            mbp.setDataHandler(new DataHandler(dataSource));<a name="line.485"></a>
-<span class="sourceLineNo">486</span>            mbp.setFileName(name);<a name="line.486"></a>
-<span class="sourceLineNo">487</span>            mbp.setDisposition(EmailAttachment.INLINE);<a name="line.487"></a>
-<span class="sourceLineNo">488</span>            mbp.setContentID("&lt;" + cid + "&gt;");<a name="line.488"></a>
-<span class="sourceLineNo">489</span><a name="line.489"></a>
-<span class="sourceLineNo">490</span>            final InlineImage ii = new InlineImage(cid, dataSource, mbp);<a name="line.490"></a>
-<span class="sourceLineNo">491</span>            this.inlineEmbeds.put(name, ii);<a name="line.491"></a>
-<span class="sourceLineNo">492</span><a name="line.492"></a>
-<span class="sourceLineNo">493</span>            return cid;<a name="line.493"></a>
-<span class="sourceLineNo">494</span>        }<a name="line.494"></a>
-<span class="sourceLineNo">495</span>        catch (final MessagingException me)<a name="line.495"></a>
-<span class="sourceLineNo">496</span>        {<a name="line.496"></a>
-<span class="sourceLineNo">497</span>            throw new EmailException(me);<a name="line.497"></a>
-<span class="sourceLineNo">498</span>        }<a name="line.498"></a>
-<span class="sourceLineNo">499</span>        catch (final UnsupportedEncodingException uee)<a name="line.499"></a>
-<span class="sourceLineNo">500</span>        {<a name="line.500"></a>
-<span class="sourceLineNo">501</span>            throw new EmailException(uee);<a name="line.501"></a>
-<span class="sourceLineNo">502</span>        }<a name="line.502"></a>
-<span class="sourceLineNo">503</span>    }<a name="line.503"></a>
-<span class="sourceLineNo">504</span><a name="line.504"></a>
-<span class="sourceLineNo">505</span>    /**<a name="line.505"></a>
-<span class="sourceLineNo">506</span>     * Does the work of actually building the MimeMessage. Please note that<a name="line.506"></a>
-<span class="sourceLineNo">507</span>     * a user rarely calls this method directly and only if he/she is<a name="line.507"></a>
-<span class="sourceLineNo">508</span>     * interested in the sending the underlying MimeMessage without<a name="line.508"></a>
-<span class="sourceLineNo">509</span>     * commons-email.<a name="line.509"></a>
-<span class="sourceLineNo">510</span>     *<a name="line.510"></a>
-<span class="sourceLineNo">511</span>     * @exception EmailException if there was an error.<a name="line.511"></a>
-<span class="sourceLineNo">512</span>     * @since 1.0<a name="line.512"></a>
-<span class="sourceLineNo">513</span>     */<a name="line.513"></a>
-<span class="sourceLineNo">514</span>    @Override<a name="line.514"></a>
-<span class="sourceLineNo">515</span>    public void buildMimeMessage() throws EmailException<a name="line.515"></a>
-<span class="sourceLineNo">516</span>    {<a name="line.516"></a>
-<span class="sourceLineNo">517</span>        try<a name="line.517"></a>
-<span class="sourceLineNo">518</span>        {<a name="line.518"></a>
-<span class="sourceLineNo">519</span>            build();<a name="line.519"></a>
-<span class="sourceLineNo">520</span>        }<a name="line.520"></a>
-<span class="sourceLineNo">521</span>        catch (final MessagingException me)<a name="line.521"></a>
-<span class="sourceLineNo">522</span>        {<a name="line.522"></a>
-<span class="sourceLineNo">523</span>            throw new EmailException(me);<a name="line.523"></a>
-<span class="sourceLineNo">524</span>        }<a name="line.524"></a>
-<span class="sourceLineNo">525</span>        super.buildMimeMessage();<a name="line.525"></a>
-<span class="sourceLineNo">526</span>    }<a name="line.526"></a>
-<span class="sourceLineNo">527</span><a name="line.527"></a>
-<span class="sourceLineNo">528</span>    /**<a name="line.528"></a>
-<span class="sourceLineNo">529</span>     * @throws EmailException EmailException<a name="line.529"></a>
-<span class="sourceLineNo">530</span>     * @throws MessagingException MessagingException<a name="line.530"></a>
-<span class="sourceLineNo">531</span>     */<a name="line.531"></a>
-<span class="sourceLineNo">532</span>    private void build() throws MessagingException, EmailException<a name="line.532"></a>
-<span class="sourceLineNo">533</span>    {<a name="line.533"></a>
-<span class="sourceLineNo">534</span>        final MimeMultipart rootContainer = this.getContainer();<a name="line.534"></a>
-<span class="sourceLineNo">535</span>        MimeMultipart bodyEmbedsContainer = rootContainer;<a name="line.535"></a>
-<span class="sourceLineNo">536</span>        MimeMultipart bodyContainer = rootContainer;<a name="line.536"></a>
-<span class="sourceLineNo">537</span>        MimeBodyPart msgHtml = null;<a name="line.537"></a>
-<span class="sourceLineNo">538</span>        MimeBodyPart msgText = null;<a name="line.538"></a>
-<span class="sourceLineNo">539</span><a name="line.539"></a>
-<span class="sourceLineNo">540</span>        rootContainer.setSubType("mixed");<a name="line.540"></a>
+<span class="sourceLineNo">403</span>        if (!file.isFile())<a name="line.403"></a>
+<span class="sourceLineNo">404</span>        {<a name="line.404"></a>
+<span class="sourceLineNo">405</span>            throw new EmailException("file " + filePath + " isn't a normal file");<a name="line.405"></a>
+<span class="sourceLineNo">406</span>        }<a name="line.406"></a>
+<span class="sourceLineNo">407</span>        if (!file.canRead())<a name="line.407"></a>
+<span class="sourceLineNo">408</span>        {<a name="line.408"></a>
+<span class="sourceLineNo">409</span>            throw new EmailException("file " + filePath + " isn't readable");<a name="line.409"></a>
+<span class="sourceLineNo">410</span>        }<a name="line.410"></a>
+<span class="sourceLineNo">411</span><a name="line.411"></a>
+<span class="sourceLineNo">412</span>        return embed(new FileDataSource(file), file.getName(), cid);<a name="line.412"></a>
+<span class="sourceLineNo">413</span>    }<a name="line.413"></a>
+<span class="sourceLineNo">414</span><a name="line.414"></a>
+<span class="sourceLineNo">415</span>    /**<a name="line.415"></a>
+<span class="sourceLineNo">416</span>     * Embeds the specified &lt;code&gt;DataSource&lt;/code&gt; in the HTML using a<a name="line.416"></a>
+<span class="sourceLineNo">417</span>     * randomly generated Content-ID. Returns the generated Content-ID string.<a name="line.417"></a>
+<span class="sourceLineNo">418</span>     *<a name="line.418"></a>
+<span class="sourceLineNo">419</span>     * @param dataSource the &lt;code&gt;DataSource&lt;/code&gt; to embed<a name="line.419"></a>
+<span class="sourceLineNo">420</span>     * @param name the name that will be set in the filename header field<a name="line.420"></a>
+<span class="sourceLineNo">421</span>     * @return the generated Content-ID for this &lt;code&gt;DataSource&lt;/code&gt;<a name="line.421"></a>
+<span class="sourceLineNo">422</span>     * @throws EmailException if the embedding fails or if &lt;code&gt;name&lt;/code&gt; is<a name="line.422"></a>
+<span class="sourceLineNo">423</span>     * null or empty<a name="line.423"></a>
+<span class="sourceLineNo">424</span>     * @see #embed(DataSource, String, String)<a name="line.424"></a>
+<span class="sourceLineNo">425</span>     * @since 1.1<a name="line.425"></a>
+<span class="sourceLineNo">426</span>     */<a name="line.426"></a>
+<span class="sourceLineNo">427</span>    public String embed(final DataSource dataSource, final String name) throws EmailException<a name="line.427"></a>
+<span class="sourceLineNo">428</span>    {<a name="line.428"></a>
+<span class="sourceLineNo">429</span>        // check if the DataSource has already been attached;<a name="line.429"></a>
+<span class="sourceLineNo">430</span>        // if so, return the cached CID value.<a name="line.430"></a>
+<span class="sourceLineNo">431</span>        if (inlineEmbeds.containsKey(name))<a name="line.431"></a>
+<span class="sourceLineNo">432</span>        {<a name="line.432"></a>
+<span class="sourceLineNo">433</span>            final InlineImage ii = inlineEmbeds.get(name);<a name="line.433"></a>
+<span class="sourceLineNo">434</span>            // make sure the supplied URL points to the same thing<a name="line.434"></a>
+<span class="sourceLineNo">435</span>            // as the one already associated with this name.<a name="line.435"></a>
+<span class="sourceLineNo">436</span>            if (dataSource.equals(ii.getDataSource()))<a name="line.436"></a>
+<span class="sourceLineNo">437</span>            {<a name="line.437"></a>
+<span class="sourceLineNo">438</span>                return ii.getCid();<a name="line.438"></a>
+<span class="sourceLineNo">439</span>            }<a name="line.439"></a>
+<span class="sourceLineNo">440</span>            throw new EmailException("embedded DataSource '" + name<a name="line.440"></a>
+<span class="sourceLineNo">441</span>                + "' is already bound to name " + ii.getDataSource().toString()<a name="line.441"></a>
+<span class="sourceLineNo">442</span>                + "; existing names cannot be rebound");<a name="line.442"></a>
+<span class="sourceLineNo">443</span>        }<a name="line.443"></a>
+<span class="sourceLineNo">444</span><a name="line.444"></a>
+<span class="sourceLineNo">445</span>        final String cid = EmailUtils.randomAlphabetic(HtmlEmail.CID_LENGTH).toLowerCase();<a name="line.445"></a>
+<span class="sourceLineNo">446</span>        return embed(dataSource, name, cid);<a name="line.446"></a>
+<span class="sourceLineNo">447</span>    }<a name="line.447"></a>
+<span class="sourceLineNo">448</span><a name="line.448"></a>
+<span class="sourceLineNo">449</span>    /**<a name="line.449"></a>
+<span class="sourceLineNo">450</span>     * Embeds the specified &lt;code&gt;DataSource&lt;/code&gt; in the HTML using the<a name="line.450"></a>
+<span class="sourceLineNo">451</span>     * specified Content-ID. Returns the specified Content-ID string.<a name="line.451"></a>
+<span class="sourceLineNo">452</span>     *<a name="line.452"></a>
+<span class="sourceLineNo">453</span>     * @param dataSource the &lt;code&gt;DataSource&lt;/code&gt; to embed<a name="line.453"></a>
+<span class="sourceLineNo">454</span>     * @param name the name that will be set in the filename header field<a name="line.454"></a>
+<span class="sourceLineNo">455</span>     * @param cid the Content-ID to use for this &lt;code&gt;DataSource&lt;/code&gt;<a name="line.455"></a>
+<span class="sourceLineNo">456</span>     * @return the URL encoded Content-ID for this &lt;code&gt;DataSource&lt;/code&gt;<a name="line.456"></a>
+<span class="sourceLineNo">457</span>     * @throws EmailException if the embedding fails or if &lt;code&gt;name&lt;/code&gt; is<a name="line.457"></a>
+<span class="sourceLineNo">458</span>     * null or empty<a name="line.458"></a>
+<span class="sourceLineNo">459</span>     * @since 1.1<a name="line.459"></a>
+<span class="sourceLineNo">460</span>     */<a name="line.460"></a>
+<span class="sourceLineNo">461</span>    public String embed(final DataSource dataSource, final String name, final String cid)<a name="line.461"></a>
+<span class="sourceLineNo">462</span>        throws EmailException<a name="line.462"></a>
+<span class="sourceLineNo">463</span>    {<a name="line.463"></a>
+<span class="sourceLineNo">464</span>        if (EmailUtils.isEmpty(name))<a name="line.464"></a>
+<span class="sourceLineNo">465</span>        {<a name="line.465"></a>
+<span class="sourceLineNo">466</span>            throw new EmailException("name cannot be null or empty");<a name="line.466"></a>
+<span class="sourceLineNo">467</span>        }<a name="line.467"></a>
+<span class="sourceLineNo">468</span><a name="line.468"></a>
+<span class="sourceLineNo">469</span>        final MimeBodyPart mbp = new MimeBodyPart();<a name="line.469"></a>
+<span class="sourceLineNo">470</span><a name="line.470"></a>
+<span class="sourceLineNo">471</span>        try<a name="line.471"></a>
+<span class="sourceLineNo">472</span>        {<a name="line.472"></a>
+<span class="sourceLineNo">473</span>            // URL encode the cid according to RFC 2392<a name="line.473"></a>
+<span class="sourceLineNo">474</span>            String encodedCid = EmailUtils.encodeUrl(cid);<a name="line.474"></a>
+<span class="sourceLineNo">475</span><a name="line.475"></a>
+<span class="sourceLineNo">476</span>            mbp.setDataHandler(new DataHandler(dataSource));<a name="line.476"></a>
+<span class="sourceLineNo">477</span>            mbp.setFileName(name);<a name="line.477"></a>
+<span class="sourceLineNo">478</span>            mbp.setDisposition(EmailAttachment.INLINE);<a name="line.478"></a>
+<span class="sourceLineNo">479</span>            mbp.setContentID("&lt;" + encodedCid + "&gt;");<a name="line.479"></a>
+<span class="sourceLineNo">480</span><a name="line.480"></a>
+<span class="sourceLineNo">481</span>            final InlineImage ii = new InlineImage(encodedCid, dataSource, mbp);<a name="line.481"></a>
+<span class="sourceLineNo">482</span>            this.inlineEmbeds.put(name, ii);<a name="line.482"></a>
+<span class="sourceLineNo">483</span><a name="line.483"></a>
+<span class="sourceLineNo">484</span>            return encodedCid;<a name="line.484"></a>
+<span class="sourceLineNo">485</span>        }<a name="line.485"></a>
+<span class="sourceLineNo">486</span>        catch (final MessagingException me)<a name="line.486"></a>
+<span class="sourceLineNo">487</span>        {<a name="line.487"></a>
+<span class="sourceLineNo">488</span>            throw new EmailException(me);<a name="line.488"></a>
+<span class="sourceLineNo">489</span>        }<a name="line.489"></a>
+<span class="sourceLineNo">490</span>        catch (final UnsupportedEncodingException uee)<a name="line.490"></a>
+<span class="sourceLineNo">491</span>        {<a name="line.491"></a>
+<span class="sourceLineNo">492</span>            throw new EmailException(uee);<a name="line.492"></a>
+<span class="sourceLineNo">493</span>        }<a name="line.493"></a>
+<span class="sourceLineNo">494</span>    }<a name="line.494"></a>
+<span class="sourceLineNo">495</span><a name="line.495"></a>
+<span class="sourceLineNo">496</span>    /**<a name="line.496"></a>
+<span class="sourceLineNo">497</span>     * Does the work of actually building the MimeMessage. Please note that<a name="line.497"></a>
+<span class="sourceLineNo">498</span>     * a user rarely calls this method directly and only if he/she is<a name="line.498"></a>
+<span class="sourceLineNo">499</span>     * interested in the sending the underlying MimeMessage without<a name="line.499"></a>
+<span class="sourceLineNo">500</span>     * commons-email.<a name="line.500"></a>
+<span class="sourceLineNo">501</span>     *<a name="line.501"></a>
+<span class="sourceLineNo">502</span>     * @exception EmailException if there was an error.<a name="line.502"></a>
+<span class="sourceLineNo">503</span>     * @since 1.0<a name="line.503"></a>
+<span class="sourceLineNo">504</span>     */<a name="line.504"></a>
+<span class="sourceLineNo">505</span>    @Override<a name="line.505"></a>
+<span class="sourceLineNo">506</span>    public void buildMimeMessage() throws EmailException<a name="line.506"></a>
+<span class="sourceLineNo">507</span>    {<a name="line.507"></a>
+<span class="sourceLineNo">508</span>        try<a name="line.508"></a>
+<span class="sourceLineNo">509</span>        {<a name="line.509"></a>
+<span class="sourceLineNo">510</span>            build();<a name="line.510"></a>
+<span class="sourceLineNo">511</span>        }<a name="line.511"></a>
+<span class="sourceLineNo">512</span>        catch (final MessagingException me)<a name="line.512"></a>
+<span class="sourceLineNo">513</span>        {<a name="line.513"></a>
+<span class="sourceLineNo">514</span>            throw new EmailException(me);<a name="line.514"></a>
+<span class="sourceLineNo">515</span>        }<a name="line.515"></a>
+<span class="sourceLineNo">516</span>        super.buildMimeMessage();<a name="line.516"></a>
+<span class="sourceLineNo">517</span>    }<a name="line.517"></a>
+<span class="sourceLineNo">518</span><a name="line.518"></a>
+<span class="sourceLineNo">519</span>    /**<a name="line.519"></a>
+<span class="sourceLineNo">520</span>     * @throws EmailException EmailException<a name="line.520"></a>
+<span class="sourceLineNo">521</span>     * @throws MessagingException MessagingException<a name="line.521"></a>
+<span class="sourceLineNo">522</span>     */<a name="line.522"></a>
+<span class="sourceLineNo">523</span>    private void build() throws MessagingException, EmailException<a name="line.523"></a>
+<span class="sourceLineNo">524</span>    {<a name="line.524"></a>
+<span class="sourceLineNo">525</span>        final MimeMultipart rootContainer = this.getContainer();<a name="line.525"></a>
+<span class="sourceLineNo">526</span>        MimeMultipart bodyEmbedsContainer = rootContainer;<a name="line.526"></a>
+<span class="sourceLineNo">527</span>        MimeMultipart bodyContainer = rootContainer;<a name="line.527"></a>
+<span class="sourceLineNo">528</span>        MimeBodyPart msgHtml = null;<a name="line.528"></a>
+<span class="sourceLineNo">529</span>        MimeBodyPart msgText = null;<a name="line.529"></a>
+<span class="sourceLineNo">530</span><a name="line.530"></a>
+<span class="sourceLineNo">531</span>        rootContainer.setSubType("mixed");<a name="line.531"></a>
+<span class="sourceLineNo">532</span><a name="line.532"></a>
+<span class="sourceLineNo">533</span>        // determine how to form multiparts of email<a name="line.533"></a>
+<span class="sourceLineNo">534</span><a name="line.534"></a>
+<span class="sourceLineNo">535</span>        if (EmailUtils.isNotEmpty(this.html) &amp;&amp; this.inlineEmbeds.size() &gt; 0)<a name="line.535"></a>
+<span class="sourceLineNo">536</span>        {<a name="line.536"></a>
+<span class="sourceLineNo">537</span>            //If HTML body and embeds are used, create a related container and add it to the root container<a name="line.537"></a>
+<span class="sourceLineNo">538</span>            bodyEmbedsContainer = new MimeMultipart("related");<a name="line.538"></a>
+<span class="sourceLineNo">539</span>            bodyContainer = bodyEmbedsContainer;<a name="line.539"></a>
+<span class="sourceLineNo">540</span>            this.addPart(bodyEmbedsContainer, 0);<a name="line.540"></a>
 <span class="sourceLineNo">541</span><a name="line.541"></a>
-<span class="sourceLineNo">542</span>        // determine how to form multiparts of email<a name="line.542"></a>
-<span class="sourceLineNo">543</span><a name="line.543"></a>
-<span class="sourceLineNo">544</span>        if (EmailUtils.isNotEmpty(this.html) &amp;&amp; this.inlineEmbeds.size() &gt; 0)<a name="line.544"></a>
-<span class="sourceLineNo">545</span>        {<a name="line.545"></a>
-<span class="sourceLineNo">546</span>            //If HTML body and embeds are used, create a related container and add it to the root container<a name="line.546"></a>
-<span class="sourceLineNo">547</span>            bodyEmbedsContainer = new MimeMultipart("related");<a name="line.547"></a>
-<span class="sourceLineNo">548</span>            bodyContainer = bodyEmbedsContainer;<a name="line.548"></a>
-<span class="sourceLineNo">549</span>            this.addPart(bodyEmbedsContainer, 0);<a name="line.549"></a>
-<span class="sourceLineNo">550</span><a name="line.550"></a>
-<span class="sourceLineNo">551</span>            //If TEXT body was specified, create a alternative container and add it to the embeds container<a name="line.551"></a>
-<span class="sourceLineNo">552</span>            if (EmailUtils.isNotEmpty(this.text))<a name="line.552"></a>
-<span class="sourceLineNo">553</span>            {<a name="line.553"></a>
-<span class="sourceLineNo">554</span>                bodyContainer = new MimeMultipart("alternative");<a name="line.554"></a>
-<span class="sourceLineNo">555</span>                final BodyPart bodyPart = createBodyPart();<a name="line.555"></a>
-<span class="sourceLineNo">556</span>                try<a name="line.556"></a>
-<span class="sourceLineNo">557</span>                {<a name="line.557"></a>
-<span class="sourceLineNo">558</span>                    bodyPart.setContent(bodyContainer);<a name="line.558"></a>
-<span class="sourceLineNo">559</span>                    bodyEmbedsContainer.addBodyPart(bodyPart, 0);<a name="line.559"></a>
-<span class="sourceLineNo">560</span>                }<a name="line.560"></a>
-<span class="sourceLineNo">561</span>                catch (final MessagingException me)<a name="line.561"></a>
-<span class="sourceLineNo">562</span>                {<a name="line.562"></a>
-<span class="sourceLineNo">563</span>                    throw new EmailException(me);<a name="line.563"></a>
-<span class="sourceLineNo">564</span>                }<a name="line.564"></a>
-<span class="sourceLineNo">565</span>            }<a name="line.565"></a>
-<span class="sourceLineNo">566</span>        }<a name="line.566"></a>
-<span class="sourceLineNo">567</span>        else if (EmailUtils.isNotEmpty(this.text) &amp;&amp; EmailUtils.isNotEmpty(this.html))<a name="line.567"></a>
-<span class="sourceLineNo">568</span>        {<a name="line.568"></a>
-<span class="sourceLineNo">569</span>            //If both HTML and TEXT bodies are provided, create a alternative container and add it to the root container<a name="line.569"></a>
-<span class="sourceLineNo">570</span>            bodyContainer = new MimeMultipart("alternative");<a name="line.570"></a>
-<span class="sourceLineNo">571</span>            this.addPart(bodyContainer, 0);<a name="line.571"></a>
-<span class="sourceLineNo">572</span>        }<a name="line.572"></a>
-<span class="sourceLineNo">573</span><a name="line.573"></a>
-<span class="sourceLineNo">574</span>        if (EmailUtils.isNotEmpty(this.html))<a name="line.574"></a>
-<span class="sourceLineNo">575</span>        {<a name="line.575"></a>
-<span class="sourceLineNo">576</span>            msgHtml = new MimeBodyPart();<a name="line.576"></a>
-<span class="sourceLineNo">577</span>            bodyContainer.addBodyPart(msgHtml, 0);<a name="line.577"></a>
+<span class="sourceLineNo">542</span>            // If TEXT body was specified, create a alternative container and add it to the embeds container<a name="line.542"></a>
+<span class="sourceLineNo">543</span>            if (EmailUtils.isNotEmpty(this.text))<a name="line.543"></a>
+<span class="sourceLineNo">544</span>            {<a name="line.544"></a>
+<span class="sourceLineNo">545</span>                bodyContainer = new MimeMultipart("alternative");<a name="line.545"></a>
+<span class="sourceLineNo">546</span>                final BodyPart bodyPart = createBodyPart();<a name="line.546"></a>
+<span class="sourceLineNo">547</span>                try<a name="line.547"></a>
+<span class="sourceLineNo">548</span>                {<a name="line.548"></a>
+<span class="sourceLineNo">549</span>                    bodyPart.setContent(bodyContainer);<a name="line.549"></a>
+<span class="sourceLineNo">550</span>                    bodyEmbedsContainer.addBodyPart(bodyPart, 0);<a name="line.550"></a>
+<span class="sourceLineNo">551</span>                }<a name="line.551"></a>
+<span class="sourceLineNo">552</span>                catch (final MessagingException me)<a name="line.552"></a>
+<span class="sourceLineNo">553</span>                {<a name="line.553"></a>
+<span class="sourceLineNo">554</span>                    throw new EmailException(me);<a name="line.554"></a>
+<span class="sourceLineNo">555</span>                }<a name="line.555"></a>
+<span class="sourceLineNo">556</span>            }<a name="line.556"></a>
+<span class="sourceLineNo">557</span>        }<a name="line.557"></a>
+<span class="sourceLineNo">558</span>        else if (EmailUtils.isNotEmpty(this.text) &amp;&amp; EmailUtils.isNotEmpty(this.html))<a name="line.558"></a>
+<span class="sourceLineNo">559</span>        {<a name="line.559"></a>
+<span class="sourceLineNo">560</span>            // EMAIL-142: if we have both an HTML and TEXT body, but no attachments or<a name="line.560"></a>
+<span class="sourceLineNo">561</span>            //            inline images, the root container should have mimetype<a name="line.561"></a>
+<span class="sourceLineNo">562</span>            //            "multipart/alternative".<a name="line.562"></a>
+<span class="sourceLineNo">563</span>            // reference: http://tools.ietf.org/html/rfc2046#section-5.1.4<a name="line.563"></a>
+<span class="sourceLineNo">564</span>            if (this.inlineEmbeds.size() &gt; 0 || isBoolHasAttachments())<a name="line.564"></a>
+<span class="sourceLineNo">565</span>            {<a name="line.565"></a>
+<span class="sourceLineNo">566</span>                // If both HTML and TEXT bodies are provided, create an alternative<a name="line.566"></a>
+<span class="sourceLineNo">567</span>                // container and add it to the root container<a name="line.567"></a>
+<span class="sourceLineNo">568</span>                bodyContainer = new MimeMultipart("alternative");<a name="line.568"></a>
+<span class="sourceLineNo">569</span>                this.addPart(bodyContainer, 0);<a name="line.569"></a>
+<span class="sourceLineNo">570</span>            }<a name="line.570"></a>
+<span class="sourceLineNo">571</span>            else<a name="line.571"></a>
+<span class="sourceLineNo">572</span>            {<a name="line.572"></a>
+<span class="sourceLineNo">573</span>                // no attachments or embedded images present, change the mimetype<a name="line.573"></a>
+<span class="sourceLineNo">574</span>                // of the root container (= body container)<a name="line.574"></a>
+<span class="sourceLineNo">575</span>                rootContainer.setSubType("alternative");<a name="line.575"></a>
+<span class="sourceLineNo">576</span>            }<a name="line.576"></a>
+<span class="sourceLineNo">577</span>        }<a name="line.577"></a>
 <span class="sourceLineNo">578</span><a name="line.578"></a>
-<span class="sourceLineNo">579</span>            // EMAIL-104: call explicitly setText to use default mime charset<a name="line.579"></a>
-<span class="sourceLineNo">580</span>            //            (property "mail.mime.charset") in case none has been set<a name="line.580"></a>
-<span class="sourceLineNo">581</span>            msgHtml.setText(this.html, this.charset, EmailConstants.TEXT_SUBTYPE_HTML);<a name="line.581"></a>
-<span class="sourceLineNo">582</span><a name="line.582"></a>
-<span class="sourceLineNo">583</span>            for (final InlineImage image : this.inlineEmbeds.values())<a name="line.583"></a>
-<span class="sourceLineNo">584</span>            {<a name="line.584"></a>
-<span class="sourceLineNo">585</span>                bodyEmbedsContainer.addBodyPart(image.getMbp());<a name="line.585"></a>
-<span class="sourceLineNo">586</span>            }<a name="line.586"></a>
-<span class="sourceLineNo">587</span>        }<a name="line.587"></a>
-<span class="sourceLineNo">588</span><a name="line.588"></a>
-<span class="sourceLineNo">589</span>        if (EmailUtils.isNotEmpty(this.text))<a name="line.589"></a>
-<span class="sourceLineNo">590</span>        {<a name="line.590"></a>
-<span class="sourceLineNo">591</span>            msgText = new MimeBodyPart();<a name="line.591"></a>
-<span class="sourceLineNo">592</span>            bodyContainer.addBodyPart(msgText, 0);<a name="line.592"></a>
-<span class="sourceLineNo">593</span><a name="line.593"></a>
-<span class="sourceLineNo">594</span>            // EMAIL-104: call explicitly setText to use default mime charset<a name="line.594"></a>
-<span class="sourceLineNo">595</span>            //            (property "mail.mime.charset") in case none has been set<a name="line.595"></a>
-<span class="sourceLineNo">596</span>            msgText.setText(this.text, this.charset);<a name="line.596"></a>
-<span class="sourceLineNo">597</span>        }<a name="line.597"></a>
-<span class="sourceLineNo">598</span>    }<a name="line.598"></a>
-<span class="sourceLineNo">599</span><a name="line.599"></a>
-<span class="sourceLineNo">600</span>    /**<a name="line.600"></a>
-<span class="sourceLineNo">601</span>     * Private bean class that encapsulates data about URL contents<a name="line.601"></a>
-<span class="sourceLineNo">602</span>     * that are embedded in the final email.<a name="line.602"></a>
-<span class="sourceLineNo">603</span>     * @since 1.1<a name="line.603"></a>
-<span class="sourceLineNo">604</span>     */<a name="line.604"></a>
-<span class="sourceLineNo">605</span>    private static class InlineImage<a name="line.605"></a>
-<span class="sourceLineNo">606</span>    {<a name="line.606"></a>
-<span class="sourceLineNo">607</span>        /** content id. */<a name="line.607"></a>
-<span class="sourceLineNo">608</span>        private final String cid;<a name="line.608"></a>
-<span class="sourceLineNo">609</span>        /** &lt;code&gt;DataSource&lt;/code&gt; for the content. */<a name="line.609"></a>
-<span class="sourceLineNo">610</span>        private final DataSource dataSource;<a name="line.610"></a>
-<span class="sourceLineNo">611</span>        /** the &lt;code&gt;MimeBodyPart&lt;/code&gt; that contains the encoded data. */<a name="line.611"></a>
-<span class="sourceLineNo">612</span>        private final MimeBodyPart mbp;<a name="line.612"></a>
+<span class="sourceLineNo">579</span>        if (EmailUtils.isNotEmpty(this.html))<a name="line.579"></a>
+<span class="sourceLineNo">580</span>        {<a name="line.580"></a>
+<span class="sourceLineNo">581</span>            msgHtml = new MimeBodyPart();<a name="line.581"></a>
+<span class="sourceLineNo">582</span>            bodyContainer.addBodyPart(msgHtml, 0);<a name="line.582"></a>
+<span class="sourceLineNo">583</span><a name="line.583"></a>
+<span class="sourceLineNo">584</span>            // EMAIL-104: call explicitly setText to use default mime charset<a name="line.584"></a>
+<span class="sourceLineNo">585</span>            //            (property "mail.mime.charset") in case none has been set<a name="line.585"></a>
+<span class="sourceLineNo">586</span>            msgHtml.setText(this.html, this.charset, EmailConstants.TEXT_SUBTYPE_HTML);<a name="line.586"></a>
+<span class="sourceLineNo">587</span><a name="line.587"></a>
+<span class="sourceLineNo">588</span>            // EMAIL-147: work-around for buggy JavaMail implementations;<a name="line.588"></a>
+<span class="sourceLineNo">589</span>            //            in case setText(...) does not set the correct content type,<a name="line.589"></a>
+<span class="sourceLineNo">590</span>            //            use the setContent() method instead.<a name="line.590"></a>
+<span class="sourceLineNo">591</span>            final String contentType = msgHtml.getContentType();<a name="line.591"></a>
+<span class="sourceLineNo">592</span>            if (contentType == null || !contentType.equals(EmailConstants.TEXT_HTML))<a name="line.592"></a>
+<span class="sourceLineNo">593</span>            {<a name="line.593"></a>
+<span class="sourceLineNo">594</span>                // apply default charset if one has been set<a name="line.594"></a>
+<span class="sourceLineNo">595</span>                if (EmailUtils.isNotEmpty(this.charset))<a name="line.595"></a>
+<span class="sourceLineNo">596</span>                {<a name="line.596"></a>
+<span class="sourceLineNo">597</span>                    msgHtml.setContent(this.html, EmailConstants.TEXT_HTML + "; charset=" + this.charset);<a name="line.597"></a>
+<span class="sourceLineNo">598</span>                }<a name="line.598"></a>
+<span class="sourceLineNo">599</span>                else<a name="line.599"></a>
+<span class="sourceLineNo">600</span>                {<a name="line.600"></a>
+<span class="sourceLineNo">601</span>                    // unfortunately, MimeUtility.getDefaultMIMECharset() is package private<a name="line.601"></a>
+<span class="sourceLineNo">602</span>                    // and thus can not be used to set the default system charset in case<a name="line.602"></a>
+<span class="sourceLineNo">603</span>                    // no charset has been provided by the user<a name="line.603"></a>
+<span class="sourceLineNo">604</span>                    msgHtml.setContent(this.html, EmailConstants.TEXT_HTML);<a name="line.604"></a>
+<span class="sourceLineNo">605</span>                }<a name="line.605"></a>
+<span class="sourceLineNo">606</span>            }<a name="line.606"></a>
+<span class="sourceLineNo">607</span><a name="line.607"></a>
+<span class="sourceLineNo">608</span>            for (final InlineImage image : this.inlineEmbeds.values())<a name="line.608"></a>
+<span class="sourceLineNo">609</span>            {<a name="line.609"></a>
+<span class="sourceLineNo">610</span>                bodyEmbedsContainer.addBodyPart(image.getMbp());<a name="line.610"></a>
+<span class="sourceLineNo">611</span>            }<a name="line.611"></a>
+<span class="sourceLineNo">612</span>        }<a name="line.612"></a>
 <span class="sourceLineNo">613</span><a name="line.613"></a>
-<span class="sourceLineNo">614</span>        /**<a name="line.614"></a>
-<span class="sourceLineNo">615</span>         * Creates an InlineImage object to represent the<a name="line.615"></a>
-<span class="sourceLineNo">616</span>         * specified content ID and &lt;code&gt;MimeBodyPart&lt;/code&gt;.<a name="line.616"></a>
-<span class="sourceLineNo">617</span>         * @param cid the generated content ID<a name="line.617"></a>
-<span class="sourceLineNo">618</span>         * @param dataSource the &lt;code&gt;DataSource&lt;/code&gt; that represents the content<a name="line.618"></a>
-<span class="sourceLineNo">619</span>         * @param mbp the &lt;code&gt;MimeBodyPart&lt;/code&gt; that contains the encoded<a name="line.619"></a>
-<span class="sourceLineNo">620</span>         * data<a name="line.620"></a>
-<span class="sourceLineNo">621</span>         */<a name="line.621"></a>
-<span class="sourceLineNo">622</span>        public InlineImage(final String cid, final DataSource dataSource, final MimeBodyPart mbp)<a name="line.622"></a>
-<span class="sourceLineNo">623</span>        {<a name="line.623"></a>
-<span class="sourceLineNo">624</span>            this.cid = cid;<a name="line.624"></a>
-<span class="sourceLineNo">625</span>            this.dataSource = dataSource;<a name="line.625"></a>
-<span class="sourceLineNo">626</span>            this.mbp = mbp;<a name="line.626"></a>
-<span class="sourceLineNo">627</span>        }<a name="line.627"></a>
-<span class="sourceLineNo">628</span><a name="line.628"></a>
-<span class="sourceLineNo">629</span>        /**<a name="line.629"></a>
-<span class="sourceLineNo">630</span>         * Returns the unique content ID of this InlineImage.<a name="line.630"></a>
-<span class="sourceLineNo">631</span>         * @return the unique content ID of this InlineImage<a name="line.631"></a>
-<span class="sourceLineNo">632</span>         */<a name="line.632"></a>
-<span class="sourceLineNo">633</span>        public String getCid()<a name="line.633"></a>
-<span class="sourceLineNo">634</span>        {<a name="line.634"></a>
-<span class="sourceLineNo">635</span>            return cid;<a name="line.635"></a>
-<span class="sourceLineNo">636</span>        }<a name="line.636"></a>
-<span class="sourceLineNo">637</span><a name="line.637"></a>
-<span class="sourceLineNo">638</span>        /**<a name="line.638"></a>
-<span class="sourceLineNo">639</span>         * Returns the &lt;code&gt;DataSource&lt;/code&gt; that represents the encoded content.<a name="line.639"></a>
-<span class="sourceLineNo">640</span>         * @return the &lt;code&gt;DataSource&lt;/code&gt; representing the encoded content<a name="line.640"></a>
-<span class="sourceLineNo">641</span>         */<a name="line.641"></a>
-<span class="sourceLineNo">642</span>        public DataSource getDataSource()<a name="line.642"></a>
-<span class="sourceLineNo">643</span>        {<a name="line.643"></a>
-<span class="sourceLineNo">644</span>            return dataSource;<a name="line.644"></a>
-<span class="sourceLineNo">645</span>        }<a name="line.645"></a>
-<span class="sourceLineNo">646</span><a name="line.646"></a>
-<span class="sourceLineNo">647</span>        /**<a name="line.647"></a>
-<span class="sourceLineNo">648</span>         * Returns the &lt;code&gt;MimeBodyPart&lt;/code&gt; that contains the<a name="line.648"></a>
-<span class="sourceLineNo">649</span>         * encoded InlineImage data.<a name="line.649"></a>
-<span class="sourceLineNo">650</span>         * @return the &lt;code&gt;MimeBodyPart&lt;/code&gt; containing the encoded<a name="line.650"></a>
-<span class="sourceLineNo">651</span>         * InlineImage data<a name="line.651"></a>
-<span class="sourceLineNo">652</span>         */<a name="line.652"></a>
-<span class="sourceLineNo">653</span>        public MimeBodyPart getMbp()<a name="line.653"></a>
-<span class="sourceLineNo">654</span>        {<a name="line.654"></a>
-<span class="sourceLineNo">655</span>            return mbp;<a name="line.655"></a>
-<span class="sourceLineNo">656</span>        }<a name="line.656"></a>
-<span class="sourceLineNo">657</span><a name="line.657"></a>
-<span class="sourceLineNo">658</span>        // equals()/hashCode() implementations, since this class<a name="line.658"></a>
-<span class="sourceLineNo">659</span>        // is stored as a entry in a Map.<a name="line.659"></a>
-<span class="sourceLineNo">660</span>        /**<a name="line.660"></a>
-<span class="sourceLineNo">661</span>         * {@inheritDoc}<a name="line.661"></a>
-<span class="sourceLineNo">662</span>         * @return true if the other object is also an InlineImage with the same cid.<a name="line.662"></a>
-<span class="sourceLineNo">663</span>         */<a name="line.663"></a>
-<span class="sourceLineNo">664</span>        @Override<a name="line.664"></a>
-<span class="sourceLineNo">665</span>        public boolean equals(final Object obj)<a name="line.665"></a>
-<span class="sourceLineNo">666</span>        {<a name="line.666"></a>
-<span class="sourceLineNo">667</span>            if (this == obj)<a name="line.667"></a>
-<span class="sourceLineNo">668</span>            {<a name="line.668"></a>
-<span class="sourceLineNo">669</span>                return true;<a name="line.669"></a>
-<span class="sourceLineNo">670</span>            }<a name="line.670"></a>
-<span class="sourceLineNo">671</span>            if (!(obj instanceof InlineImage))<a name="line.671"></a>
-<span class="sourceLineNo">672</span>            {<a name="line.672"></a>
-<span class="sourceLineNo">673</span>                return false;<a name="line.673"></a>
-<span class="sourceLineNo">674</span>            }<a name="line.674"></a>
-<span class="sourceLineNo">675</span><a name="line.675"></a>
-<span class="sourceLineNo">676</span>            final InlineImage that = (InlineImage) obj;<a name="line.676"></a>
-<span class="sourceLineNo">677</span><a name="line.677"></a>
-<span class="sourceLineNo">678</span>            return this.cid.equals(that.cid);<a name="line.678"></a>
-<span class="sourceLineNo">679</span>        }<a name="line.679"></a>
-<span class="sourceLineNo">680</span><a name="line.680"></a>
-<span class="sourceLineNo">681</span>        /**<a name="line.681"></a>
-<span class="sourceLineNo">682</span>         * {@inheritDoc}<a name="line.682"></a>
-<span class="sourceLineNo">683</span>         * @return the cid hashCode.<a name="line.683"></a>
-<span class="sourceLineNo">684</span>         */<a name="line.684"></a>
-<span class="sourceLineNo">685</span>        @Override<a name="line.685"></a>
-<span class="sourceLineNo">686</span>        public int hashCode()<a name="line.686"></a>
-<span class="sourceLineNo">687</span>        {<a name="line.687"></a>
-<span class="sourceLineNo">688</span>            return cid.hashCode();<a name="line.688"></a>
-<span class="sourceLineNo">689</span>        }<a name="line.689"></a>
-<span class="sourceLineNo">690</span>    }<a name="line.690"></a>
-<span class="sourceLineNo">691</span>}<a name="line.691"></a>
+<span class="sourceLineNo">614</span>        if (EmailUtils.isNotEmpty(this.text))<a name="line.614"></a>
+<span class="sourceLineNo">615</span>        {<a name="line.615"></a>
+<span class="sourceLineNo">616</span>            msgText = new MimeBodyPart();<a name="line.616"></a>
+<span class="sourceLineNo">617</span>            bodyContainer.addBodyPart(msgText, 0);<a name="line.617"></a>
+<span class="sourceLineNo">618</span><a name="line.618"></a>
+<span class="sourceLineNo">619</span>            // EMAIL-104: call explicitly setText to use default mime charset<a name="line.619"></a>
+<span class="sourceLineNo">620</span>            //            (property "mail.mime.charset") in case none has been set<a name="line.620"></a>
+<span class="sourceLineNo">621</span>            msgText.setText(this.text, this.charset);<a name="line.621"></a>
+<span class="sourceLineNo">622</span>        }<a name="line.622"></a>
+<span class="sourceLineNo">623</span>    }<a name="line.623"></a>
+<span class="sourceLineNo">624</span><a name="line.624"></a>
+<span class="sourceLineNo">625</span>    /**<a name="line.625"></a>
+<span class="sourceLineNo">626</span>     * Private bean class that encapsulates data about URL contents<a name="line.626"></a>
+<span class="sourceLineNo">627</span>     * that are embedded in the final email.<a name="line.627"></a>
+<span class="sourceLineNo">628</span>     * @since 1.1<a name="line.628"></a>
+<span class="sourceLineNo">629</span>     */<a name="line.629"></a>
+<span class="sourceLineNo">630</span>    private static class InlineImage<a name="line.630"></a>
+<span class="sourceLineNo">631</span>    {<a name="line.631"></a>
+<span class="sourceLineNo">632</span>        /** content id. */<a name="line.632"></a>
+<span class="sourceLineNo">633</span>        private final String cid;<a name="line.633"></a>
+<span class="sourceLineNo">634</span>        /** &lt;code&gt;DataSource&lt;/code&gt; for the content. */<a name="line.634"></a>
+<span class="sourceLineNo">635</span>        private final DataSource dataSource;<a name="line.635"></a>
+<span class="sourceLineNo">636</span>        /** the &lt;code&gt;MimeBodyPart&lt;/code&gt; that contains the encoded data. */<a name="line.636"></a>
+<span class="sourceLineNo">637</span>        private final MimeBodyPart mbp;<a name="line.637"></a>
+<span class="sourceLineNo">638</span><a name="line.638"></a>
+<span class="sourceLineNo">639</span>        /**<a name="line.639"></a>
+<span class="sourceLineNo">640</span>         * Creates an InlineImage object to represent the<a name="line.640"></a>
+<span class="sourceLineNo">641</span>         * specified content ID and &lt;code&gt;MimeBodyPart&lt;/code&gt;.<a name="line.641"></a>
+<span class="sourceLineNo">642</span>         * @param cid the generated content ID<a name="line.642"></a>
+<span class="sourceLineNo">643</span>         * @param dataSource the &lt;code&gt;DataSource&lt;/code&gt; that represents the content<a name="line.643"></a>
+<span class="sourceLineNo">644</span>         * @param mbp the &lt;code&gt;MimeBodyPart&lt;/code&gt; that contains the encoded<a name="line.644"></a>
+<span class="sourceLineNo">645</span>         * data<a name="line.645"></a>
+<span class="sourceLineNo">646</span>         */<a name="line.646"></a>
+<span class="sourceLineNo">647</span>        public InlineImage(final String cid, final DataSource dataSource, final MimeBodyPart mbp)<a name="line.647"></a>
+<span class="sourceLineNo">648</span>        {<a name="line.648"></a>
+<span class="sourceLineNo">649</span>            this.cid = cid;<a name="line.649"></a>
+<span class="sourceLineNo">650</span>            this.dataSource = dataSource;<a name="line.650"></a>
+<span class="sourceLineNo">651</span>            this.mbp = mbp;<a name="line.651"></a>
+<span class="sourceLineNo">652</span>        }<a name="line.652"></a>
+<span class="sourceLineNo">653</span><a name="line.653"></a>
+<span class="sourceLineNo">654</span>        /**<a name="line.654"></a>
+<span class="sourceLineNo">655</span>         * Returns the unique content ID of this InlineImage.<a name="line.655"></a>
+<span class="sourceLineNo">656</span>         * @return the unique content ID of this InlineImage<a name="line.656"></a>
+<span class="sourceLineNo">657</span>         */<a name="line.657"></a>
+<span class="sourceLineNo">658</span>        public String getCid()<a name="line.658"></a>
+<span class="sourceLineNo">659</span>        {<a name="line.659"></a>
+<span class="sourceLineNo">660</span>            return cid;<a name="line.660"></a>
+<span class="sourceLineNo">661</span>        }<a name="line.661"></a>
+<span class="sourceLineNo">662</span><a name="line.662"></a>
+<span class="sourceLineNo">663</span>        /**<a name="line.663"></a>
+<span class="sourceLineNo">664</span>         * Returns the &lt;code&gt;DataSource&lt;/code&gt; that represents the encoded content.<a name="line.664"></a>
+<span class="sourceLineNo">665</span>         * @return the &lt;code&gt;DataSource&lt;/code&gt; representing the encoded content<a name="line.665"></a>
+<span class="sourceLineNo">666</span>         */<a name="line.666"></a>
+<span class="sourceLineNo">667</span>        public DataSource getDataSource()<a name="line.667"></a>
+<span class="sourceLineNo">668</span>        {<a name="line.668"></a>
+<span class="sourceLineNo">669</span>            return dataSource;<a name="line.669"></a>
+<span class="sourceLineNo">670</span>        }<a name="line.670"></a>
+<span class="sourceLineNo">671</span><a name="line.671"></a>
+<span class="sourceLineNo">672</span>        /**<a name="line.672"></a>
+<span class="sourceLineNo">673</span>         * Returns the &lt;code&gt;MimeBodyPart&lt;/code&gt; that contains the<a name="line.673"></a>
+<span class="sourceLineNo">674</span>         * encoded InlineImage data.<a name="line.674"></a>
+<span class="sourceLineNo">675</span>         * @return the &lt;code&gt;MimeBodyPart&lt;/code&gt; containing the encoded<a name="line.675"></a>
+<span class="sourceLineNo">676</span>         * InlineImage data<a name="line.676"></a>
+<span class="sourceLineNo">677</span>         */<a name="line.677"></a>
+<span class="sourceLineNo">678</span>        public MimeBodyPart getMbp()<a name="line.678"></a>
+<span class="sourceLineNo">679</span>        {<a name="line.679"></a>
+<span class="sourceLineNo">680</span>            return mbp;<a name="line.680"></a>
+<span class="sourceLineNo">681</span>        }<a name="line.681"></a>
+<span class="sourceLineNo">682</span><a name="line.682"></a>
+<span class="sourceLineNo">683</span>        // equals()/hashCode() implementations, since this class<a name="line.683"></a>
+<span class="sourceLineNo">684</span>        // is stored as a entry in a Map.<a name="line.684"></a>
+<span class="sourceLineNo">685</span>        /**<a name="line.685"></a>
+<span class="sourceLineNo">686</span>         * {@inheritDoc}<a name="line.686"></a>
+<span class="sourceLineNo">687</span>         * @return true if the other object is also an InlineImage with the same cid.<a name="line.687"></a>
+<span class="sourceLineNo">688</span>         */<a name="line.688"></a>
+<span class="sourceLineNo">689</span>        @Override<a name="line.689"></a>
+<span class="sourceLineNo">690</span>        public boolean equals(final Object obj)<a name="line.690"></a>
+<span class="sourceLineNo">691</span>        {<a name="line.691"></a>
+<span class="sourceLineNo">692</span>            if (this == obj)<a name="line.692"></a>
+<span class="sourceLineNo">693</span>            {<a name="line.693"></a>
+<span class="sourceLineNo">694</span>                return true;<a name="line.694"></a>
+<span class="sourceLineNo">695</span>            }<a name="line.695"></a>
+<span class="sourceLineNo">696</span>            if (!(obj instanceof InlineImage))<a name="line.696"></a>
+<span class="sourceLineNo">697</span>            {<a name="line.697"></a>
+<span class="sourceLineNo">698</span>                return false;<a name="line.698"></a>
+<span class="sourceLineNo">699</span>            }<a name="line.699"></a>
+<span class="sourceLineNo">700</span><a name="line.700"></a>
+<span class="sourceLineNo">701</span>            final InlineImage that = (InlineImage) obj;<a name="line.701"></a>
+<span class="sourceLineNo">702</span><a name="line.702"></a>
+<span class="sourceLineNo">703</span>            return this.cid.equals(that.cid);<a name="line.703"></a>
+<span class="sourceLineNo">704</span>        }<a name="line.704"></a>
+<span class="sourceLineNo">705</span><a name="line.705"></a>
+<span class="sourceLineNo">706</span>        /**<a name="line.706"></a>
+<span class="sourceLineNo">707</span>         * {@inheritDoc}<a name="line.707"></a>
+<span class="sourceLineNo">708</span>         * @return the cid hashCode.<a name="line.708"></a>
+<span class="sourceLineNo">709</span>         */<a name="line.709"></a>
+<span class="sourceLineNo">710</span>        @Override<a name="line.710"></a>
+<span class="sourceLineNo">711</span>        public int hashCode()<a name="line.711"></a>
+<span class="sourceLineNo">712</span>        {<a name="line.712"></a>
+<span class="sourceLineNo">713</span>            return cid.hashCode();<a name="line.713"></a>
+<span class="sourceLineNo">714</span>        }<a name="line.714"></a>
+<span class="sourceLineNo">715</span>    }<a name="line.715"></a>
+<span class="sourceLineNo">716</span>}<a name="line.716"></a>
 
 
 
@@ -760,4 +785,4 @@
 </pre>
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>



Mime
View raw message