You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@commons.apache.org by tn...@apache.org on 2015/05/23 08:51:00 UTC
svn commit: r952406 [17/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...
Modified: websites/production/commons/content/proper/commons-email/apidocs/src-html/org/apache/commons/mail/util/MimeMessageParser.html
==============================================================================
--- websites/production/commons/content/proper/commons-email/apidocs/src-html/org/apache/commons/mail/util/MimeMessageParser.html (original)
+++ websites/production/commons/content/proper/commons-email/apidocs/src-html/org/apache/commons/mail/util/MimeMessageParser.html Sat May 23 06:50:57 2015
@@ -32,388 +32,437 @@
<span class="sourceLineNo">024</span>import java.io.UnsupportedEncodingException;<a name="line.24"></a>
<span class="sourceLineNo">025</span>import java.util.ArrayList;<a name="line.25"></a>
<span class="sourceLineNo">026</span>import java.util.Arrays;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import java.util.List;<a name="line.27"></a>
-<span class="sourceLineNo">028</span><a name="line.28"></a>
-<span class="sourceLineNo">029</span>import javax.activation.DataHandler;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import javax.activation.DataSource;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import javax.mail.Message;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import javax.mail.MessagingException;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import javax.mail.Multipart;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import javax.mail.Part;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import javax.mail.internet.ContentType;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import javax.mail.internet.InternetAddress;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import javax.mail.internet.MimeBodyPart;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import javax.mail.internet.MimeMessage;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import javax.mail.internet.MimePart;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import javax.mail.internet.MimeUtility;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import javax.mail.internet.ParseException;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import javax.mail.util.ByteArrayDataSource;<a name="line.42"></a>
-<span class="sourceLineNo">043</span><a name="line.43"></a>
-<span class="sourceLineNo">044</span>/**<a name="line.44"></a>
-<span class="sourceLineNo">045</span> * Parses a MimeMessage and stores the individual parts such a plain text,<a name="line.45"></a>
-<span class="sourceLineNo">046</span> * HTML text and attachments.<a name="line.46"></a>
-<span class="sourceLineNo">047</span> *<a name="line.47"></a>
-<span class="sourceLineNo">048</span> * @since 1.3<a name="line.48"></a>
-<span class="sourceLineNo">049</span> * @version $Id: MimeMessageParser.java 1606710 2014-06-30 12:29:13Z ggregory $<a name="line.49"></a>
-<span class="sourceLineNo">050</span> */<a name="line.50"></a>
-<span class="sourceLineNo">051</span>public class MimeMessageParser<a name="line.51"></a>
-<span class="sourceLineNo">052</span>{<a name="line.52"></a>
-<span class="sourceLineNo">053</span> /** The MimeMessage to convert */<a name="line.53"></a>
-<span class="sourceLineNo">054</span> private final MimeMessage mimeMessage;<a name="line.54"></a>
-<span class="sourceLineNo">055</span><a name="line.55"></a>
-<span class="sourceLineNo">056</span> /** Plain mail content from MimeMessage */<a name="line.56"></a>
-<span class="sourceLineNo">057</span> private String plainContent;<a name="line.57"></a>
-<span class="sourceLineNo">058</span><a name="line.58"></a>
-<span class="sourceLineNo">059</span> /** Html mail content from MimeMessage */<a name="line.59"></a>
-<span class="sourceLineNo">060</span> private String htmlContent;<a name="line.60"></a>
-<span class="sourceLineNo">061</span><a name="line.61"></a>
-<span class="sourceLineNo">062</span> /** List of attachments of MimeMessage */<a name="line.62"></a>
-<span class="sourceLineNo">063</span> private final List<DataSource> attachmentList;<a name="line.63"></a>
-<span class="sourceLineNo">064</span><a name="line.64"></a>
-<span class="sourceLineNo">065</span> /** Is this a Multipart email */<a name="line.65"></a>
-<span class="sourceLineNo">066</span> private boolean isMultiPart;<a name="line.66"></a>
-<span class="sourceLineNo">067</span><a name="line.67"></a>
-<span class="sourceLineNo">068</span> /**<a name="line.68"></a>
-<span class="sourceLineNo">069</span> * Constructs an instance with the MimeMessage to be extracted.<a name="line.69"></a>
-<span class="sourceLineNo">070</span> *<a name="line.70"></a>
-<span class="sourceLineNo">071</span> * @param message the message to parse<a name="line.71"></a>
-<span class="sourceLineNo">072</span> */<a name="line.72"></a>
-<span class="sourceLineNo">073</span> public MimeMessageParser(final MimeMessage message)<a name="line.73"></a>
-<span class="sourceLineNo">074</span> {<a name="line.74"></a>
-<span class="sourceLineNo">075</span> attachmentList = new ArrayList<DataSource>();<a name="line.75"></a>
-<span class="sourceLineNo">076</span> this.mimeMessage = message;<a name="line.76"></a>
-<span class="sourceLineNo">077</span> this.isMultiPart = false;<a name="line.77"></a>
-<span class="sourceLineNo">078</span> }<a name="line.78"></a>
-<span class="sourceLineNo">079</span><a name="line.79"></a>
-<span class="sourceLineNo">080</span> /**<a name="line.80"></a>
-<span class="sourceLineNo">081</span> * Does the actual extraction.<a name="line.81"></a>
-<span class="sourceLineNo">082</span> *<a name="line.82"></a>
-<span class="sourceLineNo">083</span> * @return this instance<a name="line.83"></a>
-<span class="sourceLineNo">084</span> * @throws Exception parsing the mime message failed<a name="line.84"></a>
-<span class="sourceLineNo">085</span> */<a name="line.85"></a>
-<span class="sourceLineNo">086</span> public MimeMessageParser parse() throws Exception<a name="line.86"></a>
-<span class="sourceLineNo">087</span> {<a name="line.87"></a>
-<span class="sourceLineNo">088</span> this.parse(null, mimeMessage);<a name="line.88"></a>
-<span class="sourceLineNo">089</span> return this;<a name="line.89"></a>
-<span class="sourceLineNo">090</span> }<a name="line.90"></a>
-<span class="sourceLineNo">091</span><a name="line.91"></a>
-<span class="sourceLineNo">092</span> /**<a name="line.92"></a>
-<span class="sourceLineNo">093</span> * @return the 'to' recipients of the message<a name="line.93"></a>
-<span class="sourceLineNo">094</span> * @throws Exception determining the recipients failed<a name="line.94"></a>
-<span class="sourceLineNo">095</span> */<a name="line.95"></a>
-<span class="sourceLineNo">096</span> public List<javax.mail.Address> getTo() throws Exception<a name="line.96"></a>
-<span class="sourceLineNo">097</span> {<a name="line.97"></a>
-<span class="sourceLineNo">098</span> final javax.mail.Address[] recipients = this.mimeMessage.getRecipients(Message.RecipientType.TO);<a name="line.98"></a>
-<span class="sourceLineNo">099</span> return recipients != null ? Arrays.asList(recipients) : new ArrayList<javax.mail.Address>();<a name="line.99"></a>
-<span class="sourceLineNo">100</span> }<a name="line.100"></a>
-<span class="sourceLineNo">101</span><a name="line.101"></a>
-<span class="sourceLineNo">102</span> /**<a name="line.102"></a>
-<span class="sourceLineNo">103</span> * @return the 'cc' recipients of the message<a name="line.103"></a>
-<span class="sourceLineNo">104</span> * @throws Exception determining the recipients failed<a name="line.104"></a>
-<span class="sourceLineNo">105</span> */<a name="line.105"></a>
-<span class="sourceLineNo">106</span> public List<javax.mail.Address> getCc() throws Exception<a name="line.106"></a>
-<span class="sourceLineNo">107</span> {<a name="line.107"></a>
-<span class="sourceLineNo">108</span> final javax.mail.Address[] recipients = this.mimeMessage.getRecipients(Message.RecipientType.CC);<a name="line.108"></a>
-<span class="sourceLineNo">109</span> return recipients != null ? Arrays.asList(recipients) : new ArrayList<javax.mail.Address>();<a name="line.109"></a>
-<span class="sourceLineNo">110</span> }<a name="line.110"></a>
-<span class="sourceLineNo">111</span><a name="line.111"></a>
-<span class="sourceLineNo">112</span> /**<a name="line.112"></a>
-<span class="sourceLineNo">113</span> * @return the 'bcc' recipients of the message<a name="line.113"></a>
-<span class="sourceLineNo">114</span> * @throws Exception determining the recipients failed<a name="line.114"></a>
-<span class="sourceLineNo">115</span> */<a name="line.115"></a>
-<span class="sourceLineNo">116</span> public List<javax.mail.Address> getBcc() throws Exception<a name="line.116"></a>
-<span class="sourceLineNo">117</span> {<a name="line.117"></a>
-<span class="sourceLineNo">118</span> final javax.mail.Address[] recipients = this.mimeMessage.getRecipients(Message.RecipientType.BCC);<a name="line.118"></a>
-<span class="sourceLineNo">119</span> return recipients != null ? Arrays.asList(recipients) : new ArrayList<javax.mail.Address>();<a name="line.119"></a>
-<span class="sourceLineNo">120</span> }<a name="line.120"></a>
-<span class="sourceLineNo">121</span><a name="line.121"></a>
-<span class="sourceLineNo">122</span> /**<a name="line.122"></a>
-<span class="sourceLineNo">123</span> * @return the 'from' field of the message<a name="line.123"></a>
-<span class="sourceLineNo">124</span> * @throws Exception parsing the mime message failed<a name="line.124"></a>
-<span class="sourceLineNo">125</span> */<a name="line.125"></a>
-<span class="sourceLineNo">126</span> public String getFrom() throws Exception<a name="line.126"></a>
-<span class="sourceLineNo">127</span> {<a name="line.127"></a>
-<span class="sourceLineNo">128</span> final javax.mail.Address[] addresses = this.mimeMessage.getFrom();<a name="line.128"></a>
-<span class="sourceLineNo">129</span> if (addresses == null || addresses.length == 0)<a name="line.129"></a>
-<span class="sourceLineNo">130</span> {<a name="line.130"></a>
-<span class="sourceLineNo">131</span> return null;<a name="line.131"></a>
-<span class="sourceLineNo">132</span> }<a name="line.132"></a>
-<span class="sourceLineNo">133</span> else<a name="line.133"></a>
-<span class="sourceLineNo">134</span> {<a name="line.134"></a>
-<span class="sourceLineNo">135</span> return ((InternetAddress) addresses[0]).getAddress();<a name="line.135"></a>
-<span class="sourceLineNo">136</span> }<a name="line.136"></a>
-<span class="sourceLineNo">137</span> }<a name="line.137"></a>
-<span class="sourceLineNo">138</span><a name="line.138"></a>
-<span class="sourceLineNo">139</span> /**<a name="line.139"></a>
-<span class="sourceLineNo">140</span> * @return the 'replyTo' address of the email<a name="line.140"></a>
-<span class="sourceLineNo">141</span> * @throws Exception parsing the mime message failed<a name="line.141"></a>
-<span class="sourceLineNo">142</span> */<a name="line.142"></a>
-<span class="sourceLineNo">143</span> public String getReplyTo() throws Exception<a name="line.143"></a>
-<span class="sourceLineNo">144</span> {<a name="line.144"></a>
-<span class="sourceLineNo">145</span> final javax.mail.Address[] addresses = this.mimeMessage.getReplyTo();<a name="line.145"></a>
-<span class="sourceLineNo">146</span> if (addresses == null || addresses.length == 0)<a name="line.146"></a>
-<span class="sourceLineNo">147</span> {<a name="line.147"></a>
-<span class="sourceLineNo">148</span> return null;<a name="line.148"></a>
-<span class="sourceLineNo">149</span> }<a name="line.149"></a>
-<span class="sourceLineNo">150</span> else<a name="line.150"></a>
-<span class="sourceLineNo">151</span> {<a name="line.151"></a>
-<span class="sourceLineNo">152</span> return ((InternetAddress) addresses[0]).getAddress();<a name="line.152"></a>
-<span class="sourceLineNo">153</span> }<a name="line.153"></a>
-<span class="sourceLineNo">154</span> }<a name="line.154"></a>
-<span class="sourceLineNo">155</span><a name="line.155"></a>
-<span class="sourceLineNo">156</span> /**<a name="line.156"></a>
-<span class="sourceLineNo">157</span> * @return the mail subject<a name="line.157"></a>
-<span class="sourceLineNo">158</span> * @throws Exception parsing the mime message failed<a name="line.158"></a>
-<span class="sourceLineNo">159</span> */<a name="line.159"></a>
-<span class="sourceLineNo">160</span> public String getSubject() throws Exception<a name="line.160"></a>
-<span class="sourceLineNo">161</span> {<a name="line.161"></a>
-<span class="sourceLineNo">162</span> return this.mimeMessage.getSubject();<a name="line.162"></a>
-<span class="sourceLineNo">163</span> }<a name="line.163"></a>
-<span class="sourceLineNo">164</span><a name="line.164"></a>
-<span class="sourceLineNo">165</span> /**<a name="line.165"></a>
-<span class="sourceLineNo">166</span> * Extracts the content of a MimeMessage recursively.<a name="line.166"></a>
-<span class="sourceLineNo">167</span> *<a name="line.167"></a>
-<span class="sourceLineNo">168</span> * @param parent the parent multi-part<a name="line.168"></a>
-<span class="sourceLineNo">169</span> * @param part the current MimePart<a name="line.169"></a>
-<span class="sourceLineNo">170</span> * @throws MessagingException parsing the MimeMessage failed<a name="line.170"></a>
-<span class="sourceLineNo">171</span> * @throws IOException parsing the MimeMessage failed<a name="line.171"></a>
-<span class="sourceLineNo">172</span> */<a name="line.172"></a>
-<span class="sourceLineNo">173</span> protected void parse(final Multipart parent, final MimePart part)<a name="line.173"></a>
-<span class="sourceLineNo">174</span> throws MessagingException, IOException<a name="line.174"></a>
-<span class="sourceLineNo">175</span> {<a name="line.175"></a>
-<span class="sourceLineNo">176</span> if (isMimeType(part, "text/plain") && plainContent == null<a name="line.176"></a>
-<span class="sourceLineNo">177</span> && !MimePart.ATTACHMENT.equalsIgnoreCase(part.getDisposition()))<a name="line.177"></a>
-<span class="sourceLineNo">178</span> {<a name="line.178"></a>
-<span class="sourceLineNo">179</span> plainContent = (String) part.getContent();<a name="line.179"></a>
-<span class="sourceLineNo">180</span> }<a name="line.180"></a>
-<span class="sourceLineNo">181</span> else<a name="line.181"></a>
-<span class="sourceLineNo">182</span> {<a name="line.182"></a>
-<span class="sourceLineNo">183</span> if (isMimeType(part, "text/html") && htmlContent == null<a name="line.183"></a>
-<span class="sourceLineNo">184</span> && !MimePart.ATTACHMENT.equalsIgnoreCase(part.getDisposition()))<a name="line.184"></a>
-<span class="sourceLineNo">185</span> {<a name="line.185"></a>
-<span class="sourceLineNo">186</span> htmlContent = (String) part.getContent();<a name="line.186"></a>
-<span class="sourceLineNo">187</span> }<a name="line.187"></a>
-<span class="sourceLineNo">188</span> else<a name="line.188"></a>
-<span class="sourceLineNo">189</span> {<a name="line.189"></a>
-<span class="sourceLineNo">190</span> if (isMimeType(part, "multipart/*"))<a name="line.190"></a>
-<span class="sourceLineNo">191</span> {<a name="line.191"></a>
-<span class="sourceLineNo">192</span> this.isMultiPart = true;<a name="line.192"></a>
-<span class="sourceLineNo">193</span> final Multipart mp = (Multipart) part.getContent();<a name="line.193"></a>
-<span class="sourceLineNo">194</span> final int count = mp.getCount();<a name="line.194"></a>
-<span class="sourceLineNo">195</span><a name="line.195"></a>
-<span class="sourceLineNo">196</span> // iterate over all MimeBodyPart<a name="line.196"></a>
+<span class="sourceLineNo">027</span>import java.util.Collection;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import java.util.Collections;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import java.util.HashMap;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import java.util.List;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import java.util.Map;<a name="line.31"></a>
+<span class="sourceLineNo">032</span><a name="line.32"></a>
+<span class="sourceLineNo">033</span>import javax.activation.DataHandler;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import javax.activation.DataSource;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import javax.mail.Message;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import javax.mail.MessagingException;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import javax.mail.Multipart;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import javax.mail.Part;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import javax.mail.internet.ContentType;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import javax.mail.internet.InternetAddress;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import javax.mail.internet.MimeBodyPart;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import javax.mail.internet.MimeMessage;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import javax.mail.internet.MimePart;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import javax.mail.internet.MimeUtility;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import javax.mail.internet.ParseException;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import javax.mail.util.ByteArrayDataSource;<a name="line.46"></a>
+<span class="sourceLineNo">047</span><a name="line.47"></a>
+<span class="sourceLineNo">048</span>/**<a name="line.48"></a>
+<span class="sourceLineNo">049</span> * Parses a MimeMessage and stores the individual parts such a plain text,<a name="line.49"></a>
+<span class="sourceLineNo">050</span> * HTML text and attachments.<a name="line.50"></a>
+<span class="sourceLineNo">051</span> *<a name="line.51"></a>
+<span class="sourceLineNo">052</span> * @since 1.3<a name="line.52"></a>
+<span class="sourceLineNo">053</span> * @version $Id: MimeMessageParser.java 1632031 2014-10-15 13:51:18Z ggregory $<a name="line.53"></a>
+<span class="sourceLineNo">054</span> */<a name="line.54"></a>
+<span class="sourceLineNo">055</span>public class MimeMessageParser<a name="line.55"></a>
+<span class="sourceLineNo">056</span>{<a name="line.56"></a>
+<span class="sourceLineNo">057</span> /** The MimeMessage to convert */<a name="line.57"></a>
+<span class="sourceLineNo">058</span> private final MimeMessage mimeMessage;<a name="line.58"></a>
+<span class="sourceLineNo">059</span><a name="line.59"></a>
+<span class="sourceLineNo">060</span> /** Plain mail content from MimeMessage */<a name="line.60"></a>
+<span class="sourceLineNo">061</span> private String plainContent;<a name="line.61"></a>
+<span class="sourceLineNo">062</span><a name="line.62"></a>
+<span class="sourceLineNo">063</span> /** Html mail content from MimeMessage */<a name="line.63"></a>
+<span class="sourceLineNo">064</span> private String htmlContent;<a name="line.64"></a>
+<span class="sourceLineNo">065</span><a name="line.65"></a>
+<span class="sourceLineNo">066</span> /** List of attachments of MimeMessage */<a name="line.66"></a>
+<span class="sourceLineNo">067</span> private final List<DataSource> attachmentList;<a name="line.67"></a>
+<span class="sourceLineNo">068</span><a name="line.68"></a>
+<span class="sourceLineNo">069</span> /** Attachments stored by their content-id */<a name="line.69"></a>
+<span class="sourceLineNo">070</span> private final Map<String, DataSource> cidMap;<a name="line.70"></a>
+<span class="sourceLineNo">071</span><a name="line.71"></a>
+<span class="sourceLineNo">072</span> /** Is this a Multipart email */<a name="line.72"></a>
+<span class="sourceLineNo">073</span> private boolean isMultiPart;<a name="line.73"></a>
+<span class="sourceLineNo">074</span><a name="line.74"></a>
+<span class="sourceLineNo">075</span> /**<a name="line.75"></a>
+<span class="sourceLineNo">076</span> * Constructs an instance with the MimeMessage to be extracted.<a name="line.76"></a>
+<span class="sourceLineNo">077</span> *<a name="line.77"></a>
+<span class="sourceLineNo">078</span> * @param message the message to parse<a name="line.78"></a>
+<span class="sourceLineNo">079</span> */<a name="line.79"></a>
+<span class="sourceLineNo">080</span> public MimeMessageParser(final MimeMessage message)<a name="line.80"></a>
+<span class="sourceLineNo">081</span> {<a name="line.81"></a>
+<span class="sourceLineNo">082</span> attachmentList = new ArrayList<DataSource>();<a name="line.82"></a>
+<span class="sourceLineNo">083</span> cidMap = new HashMap<String, DataSource>();<a name="line.83"></a>
+<span class="sourceLineNo">084</span> this.mimeMessage = message;<a name="line.84"></a>
+<span class="sourceLineNo">085</span> this.isMultiPart = false;<a name="line.85"></a>
+<span class="sourceLineNo">086</span> }<a name="line.86"></a>
+<span class="sourceLineNo">087</span><a name="line.87"></a>
+<span class="sourceLineNo">088</span> /**<a name="line.88"></a>
+<span class="sourceLineNo">089</span> * Does the actual extraction.<a name="line.89"></a>
+<span class="sourceLineNo">090</span> *<a name="line.90"></a>
+<span class="sourceLineNo">091</span> * @return this instance<a name="line.91"></a>
+<span class="sourceLineNo">092</span> * @throws Exception parsing the mime message failed<a name="line.92"></a>
+<span class="sourceLineNo">093</span> */<a name="line.93"></a>
+<span class="sourceLineNo">094</span> public MimeMessageParser parse() throws Exception<a name="line.94"></a>
+<span class="sourceLineNo">095</span> {<a name="line.95"></a>
+<span class="sourceLineNo">096</span> this.parse(null, mimeMessage);<a name="line.96"></a>
+<span class="sourceLineNo">097</span> return this;<a name="line.97"></a>
+<span class="sourceLineNo">098</span> }<a name="line.98"></a>
+<span class="sourceLineNo">099</span><a name="line.99"></a>
+<span class="sourceLineNo">100</span> /**<a name="line.100"></a>
+<span class="sourceLineNo">101</span> * @return the 'to' recipients of the message<a name="line.101"></a>
+<span class="sourceLineNo">102</span> * @throws Exception determining the recipients failed<a name="line.102"></a>
+<span class="sourceLineNo">103</span> */<a name="line.103"></a>
+<span class="sourceLineNo">104</span> public List<javax.mail.Address> getTo() throws Exception<a name="line.104"></a>
+<span class="sourceLineNo">105</span> {<a name="line.105"></a>
+<span class="sourceLineNo">106</span> final javax.mail.Address[] recipients = this.mimeMessage.getRecipients(Message.RecipientType.TO);<a name="line.106"></a>
+<span class="sourceLineNo">107</span> return recipients != null ? Arrays.asList(recipients) : new ArrayList<javax.mail.Address>();<a name="line.107"></a>
+<span class="sourceLineNo">108</span> }<a name="line.108"></a>
+<span class="sourceLineNo">109</span><a name="line.109"></a>
+<span class="sourceLineNo">110</span> /**<a name="line.110"></a>
+<span class="sourceLineNo">111</span> * @return the 'cc' recipients of the message<a name="line.111"></a>
+<span class="sourceLineNo">112</span> * @throws Exception determining the recipients failed<a name="line.112"></a>
+<span class="sourceLineNo">113</span> */<a name="line.113"></a>
+<span class="sourceLineNo">114</span> public List<javax.mail.Address> getCc() throws Exception<a name="line.114"></a>
+<span class="sourceLineNo">115</span> {<a name="line.115"></a>
+<span class="sourceLineNo">116</span> final javax.mail.Address[] recipients = this.mimeMessage.getRecipients(Message.RecipientType.CC);<a name="line.116"></a>
+<span class="sourceLineNo">117</span> return recipients != null ? Arrays.asList(recipients) : new ArrayList<javax.mail.Address>();<a name="line.117"></a>
+<span class="sourceLineNo">118</span> }<a name="line.118"></a>
+<span class="sourceLineNo">119</span><a name="line.119"></a>
+<span class="sourceLineNo">120</span> /**<a name="line.120"></a>
+<span class="sourceLineNo">121</span> * @return the 'bcc' recipients of the message<a name="line.121"></a>
+<span class="sourceLineNo">122</span> * @throws Exception determining the recipients failed<a name="line.122"></a>
+<span class="sourceLineNo">123</span> */<a name="line.123"></a>
+<span class="sourceLineNo">124</span> public List<javax.mail.Address> getBcc() throws Exception<a name="line.124"></a>
+<span class="sourceLineNo">125</span> {<a name="line.125"></a>
+<span class="sourceLineNo">126</span> final javax.mail.Address[] recipients = this.mimeMessage.getRecipients(Message.RecipientType.BCC);<a name="line.126"></a>
+<span class="sourceLineNo">127</span> return recipients != null ? Arrays.asList(recipients) : new ArrayList<javax.mail.Address>();<a name="line.127"></a>
+<span class="sourceLineNo">128</span> }<a name="line.128"></a>
+<span class="sourceLineNo">129</span><a name="line.129"></a>
+<span class="sourceLineNo">130</span> /**<a name="line.130"></a>
+<span class="sourceLineNo">131</span> * @return the 'from' field of the message<a name="line.131"></a>
+<span class="sourceLineNo">132</span> * @throws Exception parsing the mime message failed<a name="line.132"></a>
+<span class="sourceLineNo">133</span> */<a name="line.133"></a>
+<span class="sourceLineNo">134</span> public String getFrom() throws Exception<a name="line.134"></a>
+<span class="sourceLineNo">135</span> {<a name="line.135"></a>
+<span class="sourceLineNo">136</span> final javax.mail.Address[] addresses = this.mimeMessage.getFrom();<a name="line.136"></a>
+<span class="sourceLineNo">137</span> if (addresses == null || addresses.length == 0)<a name="line.137"></a>
+<span class="sourceLineNo">138</span> {<a name="line.138"></a>
+<span class="sourceLineNo">139</span> return null;<a name="line.139"></a>
+<span class="sourceLineNo">140</span> }<a name="line.140"></a>
+<span class="sourceLineNo">141</span> return ((InternetAddress) addresses[0]).getAddress();<a name="line.141"></a>
+<span class="sourceLineNo">142</span> }<a name="line.142"></a>
+<span class="sourceLineNo">143</span><a name="line.143"></a>
+<span class="sourceLineNo">144</span> /**<a name="line.144"></a>
+<span class="sourceLineNo">145</span> * @return the 'replyTo' address of the email<a name="line.145"></a>
+<span class="sourceLineNo">146</span> * @throws Exception parsing the mime message failed<a name="line.146"></a>
+<span class="sourceLineNo">147</span> */<a name="line.147"></a>
+<span class="sourceLineNo">148</span> public String getReplyTo() throws Exception<a name="line.148"></a>
+<span class="sourceLineNo">149</span> {<a name="line.149"></a>
+<span class="sourceLineNo">150</span> final javax.mail.Address[] addresses = this.mimeMessage.getReplyTo();<a name="line.150"></a>
+<span class="sourceLineNo">151</span> if (addresses == null || addresses.length == 0)<a name="line.151"></a>
+<span class="sourceLineNo">152</span> {<a name="line.152"></a>
+<span class="sourceLineNo">153</span> return null;<a name="line.153"></a>
+<span class="sourceLineNo">154</span> }<a name="line.154"></a>
+<span class="sourceLineNo">155</span> return ((InternetAddress) addresses[0]).getAddress();<a name="line.155"></a>
+<span class="sourceLineNo">156</span> }<a name="line.156"></a>
+<span class="sourceLineNo">157</span><a name="line.157"></a>
+<span class="sourceLineNo">158</span> /**<a name="line.158"></a>
+<span class="sourceLineNo">159</span> * @return the mail subject<a name="line.159"></a>
+<span class="sourceLineNo">160</span> * @throws Exception parsing the mime message failed<a name="line.160"></a>
+<span class="sourceLineNo">161</span> */<a name="line.161"></a>
+<span class="sourceLineNo">162</span> public String getSubject() throws Exception<a name="line.162"></a>
+<span class="sourceLineNo">163</span> {<a name="line.163"></a>
+<span class="sourceLineNo">164</span> return this.mimeMessage.getSubject();<a name="line.164"></a>
+<span class="sourceLineNo">165</span> }<a name="line.165"></a>
+<span class="sourceLineNo">166</span><a name="line.166"></a>
+<span class="sourceLineNo">167</span> /**<a name="line.167"></a>
+<span class="sourceLineNo">168</span> * Extracts the content of a MimeMessage recursively.<a name="line.168"></a>
+<span class="sourceLineNo">169</span> *<a name="line.169"></a>
+<span class="sourceLineNo">170</span> * @param parent the parent multi-part<a name="line.170"></a>
+<span class="sourceLineNo">171</span> * @param part the current MimePart<a name="line.171"></a>
+<span class="sourceLineNo">172</span> * @throws MessagingException parsing the MimeMessage failed<a name="line.172"></a>
+<span class="sourceLineNo">173</span> * @throws IOException parsing the MimeMessage failed<a name="line.173"></a>
+<span class="sourceLineNo">174</span> */<a name="line.174"></a>
+<span class="sourceLineNo">175</span> protected void parse(final Multipart parent, final MimePart part)<a name="line.175"></a>
+<span class="sourceLineNo">176</span> throws MessagingException, IOException<a name="line.176"></a>
+<span class="sourceLineNo">177</span> {<a name="line.177"></a>
+<span class="sourceLineNo">178</span> if (isMimeType(part, "text/plain") && plainContent == null<a name="line.178"></a>
+<span class="sourceLineNo">179</span> && !MimePart.ATTACHMENT.equalsIgnoreCase(part.getDisposition()))<a name="line.179"></a>
+<span class="sourceLineNo">180</span> {<a name="line.180"></a>
+<span class="sourceLineNo">181</span> plainContent = (String) part.getContent();<a name="line.181"></a>
+<span class="sourceLineNo">182</span> }<a name="line.182"></a>
+<span class="sourceLineNo">183</span> else<a name="line.183"></a>
+<span class="sourceLineNo">184</span> {<a name="line.184"></a>
+<span class="sourceLineNo">185</span> if (isMimeType(part, "text/html") && htmlContent == null<a name="line.185"></a>
+<span class="sourceLineNo">186</span> && !MimePart.ATTACHMENT.equalsIgnoreCase(part.getDisposition()))<a name="line.186"></a>
+<span class="sourceLineNo">187</span> {<a name="line.187"></a>
+<span class="sourceLineNo">188</span> htmlContent = (String) part.getContent();<a name="line.188"></a>
+<span class="sourceLineNo">189</span> }<a name="line.189"></a>
+<span class="sourceLineNo">190</span> else<a name="line.190"></a>
+<span class="sourceLineNo">191</span> {<a name="line.191"></a>
+<span class="sourceLineNo">192</span> if (isMimeType(part, "multipart/*"))<a name="line.192"></a>
+<span class="sourceLineNo">193</span> {<a name="line.193"></a>
+<span class="sourceLineNo">194</span> this.isMultiPart = true;<a name="line.194"></a>
+<span class="sourceLineNo">195</span> final Multipart mp = (Multipart) part.getContent();<a name="line.195"></a>
+<span class="sourceLineNo">196</span> final int count = mp.getCount();<a name="line.196"></a>
<span class="sourceLineNo">197</span><a name="line.197"></a>
-<span class="sourceLineNo">198</span> for (int i = 0; i < count; i++)<a name="line.198"></a>
-<span class="sourceLineNo">199</span> {<a name="line.199"></a>
-<span class="sourceLineNo">200</span> parse(mp, (MimeBodyPart) mp.getBodyPart(i));<a name="line.200"></a>
-<span class="sourceLineNo">201</span> }<a name="line.201"></a>
-<span class="sourceLineNo">202</span> }<a name="line.202"></a>
-<span class="sourceLineNo">203</span> else<a name="line.203"></a>
-<span class="sourceLineNo">204</span> {<a name="line.204"></a>
-<span class="sourceLineNo">205</span> this.attachmentList.add(createDataSource(parent, part));<a name="line.205"></a>
-<span class="sourceLineNo">206</span> }<a name="line.206"></a>
-<span class="sourceLineNo">207</span> }<a name="line.207"></a>
-<span class="sourceLineNo">208</span> }<a name="line.208"></a>
-<span class="sourceLineNo">209</span> }<a name="line.209"></a>
-<span class="sourceLineNo">210</span><a name="line.210"></a>
-<span class="sourceLineNo">211</span> /**<a name="line.211"></a>
-<span class="sourceLineNo">212</span> * Checks whether the MimePart contains an object of the given mime type.<a name="line.212"></a>
-<span class="sourceLineNo">213</span> *<a name="line.213"></a>
-<span class="sourceLineNo">214</span> * @param part the current MimePart<a name="line.214"></a>
-<span class="sourceLineNo">215</span> * @param mimeType the mime type to check<a name="line.215"></a>
-<span class="sourceLineNo">216</span> * @return {@code true} if the MimePart matches the given mime type, {@code false} otherwise<a name="line.216"></a>
-<span class="sourceLineNo">217</span> * @throws MessagingException parsing the MimeMessage failed<a name="line.217"></a>
-<span class="sourceLineNo">218</span> * @throws IOException parsing the MimeMessage failed<a name="line.218"></a>
-<span class="sourceLineNo">219</span> */<a name="line.219"></a>
-<span class="sourceLineNo">220</span> private boolean isMimeType(final MimePart part, final String mimeType)<a name="line.220"></a>
-<span class="sourceLineNo">221</span> throws MessagingException, IOException<a name="line.221"></a>
-<span class="sourceLineNo">222</span> {<a name="line.222"></a>
-<span class="sourceLineNo">223</span> // Do not use part.isMimeType(String) as it is broken for MimeBodyPart<a name="line.223"></a>
-<span class="sourceLineNo">224</span> // and does not really check the actual content type.<a name="line.224"></a>
-<span class="sourceLineNo">225</span><a name="line.225"></a>
-<span class="sourceLineNo">226</span> try<a name="line.226"></a>
+<span class="sourceLineNo">198</span> // iterate over all MimeBodyPart<a name="line.198"></a>
+<span class="sourceLineNo">199</span><a name="line.199"></a>
+<span class="sourceLineNo">200</span> for (int i = 0; i < count; i++)<a name="line.200"></a>
+<span class="sourceLineNo">201</span> {<a name="line.201"></a>
+<span class="sourceLineNo">202</span> parse(mp, (MimeBodyPart) mp.getBodyPart(i));<a name="line.202"></a>
+<span class="sourceLineNo">203</span> }<a name="line.203"></a>
+<span class="sourceLineNo">204</span> }<a name="line.204"></a>
+<span class="sourceLineNo">205</span> else<a name="line.205"></a>
+<span class="sourceLineNo">206</span> {<a name="line.206"></a>
+<span class="sourceLineNo">207</span> final String cid = stripContentId(part.getContentID());<a name="line.207"></a>
+<span class="sourceLineNo">208</span> final DataSource ds = createDataSource(parent, part);<a name="line.208"></a>
+<span class="sourceLineNo">209</span> if (cid != null)<a name="line.209"></a>
+<span class="sourceLineNo">210</span> {<a name="line.210"></a>
+<span class="sourceLineNo">211</span> this.cidMap.put(cid, ds);<a name="line.211"></a>
+<span class="sourceLineNo">212</span> }<a name="line.212"></a>
+<span class="sourceLineNo">213</span> this.attachmentList.add(ds);<a name="line.213"></a>
+<span class="sourceLineNo">214</span> }<a name="line.214"></a>
+<span class="sourceLineNo">215</span> }<a name="line.215"></a>
+<span class="sourceLineNo">216</span> }<a name="line.216"></a>
+<span class="sourceLineNo">217</span> }<a name="line.217"></a>
+<span class="sourceLineNo">218</span><a name="line.218"></a>
+<span class="sourceLineNo">219</span> /**<a name="line.219"></a>
+<span class="sourceLineNo">220</span> * Strips the content id of any whitespace and angle brackets.<a name="line.220"></a>
+<span class="sourceLineNo">221</span> * @param contentId the string to strip<a name="line.221"></a>
+<span class="sourceLineNo">222</span> * @return a stripped version of the content id<a name="line.222"></a>
+<span class="sourceLineNo">223</span> */<a name="line.223"></a>
+<span class="sourceLineNo">224</span> private String stripContentId(final String contentId)<a name="line.224"></a>
+<span class="sourceLineNo">225</span> {<a name="line.225"></a>
+<span class="sourceLineNo">226</span> if (contentId == null)<a name="line.226"></a>
<span class="sourceLineNo">227</span> {<a name="line.227"></a>
-<span class="sourceLineNo">228</span> final ContentType ct = new ContentType(part.getDataHandler().getContentType());<a name="line.228"></a>
-<span class="sourceLineNo">229</span> return ct.match(mimeType);<a name="line.229"></a>
-<span class="sourceLineNo">230</span> }<a name="line.230"></a>
-<span class="sourceLineNo">231</span> catch (final ParseException ex)<a name="line.231"></a>
-<span class="sourceLineNo">232</span> {<a name="line.232"></a>
-<span class="sourceLineNo">233</span> return part.getContentType().equalsIgnoreCase(mimeType);<a name="line.233"></a>
-<span class="sourceLineNo">234</span> }<a name="line.234"></a>
-<span class="sourceLineNo">235</span> }<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> * Parses the MimePart to create a DataSource.<a name="line.238"></a>
-<span class="sourceLineNo">239</span> *<a name="line.239"></a>
-<span class="sourceLineNo">240</span> * @param parent the parent multi-part<a name="line.240"></a>
-<span class="sourceLineNo">241</span> * @param part the current part to be processed<a name="line.241"></a>
-<span class="sourceLineNo">242</span> * @return the DataSource<a name="line.242"></a>
-<span class="sourceLineNo">243</span> * @throws MessagingException creating the DataSource failed<a name="line.243"></a>
-<span class="sourceLineNo">244</span> * @throws IOException creating the DataSource failed<a name="line.244"></a>
-<span class="sourceLineNo">245</span> */<a name="line.245"></a>
-<span class="sourceLineNo">246</span> protected DataSource createDataSource(final Multipart parent, final MimePart part)<a name="line.246"></a>
-<span class="sourceLineNo">247</span> throws MessagingException, IOException<a name="line.247"></a>
-<span class="sourceLineNo">248</span> {<a name="line.248"></a>
-<span class="sourceLineNo">249</span> final DataHandler dataHandler = part.getDataHandler();<a name="line.249"></a>
-<span class="sourceLineNo">250</span> final DataSource dataSource = dataHandler.getDataSource();<a name="line.250"></a>
-<span class="sourceLineNo">251</span> final String contentType = getBaseMimeType(dataSource.getContentType());<a name="line.251"></a>
-<span class="sourceLineNo">252</span> final byte[] content = this.getContent(dataSource.getInputStream());<a name="line.252"></a>
-<span class="sourceLineNo">253</span> final ByteArrayDataSource result = new ByteArrayDataSource(content, contentType);<a name="line.253"></a>
-<span class="sourceLineNo">254</span> final String dataSourceName = getDataSourceName(part, dataSource);<a name="line.254"></a>
-<span class="sourceLineNo">255</span><a name="line.255"></a>
-<span class="sourceLineNo">256</span> result.setName(dataSourceName);<a name="line.256"></a>
-<span class="sourceLineNo">257</span> return result;<a name="line.257"></a>
-<span class="sourceLineNo">258</span> }<a name="line.258"></a>
-<span class="sourceLineNo">259</span><a name="line.259"></a>
-<span class="sourceLineNo">260</span> /** @return Returns the mimeMessage. */<a name="line.260"></a>
-<span class="sourceLineNo">261</span> public MimeMessage getMimeMessage()<a name="line.261"></a>
-<span class="sourceLineNo">262</span> {<a name="line.262"></a>
-<span class="sourceLineNo">263</span> return mimeMessage;<a name="line.263"></a>
-<span class="sourceLineNo">264</span> }<a name="line.264"></a>
-<span class="sourceLineNo">265</span><a name="line.265"></a>
-<span class="sourceLineNo">266</span> /** @return Returns the isMultiPart. */<a name="line.266"></a>
-<span class="sourceLineNo">267</span> public boolean isMultipart()<a name="line.267"></a>
-<span class="sourceLineNo">268</span> {<a name="line.268"></a>
-<span class="sourceLineNo">269</span> return isMultiPart;<a name="line.269"></a>
-<span class="sourceLineNo">270</span> }<a name="line.270"></a>
-<span class="sourceLineNo">271</span><a name="line.271"></a>
-<span class="sourceLineNo">272</span> /** @return Returns the plainContent if any */<a name="line.272"></a>
-<span class="sourceLineNo">273</span> public String getPlainContent()<a name="line.273"></a>
-<span class="sourceLineNo">274</span> {<a name="line.274"></a>
-<span class="sourceLineNo">275</span> return plainContent;<a name="line.275"></a>
-<span class="sourceLineNo">276</span> }<a name="line.276"></a>
+<span class="sourceLineNo">228</span> return null;<a name="line.228"></a>
+<span class="sourceLineNo">229</span> }<a name="line.229"></a>
+<span class="sourceLineNo">230</span> return contentId.trim().replaceAll("[\\<\\>]", "");<a name="line.230"></a>
+<span class="sourceLineNo">231</span> }<a name="line.231"></a>
+<span class="sourceLineNo">232</span><a name="line.232"></a>
+<span class="sourceLineNo">233</span> /**<a name="line.233"></a>
+<span class="sourceLineNo">234</span> * Checks whether the MimePart contains an object of the given mime type.<a name="line.234"></a>
+<span class="sourceLineNo">235</span> *<a name="line.235"></a>
+<span class="sourceLineNo">236</span> * @param part the current MimePart<a name="line.236"></a>
+<span class="sourceLineNo">237</span> * @param mimeType the mime type to check<a name="line.237"></a>
+<span class="sourceLineNo">238</span> * @return {@code true} if the MimePart matches the given mime type, {@code false} otherwise<a name="line.238"></a>
+<span class="sourceLineNo">239</span> * @throws MessagingException parsing the MimeMessage failed<a name="line.239"></a>
+<span class="sourceLineNo">240</span> * @throws IOException parsing the MimeMessage failed<a name="line.240"></a>
+<span class="sourceLineNo">241</span> */<a name="line.241"></a>
+<span class="sourceLineNo">242</span> private boolean isMimeType(final MimePart part, final String mimeType)<a name="line.242"></a>
+<span class="sourceLineNo">243</span> throws MessagingException, IOException<a name="line.243"></a>
+<span class="sourceLineNo">244</span> {<a name="line.244"></a>
+<span class="sourceLineNo">245</span> // Do not use part.isMimeType(String) as it is broken for MimeBodyPart<a name="line.245"></a>
+<span class="sourceLineNo">246</span> // and does not really check the actual content type.<a name="line.246"></a>
+<span class="sourceLineNo">247</span><a name="line.247"></a>
+<span class="sourceLineNo">248</span> try<a name="line.248"></a>
+<span class="sourceLineNo">249</span> {<a name="line.249"></a>
+<span class="sourceLineNo">250</span> final ContentType ct = new ContentType(part.getDataHandler().getContentType());<a name="line.250"></a>
+<span class="sourceLineNo">251</span> return ct.match(mimeType);<a name="line.251"></a>
+<span class="sourceLineNo">252</span> }<a name="line.252"></a>
+<span class="sourceLineNo">253</span> catch (final ParseException ex)<a name="line.253"></a>
+<span class="sourceLineNo">254</span> {<a name="line.254"></a>
+<span class="sourceLineNo">255</span> return part.getContentType().equalsIgnoreCase(mimeType);<a name="line.255"></a>
+<span class="sourceLineNo">256</span> }<a name="line.256"></a>
+<span class="sourceLineNo">257</span> }<a name="line.257"></a>
+<span class="sourceLineNo">258</span><a name="line.258"></a>
+<span class="sourceLineNo">259</span> /**<a name="line.259"></a>
+<span class="sourceLineNo">260</span> * Parses the MimePart to create a DataSource.<a name="line.260"></a>
+<span class="sourceLineNo">261</span> *<a name="line.261"></a>
+<span class="sourceLineNo">262</span> * @param parent the parent multi-part<a name="line.262"></a>
+<span class="sourceLineNo">263</span> * @param part the current part to be processed<a name="line.263"></a>
+<span class="sourceLineNo">264</span> * @return the DataSource<a name="line.264"></a>
+<span class="sourceLineNo">265</span> * @throws MessagingException creating the DataSource failed<a name="line.265"></a>
+<span class="sourceLineNo">266</span> * @throws IOException creating the DataSource failed<a name="line.266"></a>
+<span class="sourceLineNo">267</span> */<a name="line.267"></a>
+<span class="sourceLineNo">268</span> protected DataSource createDataSource(final Multipart parent, final MimePart part)<a name="line.268"></a>
+<span class="sourceLineNo">269</span> throws MessagingException, IOException<a name="line.269"></a>
+<span class="sourceLineNo">270</span> {<a name="line.270"></a>
+<span class="sourceLineNo">271</span> final DataHandler dataHandler = part.getDataHandler();<a name="line.271"></a>
+<span class="sourceLineNo">272</span> final DataSource dataSource = dataHandler.getDataSource();<a name="line.272"></a>
+<span class="sourceLineNo">273</span> final String contentType = getBaseMimeType(dataSource.getContentType());<a name="line.273"></a>
+<span class="sourceLineNo">274</span> final byte[] content = this.getContent(dataSource.getInputStream());<a name="line.274"></a>
+<span class="sourceLineNo">275</span> final ByteArrayDataSource result = new ByteArrayDataSource(content, contentType);<a name="line.275"></a>
+<span class="sourceLineNo">276</span> final String dataSourceName = getDataSourceName(part, dataSource);<a name="line.276"></a>
<span class="sourceLineNo">277</span><a name="line.277"></a>
-<span class="sourceLineNo">278</span> /** @return Returns the attachmentList. */<a name="line.278"></a>
-<span class="sourceLineNo">279</span> public List<DataSource> getAttachmentList()<a name="line.279"></a>
-<span class="sourceLineNo">280</span> {<a name="line.280"></a>
-<span class="sourceLineNo">281</span> return attachmentList;<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> /** @return Returns the htmlContent if any */<a name="line.284"></a>
-<span class="sourceLineNo">285</span> public String getHtmlContent()<a name="line.285"></a>
-<span class="sourceLineNo">286</span> {<a name="line.286"></a>
-<span class="sourceLineNo">287</span> return htmlContent;<a name="line.287"></a>
-<span class="sourceLineNo">288</span> }<a name="line.288"></a>
-<span class="sourceLineNo">289</span><a name="line.289"></a>
-<span class="sourceLineNo">290</span> /** @return true if a plain content is available */<a name="line.290"></a>
-<span class="sourceLineNo">291</span> public boolean hasPlainContent()<a name="line.291"></a>
-<span class="sourceLineNo">292</span> {<a name="line.292"></a>
-<span class="sourceLineNo">293</span> return this.plainContent != null;<a name="line.293"></a>
-<span class="sourceLineNo">294</span> }<a name="line.294"></a>
-<span class="sourceLineNo">295</span><a name="line.295"></a>
-<span class="sourceLineNo">296</span> /** @return true if HTML content is available */<a name="line.296"></a>
-<span class="sourceLineNo">297</span> public boolean hasHtmlContent()<a name="line.297"></a>
-<span class="sourceLineNo">298</span> {<a name="line.298"></a>
-<span class="sourceLineNo">299</span> return this.htmlContent != null;<a name="line.299"></a>
-<span class="sourceLineNo">300</span> }<a name="line.300"></a>
-<span class="sourceLineNo">301</span><a name="line.301"></a>
-<span class="sourceLineNo">302</span> /** @return true if attachments are available */<a name="line.302"></a>
-<span class="sourceLineNo">303</span> public boolean hasAttachments()<a name="line.303"></a>
-<span class="sourceLineNo">304</span> {<a name="line.304"></a>
-<span class="sourceLineNo">305</span> return this.attachmentList.size() > 0;<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> /**<a name="line.308"></a>
-<span class="sourceLineNo">309</span> * Find an attachment using its name.<a name="line.309"></a>
-<span class="sourceLineNo">310</span> *<a name="line.310"></a>
-<span class="sourceLineNo">311</span> * @param name the name of the attachment<a name="line.311"></a>
-<span class="sourceLineNo">312</span> * @return the corresponding datasource or null if nothing was found<a name="line.312"></a>
-<span class="sourceLineNo">313</span> */<a name="line.313"></a>
-<span class="sourceLineNo">314</span> public DataSource findAttachmentByName(final String name)<a name="line.314"></a>
-<span class="sourceLineNo">315</span> {<a name="line.315"></a>
-<span class="sourceLineNo">316</span> DataSource dataSource;<a name="line.316"></a>
-<span class="sourceLineNo">317</span><a name="line.317"></a>
-<span class="sourceLineNo">318</span> for (int i = 0; i < getAttachmentList().size(); i++)<a name="line.318"></a>
-<span class="sourceLineNo">319</span> {<a name="line.319"></a>
-<span class="sourceLineNo">320</span> dataSource = getAttachmentList().get(i);<a name="line.320"></a>
-<span class="sourceLineNo">321</span> if (name.equalsIgnoreCase(dataSource.getName()))<a name="line.321"></a>
-<span class="sourceLineNo">322</span> {<a name="line.322"></a>
-<span class="sourceLineNo">323</span> return dataSource;<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> return null;<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> /**<a name="line.330"></a>
-<span class="sourceLineNo">331</span> * Determines the name of the data source if it is not already set.<a name="line.331"></a>
-<span class="sourceLineNo">332</span> *<a name="line.332"></a>
-<span class="sourceLineNo">333</span> * @param part the mail part<a name="line.333"></a>
-<span class="sourceLineNo">334</span> * @param dataSource the data source<a name="line.334"></a>
-<span class="sourceLineNo">335</span> * @return the name of the data source or {@code null} if no name can be determined<a name="line.335"></a>
-<span class="sourceLineNo">336</span> * @throws MessagingException accessing the part failed<a name="line.336"></a>
-<span class="sourceLineNo">337</span> * @throws UnsupportedEncodingException decoding the text failed<a name="line.337"></a>
-<span class="sourceLineNo">338</span> */<a name="line.338"></a>
-<span class="sourceLineNo">339</span> protected String getDataSourceName(final Part part, final DataSource dataSource)<a name="line.339"></a>
-<span class="sourceLineNo">340</span> throws MessagingException, UnsupportedEncodingException<a name="line.340"></a>
-<span class="sourceLineNo">341</span> {<a name="line.341"></a>
-<span class="sourceLineNo">342</span> String result = dataSource.getName();<a name="line.342"></a>
+<span class="sourceLineNo">278</span> result.setName(dataSourceName);<a name="line.278"></a>
+<span class="sourceLineNo">279</span> return result;<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> /** @return Returns the mimeMessage. */<a name="line.282"></a>
+<span class="sourceLineNo">283</span> public MimeMessage getMimeMessage()<a name="line.283"></a>
+<span class="sourceLineNo">284</span> {<a name="line.284"></a>
+<span class="sourceLineNo">285</span> return mimeMessage;<a name="line.285"></a>
+<span class="sourceLineNo">286</span> }<a name="line.286"></a>
+<span class="sourceLineNo">287</span><a name="line.287"></a>
+<span class="sourceLineNo">288</span> /** @return Returns the isMultiPart. */<a name="line.288"></a>
+<span class="sourceLineNo">289</span> public boolean isMultipart()<a name="line.289"></a>
+<span class="sourceLineNo">290</span> {<a name="line.290"></a>
+<span class="sourceLineNo">291</span> return isMultiPart;<a name="line.291"></a>
+<span class="sourceLineNo">292</span> }<a name="line.292"></a>
+<span class="sourceLineNo">293</span><a name="line.293"></a>
+<span class="sourceLineNo">294</span> /** @return Returns the plainContent if any */<a name="line.294"></a>
+<span class="sourceLineNo">295</span> public String getPlainContent()<a name="line.295"></a>
+<span class="sourceLineNo">296</span> {<a name="line.296"></a>
+<span class="sourceLineNo">297</span> return plainContent;<a name="line.297"></a>
+<span class="sourceLineNo">298</span> }<a name="line.298"></a>
+<span class="sourceLineNo">299</span><a name="line.299"></a>
+<span class="sourceLineNo">300</span> /** @return Returns the attachmentList. */<a name="line.300"></a>
+<span class="sourceLineNo">301</span> public List<DataSource> getAttachmentList()<a name="line.301"></a>
+<span class="sourceLineNo">302</span> {<a name="line.302"></a>
+<span class="sourceLineNo">303</span> return attachmentList;<a name="line.303"></a>
+<span class="sourceLineNo">304</span> }<a name="line.304"></a>
+<span class="sourceLineNo">305</span><a name="line.305"></a>
+<span class="sourceLineNo">306</span> /**<a name="line.306"></a>
+<span class="sourceLineNo">307</span> * Returns a collection of all content-ids in the parsed message.<a name="line.307"></a>
+<span class="sourceLineNo">308</span> * <p><a name="line.308"></a>
+<span class="sourceLineNo">309</span> * The content-ids are stripped of any angle brackets, i.e. "part1" instead<a name="line.309"></a>
+<span class="sourceLineNo">310</span> * of "&lt;part1&gt;".<a name="line.310"></a>
+<span class="sourceLineNo">311</span> *<a name="line.311"></a>
+<span class="sourceLineNo">312</span> * @return the collection of content ids.<a name="line.312"></a>
+<span class="sourceLineNo">313</span> * @since 1.3.4<a name="line.313"></a>
+<span class="sourceLineNo">314</span> */<a name="line.314"></a>
+<span class="sourceLineNo">315</span> public Collection<String> getContentIds()<a name="line.315"></a>
+<span class="sourceLineNo">316</span> {<a name="line.316"></a>
+<span class="sourceLineNo">317</span> return Collections.unmodifiableSet(cidMap.keySet());<a name="line.317"></a>
+<span class="sourceLineNo">318</span> }<a name="line.318"></a>
+<span class="sourceLineNo">319</span><a name="line.319"></a>
+<span class="sourceLineNo">320</span> /** @return Returns the htmlContent if any */<a name="line.320"></a>
+<span class="sourceLineNo">321</span> public String getHtmlContent()<a name="line.321"></a>
+<span class="sourceLineNo">322</span> {<a name="line.322"></a>
+<span class="sourceLineNo">323</span> return htmlContent;<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> /** @return true if a plain content is available */<a name="line.326"></a>
+<span class="sourceLineNo">327</span> public boolean hasPlainContent()<a name="line.327"></a>
+<span class="sourceLineNo">328</span> {<a name="line.328"></a>
+<span class="sourceLineNo">329</span> return this.plainContent != null;<a name="line.329"></a>
+<span class="sourceLineNo">330</span> }<a name="line.330"></a>
+<span class="sourceLineNo">331</span><a name="line.331"></a>
+<span class="sourceLineNo">332</span> /** @return true if HTML content is available */<a name="line.332"></a>
+<span class="sourceLineNo">333</span> public boolean hasHtmlContent()<a name="line.333"></a>
+<span class="sourceLineNo">334</span> {<a name="line.334"></a>
+<span class="sourceLineNo">335</span> return this.htmlContent != null;<a name="line.335"></a>
+<span class="sourceLineNo">336</span> }<a name="line.336"></a>
+<span class="sourceLineNo">337</span><a name="line.337"></a>
+<span class="sourceLineNo">338</span> /** @return true if attachments are available */<a name="line.338"></a>
+<span class="sourceLineNo">339</span> public boolean hasAttachments()<a name="line.339"></a>
+<span class="sourceLineNo">340</span> {<a name="line.340"></a>
+<span class="sourceLineNo">341</span> return this.attachmentList.size() > 0;<a name="line.341"></a>
+<span class="sourceLineNo">342</span> }<a name="line.342"></a>
<span class="sourceLineNo">343</span><a name="line.343"></a>
-<span class="sourceLineNo">344</span> if (result == null || result.length() == 0)<a name="line.344"></a>
-<span class="sourceLineNo">345</span> {<a name="line.345"></a>
-<span class="sourceLineNo">346</span> result = part.getFileName();<a name="line.346"></a>
-<span class="sourceLineNo">347</span> }<a name="line.347"></a>
-<span class="sourceLineNo">348</span><a name="line.348"></a>
-<span class="sourceLineNo">349</span> if (result != null && result.length() > 0)<a name="line.349"></a>
-<span class="sourceLineNo">350</span> {<a name="line.350"></a>
-<span class="sourceLineNo">351</span> result = MimeUtility.decodeText(result);<a name="line.351"></a>
-<span class="sourceLineNo">352</span> }<a name="line.352"></a>
-<span class="sourceLineNo">353</span> else<a name="line.353"></a>
-<span class="sourceLineNo">354</span> {<a name="line.354"></a>
-<span class="sourceLineNo">355</span> result = null;<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> return result;<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> /**<a name="line.361"></a>
-<span class="sourceLineNo">362</span> * Read the content of the input stream.<a name="line.362"></a>
-<span class="sourceLineNo">363</span> *<a name="line.363"></a>
-<span class="sourceLineNo">364</span> * @param is the input stream to process<a name="line.364"></a>
-<span class="sourceLineNo">365</span> * @return the content of the input stream<a name="line.365"></a>
-<span class="sourceLineNo">366</span> * @throws IOException reading the input stream failed<a name="line.366"></a>
-<span class="sourceLineNo">367</span> */<a name="line.367"></a>
-<span class="sourceLineNo">368</span> private byte[] getContent(final InputStream is)<a name="line.368"></a>
-<span class="sourceLineNo">369</span> throws IOException<a name="line.369"></a>
-<span class="sourceLineNo">370</span> {<a name="line.370"></a>
-<span class="sourceLineNo">371</span> int ch;<a name="line.371"></a>
-<span class="sourceLineNo">372</span> byte[] result;<a name="line.372"></a>
-<span class="sourceLineNo">373</span><a name="line.373"></a>
-<span class="sourceLineNo">374</span> final ByteArrayOutputStream os = new ByteArrayOutputStream();<a name="line.374"></a>
-<span class="sourceLineNo">375</span> final BufferedInputStream isReader = new BufferedInputStream(is);<a name="line.375"></a>
-<span class="sourceLineNo">376</span> final BufferedOutputStream osWriter = new BufferedOutputStream(os);<a name="line.376"></a>
-<span class="sourceLineNo">377</span><a name="line.377"></a>
-<span class="sourceLineNo">378</span> while ((ch = isReader.read()) != -1)<a name="line.378"></a>
-<span class="sourceLineNo">379</span> {<a name="line.379"></a>
-<span class="sourceLineNo">380</span> osWriter.write(ch);<a name="line.380"></a>
-<span class="sourceLineNo">381</span> }<a name="line.381"></a>
-<span class="sourceLineNo">382</span><a name="line.382"></a>
-<span class="sourceLineNo">383</span> osWriter.flush();<a name="line.383"></a>
-<span class="sourceLineNo">384</span> result = os.toByteArray();<a name="line.384"></a>
-<span class="sourceLineNo">385</span> osWriter.close();<a name="line.385"></a>
-<span class="sourceLineNo">386</span><a name="line.386"></a>
-<span class="sourceLineNo">387</span> return result;<a name="line.387"></a>
-<span class="sourceLineNo">388</span> }<a name="line.388"></a>
-<span class="sourceLineNo">389</span><a name="line.389"></a>
-<span class="sourceLineNo">390</span> /**<a name="line.390"></a>
-<span class="sourceLineNo">391</span> * Parses the mimeType.<a name="line.391"></a>
-<span class="sourceLineNo">392</span> *<a name="line.392"></a>
-<span class="sourceLineNo">393</span> * @param fullMimeType the mime type from the mail api<a name="line.393"></a>
-<span class="sourceLineNo">394</span> * @return the real mime type<a name="line.394"></a>
-<span class="sourceLineNo">395</span> */<a name="line.395"></a>
-<span class="sourceLineNo">396</span> private String getBaseMimeType(final String fullMimeType)<a name="line.396"></a>
-<span class="sourceLineNo">397</span> {<a name="line.397"></a>
-<span class="sourceLineNo">398</span> final int pos = fullMimeType.indexOf(';');<a name="line.398"></a>
-<span class="sourceLineNo">399</span> if (pos >= 0)<a name="line.399"></a>
-<span class="sourceLineNo">400</span> {<a name="line.400"></a>
-<span class="sourceLineNo">401</span> return fullMimeType.substring(0, pos);<a name="line.401"></a>
-<span class="sourceLineNo">402</span> }<a name="line.402"></a>
-<span class="sourceLineNo">403</span> else<a name="line.403"></a>
-<span class="sourceLineNo">404</span> {<a name="line.404"></a>
-<span class="sourceLineNo">405</span> return fullMimeType;<a name="line.405"></a>
-<span class="sourceLineNo">406</span> }<a name="line.406"></a>
-<span class="sourceLineNo">407</span> }<a name="line.407"></a>
-<span class="sourceLineNo">408</span>}<a name="line.408"></a>
+<span class="sourceLineNo">344</span> /**<a name="line.344"></a>
+<span class="sourceLineNo">345</span> * Find an attachment using its name.<a name="line.345"></a>
+<span class="sourceLineNo">346</span> *<a name="line.346"></a>
+<span class="sourceLineNo">347</span> * @param name the name of the attachment<a name="line.347"></a>
+<span class="sourceLineNo">348</span> * @return the corresponding datasource or null if nothing was found<a name="line.348"></a>
+<span class="sourceLineNo">349</span> */<a name="line.349"></a>
+<span class="sourceLineNo">350</span> public DataSource findAttachmentByName(final String name)<a name="line.350"></a>
+<span class="sourceLineNo">351</span> {<a name="line.351"></a>
+<span class="sourceLineNo">352</span> DataSource dataSource;<a name="line.352"></a>
+<span class="sourceLineNo">353</span><a name="line.353"></a>
+<span class="sourceLineNo">354</span> for (int i = 0; i < getAttachmentList().size(); i++)<a name="line.354"></a>
+<span class="sourceLineNo">355</span> {<a name="line.355"></a>
+<span class="sourceLineNo">356</span> dataSource = getAttachmentList().get(i);<a name="line.356"></a>
+<span class="sourceLineNo">357</span> if (name.equalsIgnoreCase(dataSource.getName()))<a name="line.357"></a>
+<span class="sourceLineNo">358</span> {<a name="line.358"></a>
+<span class="sourceLineNo">359</span> return dataSource;<a name="line.359"></a>
+<span class="sourceLineNo">360</span> }<a name="line.360"></a>
+<span class="sourceLineNo">361</span> }<a name="line.361"></a>
+<span class="sourceLineNo">362</span><a name="line.362"></a>
+<span class="sourceLineNo">363</span> return null;<a name="line.363"></a>
+<span class="sourceLineNo">364</span> }<a name="line.364"></a>
+<span class="sourceLineNo">365</span><a name="line.365"></a>
+<span class="sourceLineNo">366</span> /**<a name="line.366"></a>
+<span class="sourceLineNo">367</span> * Find an attachment using its content-id.<a name="line.367"></a>
+<span class="sourceLineNo">368</span> * <p><a name="line.368"></a>
+<span class="sourceLineNo">369</span> * The content-id must be stripped of any angle brackets,<a name="line.369"></a>
+<span class="sourceLineNo">370</span> * i.e. "part1" instead of "&lt;part1&gt;".<a name="line.370"></a>
+<span class="sourceLineNo">371</span> *<a name="line.371"></a>
+<span class="sourceLineNo">372</span> * @param cid the content-id of the attachment<a name="line.372"></a>
+<span class="sourceLineNo">373</span> * @return the corresponding datasource or null if nothing was found<a name="line.373"></a>
+<span class="sourceLineNo">374</span> * @since 1.3.4<a name="line.374"></a>
+<span class="sourceLineNo">375</span> */<a name="line.375"></a>
+<span class="sourceLineNo">376</span> public DataSource findAttachmentByCid(final String cid)<a name="line.376"></a>
+<span class="sourceLineNo">377</span> {<a name="line.377"></a>
+<span class="sourceLineNo">378</span> final DataSource dataSource = cidMap.get(cid);<a name="line.378"></a>
+<span class="sourceLineNo">379</span> return dataSource;<a name="line.379"></a>
+<span class="sourceLineNo">380</span> }<a name="line.380"></a>
+<span class="sourceLineNo">381</span><a name="line.381"></a>
+<span class="sourceLineNo">382</span> /**<a name="line.382"></a>
+<span class="sourceLineNo">383</span> * Determines the name of the data source if it is not already set.<a name="line.383"></a>
+<span class="sourceLineNo">384</span> *<a name="line.384"></a>
+<span class="sourceLineNo">385</span> * @param part the mail part<a name="line.385"></a>
+<span class="sourceLineNo">386</span> * @param dataSource the data source<a name="line.386"></a>
+<span class="sourceLineNo">387</span> * @return the name of the data source or {@code null} if no name can be determined<a name="line.387"></a>
+<span class="sourceLineNo">388</span> * @throws MessagingException accessing the part failed<a name="line.388"></a>
+<span class="sourceLineNo">389</span> * @throws UnsupportedEncodingException decoding the text failed<a name="line.389"></a>
+<span class="sourceLineNo">390</span> */<a name="line.390"></a>
+<span class="sourceLineNo">391</span> protected String getDataSourceName(final Part part, final DataSource dataSource)<a name="line.391"></a>
+<span class="sourceLineNo">392</span> throws MessagingException, UnsupportedEncodingException<a name="line.392"></a>
+<span class="sourceLineNo">393</span> {<a name="line.393"></a>
+<span class="sourceLineNo">394</span> String result = dataSource.getName();<a name="line.394"></a>
+<span class="sourceLineNo">395</span><a name="line.395"></a>
+<span class="sourceLineNo">396</span> if (result == null || result.length() == 0)<a name="line.396"></a>
+<span class="sourceLineNo">397</span> {<a name="line.397"></a>
+<span class="sourceLineNo">398</span> result = part.getFileName();<a name="line.398"></a>
+<span class="sourceLineNo">399</span> }<a name="line.399"></a>
+<span class="sourceLineNo">400</span><a name="line.400"></a>
+<span class="sourceLineNo">401</span> if (result != null && result.length() > 0)<a name="line.401"></a>
+<span class="sourceLineNo">402</span> {<a name="line.402"></a>
+<span class="sourceLineNo">403</span> result = MimeUtility.decodeText(result);<a name="line.403"></a>
+<span class="sourceLineNo">404</span> }<a name="line.404"></a>
+<span class="sourceLineNo">405</span> else<a name="line.405"></a>
+<span class="sourceLineNo">406</span> {<a name="line.406"></a>
+<span class="sourceLineNo">407</span> result = null;<a name="line.407"></a>
+<span class="sourceLineNo">408</span> }<a name="line.408"></a>
+<span class="sourceLineNo">409</span><a name="line.409"></a>
+<span class="sourceLineNo">410</span> return result;<a name="line.410"></a>
+<span class="sourceLineNo">411</span> }<a name="line.411"></a>
+<span class="sourceLineNo">412</span><a name="line.412"></a>
+<span class="sourceLineNo">413</span> /**<a name="line.413"></a>
+<span class="sourceLineNo">414</span> * Read the content of the input stream.<a name="line.414"></a>
+<span class="sourceLineNo">415</span> *<a name="line.415"></a>
+<span class="sourceLineNo">416</span> * @param is the input stream to process<a name="line.416"></a>
+<span class="sourceLineNo">417</span> * @return the content of the input stream<a name="line.417"></a>
+<span class="sourceLineNo">418</span> * @throws IOException reading the input stream failed<a name="line.418"></a>
+<span class="sourceLineNo">419</span> */<a name="line.419"></a>
+<span class="sourceLineNo">420</span> private byte[] getContent(final InputStream is)<a name="line.420"></a>
+<span class="sourceLineNo">421</span> throws IOException<a name="line.421"></a>
+<span class="sourceLineNo">422</span> {<a name="line.422"></a>
+<span class="sourceLineNo">423</span> int ch;<a name="line.423"></a>
+<span class="sourceLineNo">424</span> byte[] result;<a name="line.424"></a>
+<span class="sourceLineNo">425</span><a name="line.425"></a>
+<span class="sourceLineNo">426</span> final ByteArrayOutputStream os = new ByteArrayOutputStream();<a name="line.426"></a>
+<span class="sourceLineNo">427</span> final BufferedInputStream isReader = new BufferedInputStream(is);<a name="line.427"></a>
+<span class="sourceLineNo">428</span> final BufferedOutputStream osWriter = new BufferedOutputStream(os);<a name="line.428"></a>
+<span class="sourceLineNo">429</span><a name="line.429"></a>
+<span class="sourceLineNo">430</span> while ((ch = isReader.read()) != -1)<a name="line.430"></a>
+<span class="sourceLineNo">431</span> {<a name="line.431"></a>
+<span class="sourceLineNo">432</span> osWriter.write(ch);<a name="line.432"></a>
+<span class="sourceLineNo">433</span> }<a name="line.433"></a>
+<span class="sourceLineNo">434</span><a name="line.434"></a>
+<span class="sourceLineNo">435</span> osWriter.flush();<a name="line.435"></a>
+<span class="sourceLineNo">436</span> result = os.toByteArray();<a name="line.436"></a>
+<span class="sourceLineNo">437</span> osWriter.close();<a name="line.437"></a>
+<span class="sourceLineNo">438</span><a name="line.438"></a>
+<span class="sourceLineNo">439</span> return result;<a name="line.439"></a>
+<span class="sourceLineNo">440</span> }<a name="line.440"></a>
+<span class="sourceLineNo">441</span><a name="line.441"></a>
+<span class="sourceLineNo">442</span> /**<a name="line.442"></a>
+<span class="sourceLineNo">443</span> * Parses the mimeType.<a name="line.443"></a>
+<span class="sourceLineNo">444</span> *<a name="line.444"></a>
+<span class="sourceLineNo">445</span> * @param fullMimeType the mime type from the mail api<a name="line.445"></a>
+<span class="sourceLineNo">446</span> * @return the real mime type<a name="line.446"></a>
+<span class="sourceLineNo">447</span> */<a name="line.447"></a>
+<span class="sourceLineNo">448</span> private String getBaseMimeType(final String fullMimeType)<a name="line.448"></a>
+<span class="sourceLineNo">449</span> {<a name="line.449"></a>
+<span class="sourceLineNo">450</span> final int pos = fullMimeType.indexOf(';');<a name="line.450"></a>
+<span class="sourceLineNo">451</span> if (pos >= 0)<a name="line.451"></a>
+<span class="sourceLineNo">452</span> {<a name="line.452"></a>
+<span class="sourceLineNo">453</span> return fullMimeType.substring(0, pos);<a name="line.453"></a>
+<span class="sourceLineNo">454</span> }<a name="line.454"></a>
+<span class="sourceLineNo">455</span> return fullMimeType;<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>
@@ -477,4 +526,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/util/MimeMessageUtils.html
==============================================================================
--- websites/production/commons/content/proper/commons-email/apidocs/src-html/org/apache/commons/mail/util/MimeMessageUtils.html (original)
+++ websites/production/commons/content/proper/commons-email/apidocs/src-html/org/apache/commons/mail/util/MimeMessageUtils.html Sat May 23 06:50:57 2015
@@ -257,4 +257,4 @@
</pre>
</div>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: websites/production/commons/content/proper/commons-email/apidocs/stylesheet.css
==============================================================================
--- websites/production/commons/content/proper/commons-email/apidocs/stylesheet.css (original)
+++ websites/production/commons/content/proper/commons-email/apidocs/stylesheet.css Sat May 23 06:50:57 2015
@@ -471,4 +471,4 @@ h1.hidden {
}
.strong {
font-weight:bold;
-}
\ No newline at end of file
+}
Modified: websites/production/commons/content/proper/commons-email/building.html
==============================================================================
--- websites/production/commons/content/proper/commons-email/building.html (original)
+++ websites/production/commons/content/proper/commons-email/building.html Sat May 23 06:50:57 2015
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<!--
- | Generated by Apache Maven Doxia at 05 July 2014
+ | Generated by Apache Maven Doxia at 23 May 2015
| Rendered using Apache Maven Fluido Skin 1.3.0
-->
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
@@ -8,10 +8,9 @@
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="author" content="Commons Documentation Team" />
- <meta name="Date-Revision-yyyymmdd" content="20140705" />
+ <meta name="Date-Revision-yyyymmdd" content="20150523" />
<meta http-equiv="Content-Language" content="en" />
- <title>Commons Email -
- Building</title>
+ <title>Commons Email – Building</title>
<link rel="stylesheet" href="./css/bootstrap.min.css" type="text/css" />
<link rel="stylesheet" href="./css/site.css" type="text/css" />
@@ -45,8 +44,8 @@
<a class="brand" href="http://commons.apache.org/proper/commons-email/">Apache Commons Email ™</a>
<ul class="nav">
- <li id="publishDate">Last Published: 05 July 2014</li>
- <li class="divider">|</li> <li id="projectVersion">Version: 1.3.3</li>
+ <li id="publishDate">Last Published: 23 May 2015</li>
+ <li class="divider">|</li> <li id="projectVersion">Version: 1.4</li>
</ul>
<div class="pull-right"> <ul class="nav">
<li>
@@ -91,7 +90,11 @@
Latest API docs (development)</a>
</li>
<li class="none">
- <a href="javadocs/api-release/index.html" title="Javadoc (1.3.3 release)">
+ <a href="javadocs/api-release/index.html" title="Javadoc (1.4 release)">
+ Javadoc (1.4 release)</a>
+ </li>
+ <li class="none">
+ <a href="javadocs/api-1.3.3/index.html" title="Javadoc (1.3.3 release)">
Javadoc (1.3.3 release)</a>
</li>
<li class="none">
@@ -108,7 +111,7 @@
</ul>
<ul class="nav nav-list">
<li class="nav-header"><i class="icon-info-sign"></i>Project Documentation</li>
- <li class="collapsed">
+ <li class="collapsed">
<a href="project-info.html" title="Project Information">
Project Information</a>
</li>
@@ -143,6 +146,10 @@
<ul class="nav nav-list">
<li class="nav-header">General Information</li>
<li class="none">
+ <a href="security.html" title="Security">
+ Security</a>
+ </li>
+ <li class="none">
<a href="../../volunteering.html" title="Volunteering">
Volunteering</a>
</li>
@@ -155,6 +162,14 @@
Building Components</a>
</li>
<li class="none">
+ <a href="../../commons-parent-pom.html" title="Commons Parent Pom">
+ Commons Parent Pom</a>
+ </li>
+ <li class="none">
+ <a href="../../build-plugin/index.html" title="Commons Build Plugin">
+ Commons Build Plugin</a>
+ </li>
+ <li class="none">
<a href="../../releases/index.html" title="Releasing Components">
Releasing Components</a>
</li>
@@ -214,7 +229,7 @@ limitations under the License. -->
<!-- ================================================== -->
<div class="section">
-<h2>Overview<a name="Overview"></a></h2>
+<h2><a name="Overview"></a>Overview</h2>
<p>
Commons Email uses <a class="externalLink" href="http://maven.apache.org">Maven 2.0</a>
@@ -223,7 +238,7 @@ limitations under the License. -->
<!-- ================================================== -->
<div class="section">
-<h2>Maven Goals<a name="Maven_Goals"></a></h2>
+<h2><a name="Maven_Goals"></a>Maven Goals</h2>
<p>
To build a jar file, change into Email's root directory and run "mvn package".
@@ -244,7 +259,7 @@ limitations under the License. -->
<!-- ================================================== -->
<div class="section">
-<h2>Development<a name="Development"></a></h2>
+<h2><a name="Development"></a>Development</h2>
<p>
Commons Email may be used on any JRE from 1.5 onwards.
@@ -269,7 +284,7 @@ limitations under the License. -->
</div>
<div class="footer">
- <p>Copyright © 2001-2014
+ <p>Copyright © 2001-2015
<a href="http://www.apache.org/">The Apache Software Foundation</a>.
All Rights Reserved.</p>
@@ -278,4 +293,4 @@ limitations under the License. -->
</div>
</body>
-</html>
\ No newline at end of file
+</html>