geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject svn commit: r1620683 [10/17] - in /geronimo/specs/trunk: ./ geronimo-javamail_1.5_spec/ geronimo-javamail_1.5_spec/src/ geronimo-javamail_1.5_spec/src/main/ geronimo-javamail_1.5_spec/src/main/java/ geronimo-javamail_1.5_spec/src/main/java/javax/ geron...
Date Tue, 26 Aug 2014 18:17:09 GMT
Added: geronimo/specs/trunk/geronimo-javamail_1.5_spec/src/main/java/javax/mail/internet/MimeUtility.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-javamail_1.5_spec/src/main/java/javax/mail/internet/MimeUtility.java?rev=1620683&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-javamail_1.5_spec/src/main/java/javax/mail/internet/MimeUtility.java (added)
+++ geronimo/specs/trunk/geronimo-javamail_1.5_spec/src/main/java/javax/mail/internet/MimeUtility.java Tue Aug 26 18:17:06 2014
@@ -0,0 +1,1393 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package javax.mail.internet;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.StringTokenizer;
+
+import javax.activation.DataHandler;
+import javax.activation.DataSource;
+import javax.mail.EncodingAware;
+import javax.mail.MessagingException;
+
+import org.apache.geronimo.mail.util.ASCIIUtil;
+import org.apache.geronimo.mail.util.Base64;
+import org.apache.geronimo.mail.util.Base64DecoderStream;
+import org.apache.geronimo.mail.util.Base64Encoder;
+import org.apache.geronimo.mail.util.Base64EncoderStream;
+import org.apache.geronimo.mail.util.QuotedPrintableDecoderStream;
+import org.apache.geronimo.mail.util.QuotedPrintableEncoder;
+import org.apache.geronimo.mail.util.QuotedPrintableEncoderStream;
+import org.apache.geronimo.mail.util.SessionUtil;
+import org.apache.geronimo.mail.util.UUDecoderStream;
+import org.apache.geronimo.mail.util.UUEncoderStream;
+
+// encodings include "base64", "quoted-printable", "7bit", "8bit" and "binary".
+// In addition, "uuencode" is also supported. The
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class MimeUtility {
+
+    private static final String MIME_FOLDENCODEDWORDS = "mail.mime.foldencodedwords";
+    private static final String MIME_DECODE_TEXT_STRICT = "mail.mime.decodetext.strict";
+    private static final String MIME_FOLDTEXT = "mail.mime.foldtext";
+    private static final int FOLD_THRESHOLD = 76;
+
+    private MimeUtility() {
+    }
+
+    public static final int ALL = -1;
+
+    private static String escapedChars = "\"\\\r\n";
+    private static String linearWhiteSpace = " \t\r\n";
+
+    private static String QP_WORD_SPECIALS = "=_?\"#$%&'(),.:;<>@[\\]^`{|}~";
+    private static String QP_TEXT_SPECIALS = "=_?";
+
+    // the javamail spec includes the ability to map java encoding names to MIME-specified names.  Normally,
+    // these values are loaded from a character mapping file.
+    private static Map java2mime;
+    private static Map mime2java;
+
+    static {
+        // we need to load the mapping tables used by javaCharset() and mimeCharset().
+        loadCharacterSetMappings();
+    }
+
+    public static InputStream decode(final InputStream in, String encoding) throws MessagingException {
+        encoding = encoding.toLowerCase();
+
+        // some encodies are just pass-throughs, with no real decoding.
+        if (encoding.equals("binary") || encoding.equals("7bit") || encoding.equals("8bit")) {
+            return in;
+        }
+        else if (encoding.equals("base64")) {
+            return new Base64DecoderStream(in);
+        }
+        // UUEncode is known by a couple historical extension names too.
+        else if (encoding.equals("uuencode") || encoding.equals("x-uuencode") || encoding.equals("x-uue")) {
+            return new UUDecoderStream(in);
+        }
+        else if (encoding.equals("quoted-printable")) {
+            return new QuotedPrintableDecoderStream(in);
+        }
+        else {
+            throw new MessagingException("Unknown encoding " + encoding);
+        }
+    }
+
+    /**
+     * Decode a string of text obtained from a mail header into
+     * it's proper form.  The text generally will consist of a
+     * string of tokens, some of which may be encoded using
+     * base64 encoding.
+     *
+     * @param text   The text to decode.
+     *
+     * @return The decoded test string.
+     * @exception UnsupportedEncodingException
+     */
+    public static String decodeText(final String text) throws UnsupportedEncodingException {
+        // if the text contains any encoded tokens, those tokens will be marked with "=?".  If the
+        // source string doesn't contain that sequent, no decoding is required.
+        if (text.indexOf("=?") < 0) {
+            return text;
+        }
+
+        // we have two sets of rules we can apply.
+        if (!SessionUtil.getBooleanProperty(MIME_DECODE_TEXT_STRICT, true)) {
+            return decodeTextNonStrict(text);
+        }
+
+        int offset = 0;
+        final int endOffset = text.length();
+
+        int startWhiteSpace = -1;
+        int endWhiteSpace = -1;
+
+        final StringBuffer decodedText = new StringBuffer(text.length());
+
+        boolean previousTokenEncoded = false;
+
+        while (offset < endOffset) {
+            char ch = text.charAt(offset);
+
+            // is this a whitespace character?
+            if (linearWhiteSpace.indexOf(ch) != -1) {
+                startWhiteSpace = offset;
+                while (offset < endOffset) {
+                    // step over the white space characters.
+                    ch = text.charAt(offset);
+                    if (linearWhiteSpace.indexOf(ch) != -1) {
+                        offset++;
+                    }
+                    else {
+                        // record the location of the first non lwsp and drop down to process the
+                        // token characters.
+                        endWhiteSpace = offset;
+                        break;
+                    }
+                }
+            }
+            else {
+                // we have a word token.  We need to scan over the word and then try to parse it.
+                final int wordStart = offset;
+
+                while (offset < endOffset) {
+                    // step over the white space characters.
+                    ch = text.charAt(offset);
+                    if (linearWhiteSpace.indexOf(ch) == -1) {
+                        offset++;
+                    }
+                    else {
+                        break;
+                    }
+
+                    //NB:  Trailing whitespace on these header strings will just be discarded.
+                }
+                // pull out the word token.
+                final String word = text.substring(wordStart, offset);
+                // is the token encoded?  decode the word
+                if (word.startsWith("=?")) {
+                    try {
+                        // if this gives a parsing failure, treat it like a non-encoded word.
+                        final String decodedWord = decodeWord(word);
+
+                        // are any whitespace characters significant?  Append 'em if we've got 'em.
+                        if (!previousTokenEncoded) {
+                            if (startWhiteSpace != -1) {
+                                decodedText.append(text.substring(startWhiteSpace, endWhiteSpace));
+                                startWhiteSpace = -1;
+                            }
+                        }
+                        // this is definitely a decoded token.
+                        previousTokenEncoded = true;
+                        // and add this to the text.
+                        decodedText.append(decodedWord);
+                        // we continue parsing from here...we allow parsing errors to fall through
+                        // and get handled as normal text.
+                        continue;
+
+                    } catch (final ParseException e) {
+                    }
+                }
+                // this is a normal token, so it doesn't matter what the previous token was.  Add the white space
+                // if we have it.
+                if (startWhiteSpace != -1) {
+                    decodedText.append(text.substring(startWhiteSpace, endWhiteSpace));
+                    startWhiteSpace = -1;
+                }
+                // this is not a decoded token.
+                previousTokenEncoded = false;
+                decodedText.append(word);
+            }
+        }
+
+        return decodedText.toString();
+    }
+
+
+    /**
+     * Decode a string of text obtained from a mail header into
+     * it's proper form.  The text generally will consist of a
+     * string of tokens, some of which may be encoded using
+     * base64 encoding.  This is for non-strict decoded for mailers that
+     * violate the RFC 2047 restriction that decoded tokens must be delimited
+     * by linear white space.  This will scan tokens looking for inner tokens
+     * enclosed in "=?" -- "?=" pairs.
+     *
+     * @param text   The text to decode.
+     *
+     * @return The decoded test string.
+     * @exception UnsupportedEncodingException
+     */
+    private static String decodeTextNonStrict(final String text) throws UnsupportedEncodingException {
+        int offset = 0;
+        final int endOffset = text.length();
+
+        int startWhiteSpace = -1;
+        int endWhiteSpace = -1;
+
+        final StringBuffer decodedText = new StringBuffer(text.length());
+
+        boolean previousTokenEncoded = false;
+
+        while (offset < endOffset) {
+            char ch = text.charAt(offset);
+
+            // is this a whitespace character?
+            if (linearWhiteSpace.indexOf(ch) != -1) {
+                startWhiteSpace = offset;
+                while (offset < endOffset) {
+                    // step over the white space characters.
+                    ch = text.charAt(offset);
+                    if (linearWhiteSpace.indexOf(ch) != -1) {
+                        offset++;
+                    }
+                    else {
+                        // record the location of the first non lwsp and drop down to process the
+                        // token characters.
+                        endWhiteSpace = offset;
+                        break;
+                    }
+                }
+            }
+            else {
+                // we're at the start of a word token.  We potentially need to break this up into subtokens
+                final int wordStart = offset;
+
+                while (offset < endOffset) {
+                    // step over the white space characters.
+                    ch = text.charAt(offset);
+                    if (linearWhiteSpace.indexOf(ch) == -1) {
+                        offset++;
+                    }
+                    else {
+                        break;
+                    }
+
+                    //NB:  Trailing whitespace on these header strings will just be discarded.
+                }
+                // pull out the word token.
+                final String word = text.substring(wordStart, offset);
+
+                int decodeStart = 0;
+
+                // now scan and process each of the bits within here.
+                while (decodeStart < word.length()) {
+                    final int tokenStart = word.indexOf("=?", decodeStart);
+                    if (tokenStart == -1) {
+                        // this is a normal token, so it doesn't matter what the previous token was.  Add the white space
+                        // if we have it.
+                        if (startWhiteSpace != -1) {
+                            decodedText.append(text.substring(startWhiteSpace, endWhiteSpace));
+                            startWhiteSpace = -1;
+                        }
+                        // this is not a decoded token.
+                        previousTokenEncoded = false;
+                        decodedText.append(word.substring(decodeStart));
+                        // we're finished.
+                        break;
+                    }
+                    // we have something to process
+                    else {
+                        // we might have a normal token preceeding this.
+                        if (tokenStart != decodeStart) {
+                            // this is a normal token, so it doesn't matter what the previous token was.  Add the white space
+                            // if we have it.
+                            if (startWhiteSpace != -1) {
+                                decodedText.append(text.substring(startWhiteSpace, endWhiteSpace));
+                                startWhiteSpace = -1;
+                            }
+                            // this is not a decoded token.
+                            previousTokenEncoded = false;
+                            decodedText.append(word.substring(decodeStart, tokenStart));
+                        }
+
+                        // now find the end marker.
+                        final int tokenEnd = word.indexOf("?=", tokenStart);
+                        // sigh, an invalid token.  Treat this as plain text.
+                        if (tokenEnd == -1) {
+                            // this is a normal token, so it doesn't matter what the previous token was.  Add the white space
+                            // if we have it.
+                            if (startWhiteSpace != -1) {
+                                decodedText.append(text.substring(startWhiteSpace, endWhiteSpace));
+                                startWhiteSpace = -1;
+                            }
+                            // this is not a decoded token.
+                            previousTokenEncoded = false;
+                            decodedText.append(word.substring(tokenStart));
+                            // we're finished.
+                            break;
+                        }
+                        else {
+                            // update our ticker
+                            decodeStart = tokenEnd + 2;
+
+                            final String token = word.substring(tokenStart, tokenEnd);
+                            try {
+                                // if this gives a parsing failure, treat it like a non-encoded word.
+                                final String decodedWord = decodeWord(token);
+
+                                // are any whitespace characters significant?  Append 'em if we've got 'em.
+                                if (!previousTokenEncoded) {
+                                    if (startWhiteSpace != -1) {
+                                        decodedText.append(text.substring(startWhiteSpace, endWhiteSpace));
+                                        startWhiteSpace = -1;
+                                    }
+                                }
+                                // this is definitely a decoded token.
+                                previousTokenEncoded = true;
+                                // and add this to the text.
+                                decodedText.append(decodedWord);
+                                // we continue parsing from here...we allow parsing errors to fall through
+                                // and get handled as normal text.
+                                continue;
+
+                            } catch (final ParseException e) {
+                            }
+                            // this is a normal token, so it doesn't matter what the previous token was.  Add the white space
+                            // if we have it.
+                            if (startWhiteSpace != -1) {
+                                decodedText.append(text.substring(startWhiteSpace, endWhiteSpace));
+                                startWhiteSpace = -1;
+                            }
+                            // this is not a decoded token.
+                            previousTokenEncoded = false;
+                            decodedText.append(token);
+                        }
+                    }
+                }
+            }
+        }
+
+        return decodedText.toString();
+    }
+
+    /**
+     * Parse a string using the RFC 2047 rules for an "encoded-word"
+     * type.  This encoding has the syntax:
+     *
+     * encoded-word = "=?" charset "?" encoding "?" encoded-text "?="
+     *
+     * @param word   The possibly encoded word value.
+     *
+     * @return The decoded word.
+     * @exception ParseException
+     * @exception UnsupportedEncodingException
+     */
+    public static String decodeWord(final String word) throws ParseException, UnsupportedEncodingException {
+        // encoded words start with the characters "=?".  If this not an encoded word, we throw a
+        // ParseException for the caller.
+
+        if (!word.startsWith("=?")) {
+            throw new ParseException("Invalid RFC 2047 encoded-word: " + word);
+        }
+
+        final int charsetPos = word.indexOf('?', 2);
+        if (charsetPos == -1) {
+            throw new ParseException("Missing charset in RFC 2047 encoded-word: " + word);
+        }
+
+        // pull out the character set information (this is the MIME name at this point).
+        final String charset = word.substring(2, charsetPos).toLowerCase();
+
+        // now pull out the encoding token the same way.
+        final int encodingPos = word.indexOf('?', charsetPos + 1);
+        if (encodingPos == -1) {
+            throw new ParseException("Missing encoding in RFC 2047 encoded-word: " + word);
+        }
+
+        final String encoding = word.substring(charsetPos + 1, encodingPos);
+
+        // and finally the encoded text.
+        final int encodedTextPos = word.indexOf("?=", encodingPos + 1);
+        if (encodedTextPos == -1) {
+            throw new ParseException("Missing encoded text in RFC 2047 encoded-word: " + word);
+        }
+
+        final String encodedText = word.substring(encodingPos + 1, encodedTextPos);
+
+        // seems a bit silly to encode a null string, but easy to deal with.
+        if (encodedText.length() == 0) {
+            return "";
+        }
+
+        try {
+            // the decoder writes directly to an output stream.
+            final ByteArrayOutputStream out = new ByteArrayOutputStream(encodedText.length());
+
+            final byte[] encodedData = encodedText.getBytes("US-ASCII");
+
+            // Base64 encoded?
+            if (encoding.equals("B")) {
+                Base64.decode(encodedData, out);
+            }
+            // maybe quoted printable.
+            else if (encoding.equals("Q")) {
+                final QuotedPrintableEncoder dataEncoder = new QuotedPrintableEncoder();
+                dataEncoder.decodeWord(encodedData, out);
+            }
+            else {
+                throw new UnsupportedEncodingException("Unknown RFC 2047 encoding: " + encoding);
+            }
+            // get the decoded byte data and convert into a string.
+            final byte[] decodedData = out.toByteArray();
+            return new String(decodedData, javaCharset(charset));
+        } catch (final IOException e) {
+            throw new UnsupportedEncodingException("Invalid RFC 2047 encoding");
+        }
+
+    }
+
+    /**
+     * Wrap an encoder around a given output stream.
+     *
+     * @param out      The output stream to wrap.
+     * @param encoding The name of the encoding.
+     *
+     * @return A instance of FilterOutputStream that manages on the fly
+     *         encoding for the requested encoding type.
+     * @exception MessagingException
+     */
+    public static OutputStream encode(final OutputStream out, String encoding) throws MessagingException {
+        // no encoding specified, so assume it goes out unchanged.
+        if (encoding == null) {
+            return out;
+        }
+
+        encoding = encoding.toLowerCase();
+
+        // some encodies are just pass-throughs, with no real decoding.
+        if (encoding.equals("binary") || encoding.equals("7bit") || encoding.equals("8bit")) {
+            return out;
+        }
+        else if (encoding.equals("base64")) {
+            return new Base64EncoderStream(out);
+        }
+        // UUEncode is known by a couple historical extension names too.
+        else if (encoding.equals("uuencode") || encoding.equals("x-uuencode") || encoding.equals("x-uue")) {
+            return new UUEncoderStream(out);
+        }
+        else if (encoding.equals("quoted-printable")) {
+            return new QuotedPrintableEncoderStream(out);
+        }
+        else {
+            throw new MessagingException("Unknown encoding " + encoding);
+        }
+    }
+
+    /**
+     * Wrap an encoder around a given output stream.
+     *
+     * @param out      The output stream to wrap.
+     * @param encoding The name of the encoding.
+     * @param filename The filename of the data being sent (only used for UUEncode).
+     *
+     * @return A instance of FilterOutputStream that manages on the fly
+     *         encoding for the requested encoding type.
+     * @exception MessagingException
+     */
+    public static OutputStream encode(final OutputStream out, String encoding, final String filename) throws MessagingException {
+        encoding = encoding.toLowerCase();
+
+        // some encodies are just pass-throughs, with no real decoding.
+        if (encoding.equals("binary") || encoding.equals("7bit") || encoding.equals("8bit")) {
+            return out;
+        }
+        else if (encoding.equals("base64")) {
+            return new Base64EncoderStream(out);
+        }
+        // UUEncode is known by a couple historical extension names too.
+        else if (encoding.equals("uuencode") || encoding.equals("x-uuencode") || encoding.equals("x-uue")) {
+            return new UUEncoderStream(out, filename);
+        }
+        else if (encoding.equals("quoted-printable")) {
+             return new QuotedPrintableEncoderStream(out);
+        }
+        else {
+            throw new MessagingException("Unknown encoding " + encoding);
+        }
+    }
+
+
+    public static String encodeText(final String word) throws UnsupportedEncodingException {
+        return encodeText(word, null, null);
+    }
+
+    public static String encodeText(final String word, final String charset, final String encoding) throws UnsupportedEncodingException {
+        return encodeWord(word, charset, encoding, false);
+    }
+
+    public static String encodeWord(final String word) throws UnsupportedEncodingException {
+        return encodeWord(word, null, null);
+    }
+
+    public static String encodeWord(final String word, final String charset, final String encoding) throws UnsupportedEncodingException {
+        return encodeWord(word, charset, encoding, true);
+    }
+
+
+    private static String encodeWord(final String word, String charset, final String encoding, final boolean encodingWord) throws UnsupportedEncodingException {
+
+        // figure out what we need to encode this.
+        String encoder = ASCIIUtil.getTextTransferEncoding(word);
+        // all ascii?  We can return this directly,
+        if (encoder.equals("7bit")) {
+            return word;
+        }
+
+        // if not given a charset, use the default.
+        if (charset == null) {
+            charset = getDefaultMIMECharset();
+        }
+
+        // sort out the encoder.  If not explicitly given, use the best guess we've already established.
+        if (encoding != null) {
+            if (encoding.equalsIgnoreCase("B")) {
+                encoder = "base64";
+            }
+            else if (encoding.equalsIgnoreCase("Q")) {
+                encoder = "quoted-printable";
+            }
+            else {
+                throw new UnsupportedEncodingException("Unknown transfer encoding: " + encoding);
+            }
+        }
+
+        try {
+            
+            // we'll format this directly into the string buffer 
+            final StringBuffer result = new StringBuffer(); 
+            
+            // this is the maximum size of a segment of encoded data, which is based off 
+            // of a 75 character size limit and all of the encoding overhead elements.
+            final int sizeLimit = 75 - 7 - charset.length();
+            
+            // now do the appropriate encoding work 
+            if (encoder.equals("base64")) {
+                final Base64Encoder dataEncoder = new Base64Encoder();
+                // this may recurse on the encoding if the string is too long.  The left-most will not 
+                // get a segment delimiter 
+                encodeBase64(word, result, sizeLimit, charset, dataEncoder, true, SessionUtil.getBooleanProperty(MIME_FOLDENCODEDWORDS, false)); 
+            }
+            else {
+                final QuotedPrintableEncoder dataEncoder = new QuotedPrintableEncoder();
+                encodeQuotedPrintable(word, result, sizeLimit, charset, dataEncoder, true, 
+                    SessionUtil.getBooleanProperty(MIME_FOLDENCODEDWORDS, false), encodingWord ? QP_WORD_SPECIALS : QP_TEXT_SPECIALS); 
+            }
+            return result.toString();    
+        } catch (final IOException e) {
+            throw new UnsupportedEncodingException("Invalid encoding");
+        }
+    }
+    
+    
+    /**
+     * Encode a string into base64 encoding, taking into 
+     * account the maximum segment length. 
+     * 
+     * @param data      The string data to encode.
+     * @param out       The output buffer used for the result.
+     * @param sizeLimit The maximum amount of encoded data we're allowed
+     *                  to have in a single encoded segment.
+     * @param charset   The character set marker that needs to be added to the
+     *                  encoding header.
+     * @param encoder   The encoder instance we're using.
+     * @param firstSegment
+     *                  If true, this is the first (left-most) segment in the
+     *                  data.  Used to determine if segment delimiters need to
+     *                  be added between sections.
+     * @param foldSegments
+     *                  Indicates the type of delimiter to use (blank or newline sequence).
+     */
+    static private void encodeBase64(final String data, final StringBuffer out, final int sizeLimit, final String charset, final Base64Encoder encoder, final boolean firstSegment, final boolean foldSegments) throws IOException
+    {
+        // this needs to be converted into the appropriate transfer encoding. 
+        final byte [] bytes = data.getBytes(javaCharset(charset)); 
+        
+        final int estimatedSize = encoder.estimateEncodedLength(bytes); 
+        
+        // if the estimated encoding size is over our segment limit, split the string in half and 
+        // recurse.  Eventually we'll reach a point where things are small enough.  
+        if (estimatedSize > sizeLimit) {
+            // the first segment indicator travels with the left half. 
+            encodeBase64(data.substring(0, data.length() / 2), out, sizeLimit, charset, encoder, firstSegment, foldSegments);
+            // the second half can never be the first segment 
+            encodeBase64(data.substring(data.length() / 2), out, sizeLimit, charset, encoder, false, foldSegments);
+        }
+        else 
+        {
+            // if this is not the first sement of the encoding, we need to add either a blank or 
+            // a newline sequence to the data 
+            if (!firstSegment) {
+                if (foldSegments) {
+                    out.append("\r\n"); 
+                }
+                else {
+                    out.append(' '); 
+                }
+            }
+            // do the encoding of the segment.
+            encoder.encodeWord(bytes, out, charset);
+        }
+    }
+    
+    
+    /**
+     * Encode a string into quoted printable encoding, taking into 
+     * account the maximum segment length. 
+     * 
+     * @param data      The string data to encode.
+     * @param out       The output buffer used for the result.
+     * @param sizeLimit The maximum amount of encoded data we're allowed
+     *                  to have in a single encoded segment.
+     * @param charset   The character set marker that needs to be added to the
+     *                  encoding header.
+     * @param encoder   The encoder instance we're using.
+     * @param firstSegment
+     *                  If true, this is the first (left-most) segment in the
+     *                  data.  Used to determine if segment delimiters need to
+     *                  be added between sections.
+     * @param foldSegments
+     *                  Indicates the type of delimiter to use (blank or newline sequence).
+     */
+    static private void encodeQuotedPrintable(final String data, final StringBuffer out, final int sizeLimit, final String charset, final QuotedPrintableEncoder encoder, 
+        final boolean firstSegment, final boolean foldSegments, final String specials)  throws IOException 
+    {
+        // this needs to be converted into the appropriate transfer encoding. 
+        final byte [] bytes = data.getBytes(javaCharset(charset)); 
+        
+        final int estimatedSize = encoder.estimateEncodedLength(bytes, specials); 
+        
+        // if the estimated encoding size is over our segment limit, split the string in half and 
+        // recurse.  Eventually we'll reach a point where things are small enough.  
+        if (estimatedSize > sizeLimit) {
+            // the first segment indicator travels with the left half. 
+            encodeQuotedPrintable(data.substring(0, data.length() / 2), out, sizeLimit, charset, encoder, firstSegment, foldSegments, specials);
+            // the second half can never be the first segment 
+            encodeQuotedPrintable(data.substring(data.length() / 2), out, sizeLimit, charset, encoder, false, foldSegments, specials);
+        }
+        else 
+        {
+            // if this is not the first sement of the encoding, we need to add either a blank or 
+            // a newline sequence to the data 
+            if (!firstSegment) {
+                if (foldSegments) {
+                    out.append("\r\n"); 
+                }
+                else {
+                    out.append(' '); 
+                }
+            }
+            // do the encoding of the segment.
+            encoder.encodeWord(bytes, out, charset, specials);
+        }
+    }
+
+
+    /**
+     * Examine the content of a data source and decide what type
+     * of transfer encoding should be used.  For text streams,
+     * we'll decided between 7bit, quoted-printable, and base64.
+     * For binary content types, we'll use either 7bit or base64.
+     *
+     * @param handler The DataHandler associated with the content.
+     *
+     * @return The string name of an encoding used to transfer the content.
+     */
+    public static String getEncoding(final DataHandler handler) {
+
+
+        // if this handler has an associated data source, we can read directly from the
+        // data source to make this judgment.  This is generally MUCH faster than asking the
+        // DataHandler to write out the data for us.
+        final DataSource ds = handler.getDataSource();
+        if (ds != null) {
+            return getEncoding(ds);
+        }
+
+        try {
+            // get a parser that allows us to make comparisons.
+            final ContentType content = new ContentType(handler.getContentType());
+
+            // The only access to the content bytes at this point is by asking the handler to write
+            // the information out to a stream.  We're going to pipe this through a special stream
+            // that examines the bytes as they go by.
+            final ContentCheckingOutputStream checker = new ContentCheckingOutputStream();
+
+            handler.writeTo(checker);
+
+            // figure this out based on whether we believe this to be a text type or not.
+            if (content.match("text/*")) {
+                return checker.getTextTransferEncoding();
+            }
+            else {
+                return checker.getBinaryTransferEncoding();
+            }
+
+        } catch (final Exception e) {
+            // any unexpected I/O exceptions we'll force to a "safe" fallback position.
+            return "base64";
+        }
+    }
+
+
+    /**
+     * Determine the what transfer encoding should be used for
+     * data retrieved from a DataSource.
+     *
+     * @param source The DataSource for the transmitted data.
+     *
+     * @return The string name of the encoding form that should be used for
+     *         the data.
+     */
+    public static String getEncoding(final DataSource source) {
+        
+        if(source instanceof EncodingAware) {
+            final String encoding = ((EncodingAware) source).getEncoding();
+            
+            if(encoding != null) {
+                return encoding;
+            }
+        }
+        
+        InputStream in = null;
+
+        try {
+            // get a parser that allows us to make comparisons.
+            final ContentType content = new ContentType(source.getContentType());
+
+            // we're probably going to have to scan the data.
+            in = source.getInputStream();
+
+            if (!content.match("text/*")) {
+                // Not purporting to be a text type?  Examine the content to see we might be able to
+                // at least pretend it is an ascii type.
+                return ASCIIUtil.getBinaryTransferEncoding(in);
+            }
+            else {
+                return ASCIIUtil.getTextTransferEncoding(in);
+            }
+        } catch (final Exception e) {
+            // this was a problem...not sure what makes sense here, so we'll assume it's binary
+            // and we need to transfer this using Base64 encoding.
+            return "base64";
+        } finally {
+            // make sure we close the stream
+            try {
+                if (in != null) {
+                    in.close();
+                }
+            } catch (final IOException e) {
+            }
+        }
+    }
+
+
+    /**
+     * Quote a "word" value.  If the word contains any character from
+     * the specified "specials" list, this value is returned as a
+     * quoted strong.  Otherwise, it is returned unchanged (an "atom").
+     *
+     * @param word     The word requiring quoting.
+     * @param specials The set of special characters that can't appear in an unquoted
+     *                 string.
+     *
+     * @return The quoted value.  This will be unchanged if the word doesn't contain
+     *         any of the designated special characters.
+     */
+    public static String quote(final String word, final String specials) {
+        final int wordLength = word.length();
+        // scan the string looking for problem characters
+        for (int i =0; i < wordLength; i++) {
+            final char ch = word.charAt(i);
+            // special escaped characters require escaping, which also implies quoting.
+            if (escapedChars.indexOf(ch) >= 0) {
+                return quoteAndEscapeString(word);
+            }
+            // now check for control characters or the designated special characters.
+            if (ch < 32 || ch >= 127 || specials.indexOf(ch) >= 0) {
+                // we know this requires quoting, but we still need to scan the entire string to
+                // see if contains chars that require escaping.  Just go ahead and treat it as if it does.
+                return quoteAndEscapeString(word);
+            }
+        }
+        return word;
+    }
+
+    /**
+     * Take a string and return it as a formatted quoted string, with
+     * all characters requiring escaping handled properly.
+     *
+     * @param word   The string to quote.
+     *
+     * @return The quoted string.
+     */
+    private static String quoteAndEscapeString(final String word) {
+        final int wordLength = word.length();
+        // allocate at least enough for the string and two quotes plus a reasonable number of escaped chars.
+        final StringBuffer buffer = new StringBuffer(wordLength + 10);
+        // add the leading quote.
+        buffer.append('"');
+
+        for (int i = 0; i < wordLength; i++) {
+            final char ch = word.charAt(i);
+            // is this an escaped char?
+            if (escapedChars.indexOf(ch) >= 0) {
+                // add the escape marker before appending.
+                buffer.append('\\');
+            }
+            buffer.append(ch);
+        }
+        // now the closing quote
+        buffer.append('"');
+        return buffer.toString();
+    }
+
+    /**
+     * Translate a MIME standard character set name into the Java
+     * equivalent.
+     *
+     * @param charset The MIME standard name.
+     *
+     * @return The Java equivalent for this name.
+     */
+    public static String javaCharset(final String charset) {
+        // nothing in, nothing out.
+        if (charset == null) {
+            return null;
+        }
+
+        final String mappedCharset = (String)mime2java.get(charset.toLowerCase());
+        // if there is no mapping, then the original name is used.  Many of the MIME character set
+        // names map directly back into Java.  The reverse isn't necessarily true.
+        return mappedCharset == null ? charset : mappedCharset;
+    }
+
+    /**
+     * Map a Java character set name into the MIME equivalent.
+     *
+     * @param charset The java character set name.
+     *
+     * @return The MIME standard equivalent for this character set name.
+     */
+    public static String mimeCharset(final String charset) {
+        // nothing in, nothing out.
+        if (charset == null) {
+            return null;
+        }
+
+        final String mappedCharset = (String)java2mime.get(charset.toLowerCase());
+        // if there is no mapping, then the original name is used.  Many of the MIME character set
+        // names map directly back into Java.  The reverse isn't necessarily true.
+        return mappedCharset == null ? charset : mappedCharset;
+    }
+
+
+    /**
+     * Get the default character set to use, in Java name format.
+     * This either be the value set with the mail.mime.charset
+     * system property or obtained from the file.encoding system
+     * property.  If neither of these is set, we fall back to
+     * 8859_1 (basically US-ASCII).
+     *
+     * @return The character string value of the default character set.
+     */
+    public static String getDefaultJavaCharset() {
+        final String charset = SessionUtil.getProperty("mail.mime.charset");
+        if (charset != null) {
+            return javaCharset(charset);
+        }
+        return SessionUtil.getProperty("file.encoding", "8859_1");
+    }
+
+    /**
+     * Get the default character set to use, in MIME name format.
+     * This either be the value set with the mail.mime.charset
+     * system property or obtained from the file.encoding system
+     * property.  If neither of these is set, we fall back to
+     * 8859_1 (basically US-ASCII).
+     *
+     * @return The character string value of the default character set.
+     */
+    static String getDefaultMIMECharset() {
+        // if the property is specified, this can be used directly.
+        final String charset = SessionUtil.getProperty("mail.mime.charset");
+        if (charset != null) {
+            return charset;
+        }
+
+        // get the Java-defined default and map back to a MIME name.
+        return mimeCharset(SessionUtil.getProperty("file.encoding", "8859_1"));
+    }
+
+
+    /**
+     * Load the default mapping tables used by the javaCharset()
+     * and mimeCharset() methods.  By default, these tables are
+     * loaded from the /META-INF/javamail.charset.map file.  If
+     * something goes wrong loading that file, we configure things
+     * with a default mapping table (which just happens to mimic
+     * what's in the default mapping file).
+     */
+    static private void loadCharacterSetMappings() {
+        java2mime = new HashMap();
+        mime2java = new HashMap();
+
+
+        // normally, these come from a character map file contained in the jar file.
+        try {
+            final InputStream map = javax.mail.internet.MimeUtility.class.getResourceAsStream("/META-INF/javamail.charset.map");
+
+            if (map != null) {
+                // get a reader for this so we can load.
+                final BufferedReader reader = new BufferedReader(new InputStreamReader(map));
+
+                readMappings(reader, java2mime);
+                readMappings(reader, mime2java);
+            }
+        } catch (final Exception e) {
+        }
+
+        // if any sort of error occurred reading the preferred file version, we could end up with empty
+        // mapping tables.  This could cause all sorts of difficulty, so ensure they are populated with at
+        // least a reasonable set of defaults.
+
+        // these mappings echo what's in the default file.
+        if (java2mime.isEmpty()) {
+            java2mime.put("8859_1", "ISO-8859-1");
+            java2mime.put("iso8859_1", "ISO-8859-1");
+            java2mime.put("iso8859-1", "ISO-8859-1");
+
+            java2mime.put("8859_2", "ISO-8859-2");
+            java2mime.put("iso8859_2", "ISO-8859-2");
+            java2mime.put("iso8859-2", "ISO-8859-2");
+
+            java2mime.put("8859_3", "ISO-8859-3");
+            java2mime.put("iso8859_3", "ISO-8859-3");
+            java2mime.put("iso8859-3", "ISO-8859-3");
+
+            java2mime.put("8859_4", "ISO-8859-4");
+            java2mime.put("iso8859_4", "ISO-8859-4");
+            java2mime.put("iso8859-4", "ISO-8859-4");
+
+            java2mime.put("8859_5", "ISO-8859-5");
+            java2mime.put("iso8859_5", "ISO-8859-5");
+            java2mime.put("iso8859-5", "ISO-8859-5");
+
+            java2mime.put ("8859_6", "ISO-8859-6");
+            java2mime.put("iso8859_6", "ISO-8859-6");
+            java2mime.put("iso8859-6", "ISO-8859-6");
+
+            java2mime.put("8859_7", "ISO-8859-7");
+            java2mime.put("iso8859_7", "ISO-8859-7");
+            java2mime.put("iso8859-7", "ISO-8859-7");
+
+            java2mime.put("8859_8", "ISO-8859-8");
+            java2mime.put("iso8859_8", "ISO-8859-8");
+            java2mime.put("iso8859-8", "ISO-8859-8");
+
+            java2mime.put("8859_9", "ISO-8859-9");
+            java2mime.put("iso8859_9", "ISO-8859-9");
+            java2mime.put("iso8859-9", "ISO-8859-9");
+
+            java2mime.put("sjis", "Shift_JIS");
+            java2mime.put ("jis", "ISO-2022-JP");
+            java2mime.put("iso2022jp", "ISO-2022-JP");
+            java2mime.put("euc_jp", "euc-jp");
+            java2mime.put("koi8_r", "koi8-r");
+            java2mime.put("euc_cn", "euc-cn");
+            java2mime.put("euc_tw", "euc-tw");
+            java2mime.put("euc_kr", "euc-kr");
+        }
+
+        if (mime2java.isEmpty ()) {
+            mime2java.put("iso-2022-cn", "ISO2022CN");
+            mime2java.put("iso-2022-kr", "ISO2022KR");
+            mime2java.put("utf-8", "UTF8");
+            mime2java.put("utf8", "UTF8");
+            mime2java.put("ja_jp.iso2022-7", "ISO2022JP");
+            mime2java.put("ja_jp.eucjp", "EUCJIS");
+            mime2java.put ("euc-kr", "KSC5601");
+            mime2java.put("euckr", "KSC5601");
+            mime2java.put("us-ascii", "ISO-8859-1");
+            mime2java.put("x-us-ascii", "ISO-8859-1");
+        }
+    }
+
+
+    /**
+     * Read a section of a character map table and populate the
+     * target mapping table with the information.  The table end
+     * is marked by a line starting with "--" and also ending with
+     * "--".  Blank lines and comment lines (beginning with '#') are
+     * ignored.
+     *
+     * @param reader The source of the file information.
+     * @param table  The mapping table used to store the information.
+     */
+    static private void readMappings(final BufferedReader reader, final Map table) throws IOException {
+        // process lines to the EOF or the end of table marker.
+        while (true) {
+            String line = reader.readLine();
+            // no line returned is an EOF
+            if (line == null) {
+                return;
+            }
+
+            // trim so we're not messed up by trailing blanks
+            line = line.trim();
+
+            if (line.length() == 0 || line.startsWith("#")) {
+                continue;
+            }
+
+            // stop processing if this is the end-of-table marker.
+            if (line.startsWith("--") && line.endsWith("--")) {
+                return;
+            }
+
+            // we allow either blanks or tabs as token delimiters.
+            final StringTokenizer tokenizer = new StringTokenizer(line, " \t");
+
+            try {
+                final String from = tokenizer.nextToken().toLowerCase();
+                final String to = tokenizer.nextToken();
+
+                table.put(from, to);
+            } catch (final NoSuchElementException e) {
+                // just ignore the line if invalid.
+            }
+        }
+    }
+
+
+    /**
+     * Perform RFC 2047 text folding on a string of text.
+     *
+     * @param used   The amount of text already "used up" on this line.  This is
+     *               typically the length of a message header that this text
+     *               get getting added to.
+     * @param s      The text to fold.
+     *
+     * @return The input text, with linebreaks inserted at appropriate fold points.
+     */
+    public static String fold(int used, String s) {
+        // if folding is disable, unfolding is also.  Return the string unchanged.
+        if (!SessionUtil.getBooleanProperty(MIME_FOLDTEXT, true)) {
+            return s;
+        }
+
+        int end;
+
+        // now we need to strip off any trailing "whitespace", where whitespace is blanks, tabs,
+        // and line break characters.
+        for (end = s.length() - 1; end >= 0; end--) {
+            final int ch = s.charAt(end);
+            if (ch != ' ' && ch != '\t' ) {
+                break;
+            }
+        }
+
+        // did we actually find something to remove?  Shorten the String to the trimmed length
+        if (end != s.length() - 1) {
+            s = s.substring(0, end + 1);
+        }
+
+        // does the string as it exists now not require folding?  We can just had that back right off.
+        if (s.length() + used <= FOLD_THRESHOLD) {
+            return s;
+        }
+
+        // get a buffer for the length of the string, plus room for a few line breaks.
+        // these are soft line breaks, so we generally need more that just the line breaks (an escape +
+        // CR + LF + leading space on next line);
+        final StringBuffer newString = new StringBuffer(s.length() + 8);
+
+
+        // now keep chopping this down until we've accomplished what we need.
+        while (used + s.length() > FOLD_THRESHOLD) {
+            int breakPoint = -1;
+            char breakChar = 0;
+
+            // now scan for the next place where we can break.
+            for (int i = 0; i < s.length(); i++) {
+                // have we passed the fold limit?
+                if (used + i > FOLD_THRESHOLD) {
+                    // if we've already seen a blank, then stop now.  Otherwise
+                    // we keep going until we hit a fold point.
+                    if (breakPoint != -1) {
+                        break;
+                    }
+                }
+                char ch = s.charAt(i);
+
+                // a white space character?
+                if (ch == ' ' || ch == '\t') {
+                    // this might be a run of white space, so skip over those now.
+                    breakPoint = i;
+                    // we need to maintain the same character type after the inserted linebreak.
+                    breakChar = ch;
+                    i++;
+                    while (i < s.length()) {
+                        ch = s.charAt(i);
+                        if (ch != ' ' && ch != '\t') {
+                            break;
+                        }
+                        i++;
+                    }
+                }
+                // found an embedded new line.  Escape this so that the unfolding process preserves it.
+                else if (ch == '\n') {
+                    newString.append('\\');
+                    newString.append('\n');
+                }
+                else if (ch == '\r') {
+                    newString.append('\\');
+                    newString.append('\n');
+                    i++;
+                    // if this is a CRLF pair, add the second char also
+                    if (i < s.length() && s.charAt(i) == '\n') {
+                        newString.append('\r');
+                    }
+                }
+
+            }
+            // no fold point found, we punt, append the remainder and leave.
+            if (breakPoint == -1) {
+                newString.append(s);
+                return newString.toString();
+            }
+            newString.append(s.substring(0, breakPoint));
+            newString.append("\r\n");
+            newString.append(breakChar);
+            // chop the string
+            s = s.substring(breakPoint + 1);
+            // start again, and we've used the first char of the limit already with the whitespace char.
+            used = 1;
+        }
+
+        // add on the remainder, and return
+        newString.append(s);
+        return newString.toString();
+    }
+
+    /**
+     * Unfold a folded string.  The unfolding process will remove
+     * any line breaks that are not escaped and which are also followed
+     * by whitespace characters.
+     *
+     * @param s      The folded string.
+     *
+     * @return A new string with unfolding rules applied.
+     */
+    public static String unfold(final String s) {
+        // if folding is disable, unfolding is also.  Return the string unchanged.
+        if (!SessionUtil.getBooleanProperty(MIME_FOLDTEXT, true)) {
+            return s;
+        }
+
+        // if there are no line break characters in the string, we can just return this.
+        if (s.indexOf('\n') < 0 && s.indexOf('\r') < 0) {
+            return s;
+        }
+
+        // we need to scan and fix things up.
+        final int length = s.length();
+
+        final StringBuffer newString = new StringBuffer(length);
+
+        // scan the entire string
+        for (int i = 0; i < length; i++) {
+            final char ch = s.charAt(i);
+
+            // we have a backslash.  In folded strings, escape characters are only processed as such if
+            // they precede line breaks.  Otherwise, we leave it be.
+            if (ch == '\\') {
+                // escape at the very end?  Just add the character.
+                if (i == length - 1) {
+                    newString.append(ch);
+                }
+                else {
+                    final int nextChar = s.charAt(i + 1);
+
+                    // naked newline?  Add the new line to the buffer, and skip the escape char.
+                    if (nextChar == '\n') {
+                        newString.append('\n');
+                        i++;
+                    }
+                    else if (nextChar == '\r') {
+                        // just the CR left?  Add it, removing the escape.
+                        if (i == length - 2 || s.charAt(i + 2) != '\r') {
+                            newString.append('\r');
+                            i++;
+                        }
+                        else {
+                            // toss the escape, add both parts of the CRLF, and skip over two chars.
+                            newString.append('\r');
+                            newString.append('\n');
+                            i += 2;
+                        }
+                    }
+                    else {
+                        // an escape for another purpose, just copy it over.
+                        newString.append(ch);
+                    }
+                }
+            }
+            // we have an unescaped line break
+            else if (ch == '\n' || ch == '\r') {
+                // remember the position in case we need to backtrack.
+                boolean CRLF = false;
+
+                if (ch == '\r') {
+                    // check to see if we need to step over this.
+                    if (i < length - 1 && s.charAt(i + 1) == '\n') {
+                        i++;
+                        // flag the type so we know what we might need to preserve.
+                        CRLF = true;
+                    }
+                }
+
+                // get a temp position scanner.
+                final int scan = i + 1;
+
+                // does a blank follow this new line?  we need to scrap the new line and reduce the leading blanks
+                // down to a single blank.
+                if (scan < length && s.charAt(scan) == ' ') {
+                    // add the character
+                    newString.append(' ');
+
+                    // scan over the rest of the blanks
+                    i = scan + 1;
+                    while (i < length && s.charAt(i) == ' ') {
+                        i++;
+                    }
+                    // we'll increment down below, so back up to the last blank as the current char.
+                    i--;
+                }
+                else {
+                    // we must keep this line break.  Append the appropriate style.
+                    if (CRLF) {
+                        newString.append("\r\n");
+                    }
+                    else {
+                        newString.append(ch);
+                    }
+                }
+            }
+            else {
+                // just a normal, ordinary character
+                newString.append(ch);
+            }
+        }
+        return newString.toString();
+    }
+}
+
+
+/**
+ * Utility class for examining content information written out
+ * by a DataHandler object.  This stream gathers statistics on
+ * the stream so it can make transfer encoding determinations.
+ */
+class ContentCheckingOutputStream extends OutputStream {
+    private int asciiChars = 0;
+    private int nonAsciiChars = 0;
+    private boolean containsLongLines = false;
+    private boolean containsMalformedEOL = false;
+    private int previousChar = 0;
+    private int span = 0;
+
+    ContentCheckingOutputStream() {
+    }
+
+    @Override
+    public void write(final byte[] data) throws IOException {
+        write(data, 0, data.length);
+    }
+
+    @Override
+    public void write(final byte[] data, final int offset, final int length) throws IOException {
+        for (int i = 0; i < length; i++) {
+            write(data[offset + i]);
+        }
+    }
+
+    @Override
+    public void write(final int ch) {
+        // we found a linebreak.  Reset the line length counters on either one.  We don't
+        // really need to validate here.
+        if (ch == '\n' || ch == '\r') {
+            // we found a newline, this is only valid if the previous char was the '\r'
+            if (ch == '\n') {
+                // malformed linebreak?  force this to base64 encoding.
+                if (previousChar != '\r') {
+                    containsMalformedEOL = true;
+                }
+            }
+            // hit a line end, reset our line length counter
+            span = 0;
+        }
+        else {
+            span++;
+            // the text has long lines, we can't transfer this as unencoded text.
+            if (span > 998) {
+                containsLongLines = true;
+            }
+
+            // non-ascii character, we have to transfer this in binary.
+            if (!ASCIIUtil.isAscii(ch)) {
+                nonAsciiChars++;
+            }
+            else {
+                asciiChars++;
+            }
+        }
+        previousChar = ch;
+    }
+
+
+    public String getBinaryTransferEncoding() {
+        if (nonAsciiChars != 0 || containsLongLines || containsMalformedEOL) {
+            return "base64";
+        }
+        else {
+            return "7bit";
+        }
+    }
+
+    public String getTextTransferEncoding() {
+        // looking good so far, only valid chars here.
+        if (nonAsciiChars == 0) {
+            // does this contain long text lines?  We need to use a Q-P encoding which will
+            // be only slightly longer, but handles folding the longer lines.
+            if (containsLongLines) {
+                return "quoted-printable";
+            }
+            else {
+                // ideal!  Easiest one to handle.
+                return "7bit";
+            }
+        }
+        else {
+            // mostly characters requiring encoding?  Base64 is our best bet.
+            if (nonAsciiChars > asciiChars) {
+                return "base64";
+            }
+            else {
+                // Q-P encoding will use fewer bytes than the full Base64.
+                return "quoted-printable";
+            }
+        }
+    }
+}

Added: geronimo/specs/trunk/geronimo-javamail_1.5_spec/src/main/java/javax/mail/internet/NewsAddress.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-javamail_1.5_spec/src/main/java/javax/mail/internet/NewsAddress.java?rev=1620683&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-javamail_1.5_spec/src/main/java/javax/mail/internet/NewsAddress.java (added)
+++ geronimo/specs/trunk/geronimo-javamail_1.5_spec/src/main/java/javax/mail/internet/NewsAddress.java Tue Aug 26 18:17:06 2014
@@ -0,0 +1,165 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package javax.mail.internet;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.StringTokenizer;
+
+import javax.mail.Address;
+
+/**
+ * A representation of an RFC1036 Internet newsgroup address.
+ *
+ * @version $Rev$ $Date$
+ */
+public class NewsAddress extends Address {
+	
+	private static final long serialVersionUID = -4203797299824684143L;
+	
+    /**
+     * The host for this newsgroup
+     */
+    protected String host;
+
+    /**
+     * The name of this newsgroup
+     */
+    protected String newsgroup;
+
+    public NewsAddress() {
+    }
+
+    public NewsAddress(final String newsgroup) {
+        this.newsgroup = newsgroup;
+    }
+
+    public NewsAddress(final String newsgroup, final String host) {
+        this.newsgroup = newsgroup;
+        this.host = host;
+    }
+
+    /**
+     * The type of this address; always "news".
+     * @return "news"
+     */
+    @Override
+    public String getType() {
+        return "news";
+    }
+
+    public void setNewsgroup(final String newsgroup) {
+        this.newsgroup = newsgroup;
+    }
+
+    public String getNewsgroup() {
+        return newsgroup;
+    }
+
+    public void setHost(final String host) {
+        this.host = host;
+    }
+
+    public String getHost() {
+        return host;
+    }
+
+    @Override
+    public String toString() {
+        // Sun impl only appears to return the newsgroup name, no host.
+        return newsgroup;
+    }
+
+    @Override
+    public boolean equals(final Object o) {
+        if (this == o) {
+			return true;
+		}
+        if (!(o instanceof NewsAddress)) {
+			return false;
+		}
+
+        final NewsAddress newsAddress = (NewsAddress) o;
+
+        if (host != null ? !host.equals(newsAddress.host) : newsAddress.host != null) {
+			return false;
+		}
+        if (newsgroup != null ? !newsgroup.equals(newsAddress.newsgroup) : newsAddress.newsgroup != null) {
+			return false;
+		}
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result;
+        result = (host != null ? host.toLowerCase().hashCode() : 0);
+        result = 29 * result + (newsgroup != null ? newsgroup.hashCode() : 0);
+        return result;
+    }
+
+    /**
+     * Parse a comma-spearated list of addresses.
+     *
+     * @param addresses the list to parse
+     * @return the array of extracted addresses
+     * @throws AddressException if one of the addresses is invalid
+     */
+    public static NewsAddress[] parse(final String addresses) throws AddressException {
+        final List result = new ArrayList();
+        final StringTokenizer tokenizer = new StringTokenizer(addresses, ",");
+        while (tokenizer.hasMoreTokens()) {
+            final String address = tokenizer.nextToken().trim();
+            final int index = address.indexOf('@');
+            if (index == -1) {
+                result.add(new NewsAddress(address));
+            } else {
+                final String newsgroup = address.substring(0, index).trim();
+                final String host = address.substring(index+1).trim();
+                result.add(new NewsAddress(newsgroup, host));
+            }
+        }
+        return (NewsAddress[]) result.toArray(new NewsAddress[result.size()]);
+    }
+
+    /**
+     * Convert the supplied addresses to a comma-separated String.
+     * If addresses is null, returns null; if empty, returns an empty string.
+     *
+     * @param addresses the addresses to convert
+     * @return a comma-separated list of addresses
+     */
+    public static String toString(final Address[] addresses) {
+        if (addresses == null) {
+            return null;
+        }
+        if (addresses.length == 0) {
+            return "";
+        }
+
+        final StringBuffer result = new StringBuffer(addresses.length * 32);
+        result.append(addresses[0]);
+        for (int i = 1; i < addresses.length; i++) {
+            result.append(',').append(addresses[i].toString());
+        }
+        return result.toString();
+    }
+}

Added: geronimo/specs/trunk/geronimo-javamail_1.5_spec/src/main/java/javax/mail/internet/ParameterList.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-javamail_1.5_spec/src/main/java/javax/mail/internet/ParameterList.java?rev=1620683&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-javamail_1.5_spec/src/main/java/javax/mail/internet/ParameterList.java (added)
+++ geronimo/specs/trunk/geronimo-javamail_1.5_spec/src/main/java/javax/mail/internet/ParameterList.java Tue Aug 26 18:17:06 2014
@@ -0,0 +1,604 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package javax.mail.internet;
+
+import java.io.ByteArrayOutputStream;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.TreeMap;
+
+import org.apache.geronimo.mail.util.ASCIIUtil;
+import org.apache.geronimo.mail.util.RFC2231Encoder;
+import org.apache.geronimo.mail.util.SessionUtil;
+// Represents lists in things like
+
+// Content-Type: text/plain;charset=klingon
+//
+// The ;charset=klingon is the parameter list, may have more of them with ';'
+//
+// The string could also look like
+//
+// Content-Type: text/plain;para1*=val1; para2*=val2; title*=us-ascii'en-us'This%20is%20%2A%2A%2Afun%2A%2A%2A
+//
+// And this (multisegment parameter) is also possible (since JavaMail 1.5)
+//
+// Content-Type: message/external-body; access-type=URL;
+// URL*0="ftp://";
+// URL*1="cs.utk.edu/pub/moore/bulk-mailer/bulk-mailer.tar"
+//
+// which is the same as:
+// Content-Type: message/external-body; access-type=URL;
+//     URL="ftp://cs.utk.edu/pub/moore/bulk-mailer/bulk-mailer.tar"
+/*
+ * Content-Type: application/x-stuff
+    title*0*=us-ascii'en'This%20is%20even%20more%20
+    title*1*=%2A%2A%2Afun%2A%2A%2A%20
+    title*2="isn't it!"
+ */
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class ParameterList {
+    private static final String MIME_ENCODEPARAMETERS = "mail.mime.encodeparameters";
+    private static final String MIME_DECODEPARAMETERS = "mail.mime.decodeparameters";
+    private static final String MIME_DECODEPARAMETERS_STRICT = "mail.mime.decodeparameters.strict";
+
+    private static final int HEADER_SIZE_LIMIT = 76;
+
+    private final Map<String, ParameterValue> _parameters = new HashMap<String, ParameterValue>();
+
+    /**
+     * A set of names for multi-segment parameters that we
+     * haven't processed yet.  Normally such names are accumulated
+     * during the inital parse and processed at the end of the parse,
+     * but such names can also be set via the set method when the
+     * IMAP provider accumulates pre-parsed pieces of a parameter list.
+     * (A special call to the set method tells us when the IMAP provider
+     * is done setting parameters.)
+     *
+     * A multi-segment parameter is defined by RFC 2231.  For example,
+     * "title*0=part1; title*1=part2", which represents a parameter
+     * named "title" with value "part1part2".
+     *
+     * Note also that each segment of the value might or might not be
+     * encoded, indicated by a trailing "*" on the parameter name.
+     * If any segment is encoded, the first segment must be encoded.
+     * Only the first segment contains the charset and language
+     * information needed to decode any encoded segments.
+     *
+     * RFC 2231 introduces many possible failure modes, which we try
+     * to handle as gracefully as possible.  Generally, a failure to
+     * decode a parameter value causes the non-decoded parameter value
+     * to be used instead.  Missing segments cause all later segments
+     * to be appear as independent parameters with names that include
+     * the segment number.  For example, "title*0=part1; title*1=part2;
+     * title*3=part4" appears as two parameters named "title" and "title*3".
+     */
+    //private Set multisegmentNames = new HashSet();
+
+    /**
+     * A map containing the segments for all not-yet-processed
+     * multi-segment parameters.  The map is indexed by "name*seg".
+     * The value object is either a String or a Value object.
+     * The Value object is not decoded during the initial parse
+     * because the segments may appear in any order and until the
+     * first segment appears we don't know what charset to use to
+     * decode the encoded segments.  The segments are hex decoded
+     * in order, combined into a single byte array, and converted
+     * to a String using the specified charset in the
+     * combineMultisegmentNames method.
+     */
+    private final Map<MultiSegmentEntry, ParameterValue> _multiSegmentParameters = new TreeMap<MultiSegmentEntry, ParameterValue>();
+    
+    private boolean encodeParameters = false;
+    private boolean decodeParameters = false;
+    private boolean decodeParametersStrict = false;
+
+    public ParameterList() {
+        // figure out how parameter handling is to be performed.
+        getInitialProperties();
+    }
+
+    public ParameterList(final String list) throws ParseException {
+        // figure out how parameter handling is to be performed.
+        getInitialProperties();
+        // get a token parser for the type information
+        final HeaderTokenizer tokenizer = new HeaderTokenizer(list, HeaderTokenizer.MIME);
+        while (true) {
+            HeaderTokenizer.Token token = tokenizer.next();
+
+            if (token.getType() == HeaderTokenizer.Token.EOF) {
+                // the EOF token terminates parsing.
+                break;
+            } else if (token.getType() == ';') {
+                // each new parameter is separated by a semicolon, including the
+                // first, which separates
+                // the parameters from the main part of the header.
+
+                // the next token needs to be a parameter name
+                token = tokenizer.next();
+                // allow a trailing semicolon on the parameters.
+                if (token.getType() == HeaderTokenizer.Token.EOF) {
+                    break;
+                }
+
+                if (token.getType() != HeaderTokenizer.Token.ATOM) {
+                    throw new ParseException("Invalid parameter name: " + token.getValue());
+                }
+
+                // get the parameter name as a lower case version for better
+                // mapping.
+                String name = token.getValue().toLowerCase();
+
+                token = tokenizer.next();
+
+                // parameters are name=value, so we must have the "=" here.
+                if (token.getType() != '=') {
+                    throw new ParseException("Missing '='");
+                }
+
+                // now the value, which may be an atom or a literal
+                token = tokenizer.next();
+
+                if (token.getType() != HeaderTokenizer.Token.ATOM && token.getType() != HeaderTokenizer.Token.QUOTEDSTRING) {
+                    throw new ParseException("Invalid parameter value: " + token.getValue());
+                }
+
+                final String value = token.getValue();
+                String decodedValue = null;
+
+                // we might have to do some additional decoding. A name that
+                // ends with "*"
+                // is marked as being encoded, so if requested, we decode the
+                // value.
+                if (decodeParameters && name.endsWith("*") && !isMultiSegmentName(name)) {
+                    // the name needs to be pruned of the marker, and we need to
+                    // decode the value.
+                    name = name.substring(0, name.length() - 1);
+                    // get a new decoder
+                    final RFC2231Encoder decoder = new RFC2231Encoder(HeaderTokenizer.MIME);
+
+                    try {
+                        // decode the value
+                        decodedValue = decoder.decode(value);
+                    } catch (final Exception e) {
+                        // if we're doing things strictly, then raise a parsing
+                        // exception for errors.
+                        // otherwise, leave the value in its current state.
+                        if (decodeParametersStrict) {
+                            throw new ParseException("Invalid RFC2231 encoded parameter");
+                        }
+                    }
+                    _parameters.put(name, new ParameterValue(name, decodedValue, value));
+                } else if (isMultiSegmentName(name)) {
+                    // multisegment parameter
+                    _multiSegmentParameters.put(new MultiSegmentEntry(name), new ParameterValue(name, value));
+                } else {
+                    _parameters.put(name, new ParameterValue(name, value));
+                }
+
+            } else {
+
+                throw new ParseException("Missing ';'");
+            }
+
+        }
+
+        combineSegments();
+    }
+    
+    private static boolean isMultiSegmentName(final String name) {
+        
+        if(name == null || name.length() == 0) {
+			return false;
+		}
+        
+        final int firstAsterixIndex = name.indexOf('*');
+        
+        if(firstAsterixIndex < 0) {
+            return false; //no asterix at all
+        }else {
+            
+            if(firstAsterixIndex == name.length()-1) {
+                //first asterix is last char, so this is an encoded name/value pair but not a multisegment one
+                return false;
+            }
+            
+            final String restOfname = name.substring(firstAsterixIndex+1);
+            
+            if(Character.isDigit(restOfname.charAt(0))) {
+                return true;
+            }
+            
+            return false;
+        }
+    }
+    
+    /**
+     * Normal users of this class will use simple parameter names.
+     * In some cases, for example, when processing IMAP protocol
+     * messages, individual segments of a multi-segment name
+     * (specified by RFC 2231) will be encountered and passed to
+     * the {@link #set} method.  After all these segments are added
+     * to this ParameterList, they need to be combined to represent
+     * the logical parameter name and value.  This method will combine
+     * all segments of multi-segment names. 
+     *
+     * Normal users should never need to call this method.
+     *
+     * @since    JavaMail 1.5
+     */ 
+    public void combineSegments() {
+       
+        // title*0*=us-ascii'en'This%20is%20even%20more%20
+        // title*1*=%2A%2A%2Afun%2A%2A%2A%20
+        // title*2="isn't it!"
+
+        if (_multiSegmentParameters.size() > 0) {
+
+            final RFC2231Encoder decoder = new RFC2231Encoder(HeaderTokenizer.MIME);
+            String lastName = null;
+            int lastSegmentNumber = -1;
+            final StringBuilder segmentValue = new StringBuilder();
+            for (final Entry<MultiSegmentEntry, ParameterValue> entry : _multiSegmentParameters.entrySet()) {
+
+                final MultiSegmentEntry currentMEntry = entry.getKey();
+
+                if (lastName == null) {
+                    lastName = currentMEntry.name;
+                } else {
+
+                    if (!lastName.equals(currentMEntry.name)) {
+
+                        _parameters.put(lastName, new ParameterValue(lastName, segmentValue.toString()));
+                        segmentValue.setLength(0);
+                        lastName = currentMEntry.name;
+
+                    }
+
+                }
+
+                if (lastSegmentNumber == -1) {
+                    lastSegmentNumber = currentMEntry.range;
+
+                    if (lastSegmentNumber != 0) {
+                        // does not start with 0
+                        // skip gracefully
+                    }
+
+                } else {
+                    if (lastSegmentNumber + 1 != currentMEntry.range) {
+                        // seems here is a gap
+                        // skip gracefully
+                    }
+                }
+
+                if (currentMEntry.encoded) {
+
+                    try {
+                        // decode the value
+                        segmentValue.append(decoder.decode(entry.getValue().value));
+                    } catch (final Exception e) {
+                        segmentValue.append(entry.getValue().value);
+                    }
+
+                } else {
+
+                    segmentValue.append(entry.getValue().value);
+
+                }
+
+            }
+
+            _parameters.put(lastName, new ParameterValue(lastName, segmentValue.toString()));
+
+        }
+
+    }
+
+    /**
+     * Get the initial parameters that control parsing and values.
+     * These parameters are controlled by System properties.
+     */
+    private void getInitialProperties() {
+        decodeParameters = SessionUtil.getBooleanProperty(MIME_DECODEPARAMETERS, true); //since JavaMail 1.5 RFC 2231 support is enabled by default
+        decodeParametersStrict = SessionUtil.getBooleanProperty(MIME_DECODEPARAMETERS_STRICT, false);
+        encodeParameters = SessionUtil.getBooleanProperty(MIME_ENCODEPARAMETERS, true); //since JavaMail 1.5 RFC 2231 support is enabled by default
+    }
+
+    public int size() {
+        return _parameters.size();
+    }
+
+    public String get(final String name) {
+        final ParameterValue value = _parameters.get(name.toLowerCase());
+        if (value != null) {
+            return value.value;
+        }
+        return null;
+    }
+
+    public void set(String name, final String value) {
+        name = name.toLowerCase();
+
+        if (isMultiSegmentName(name)) {
+            // multisegment parameter
+            _multiSegmentParameters.put(new MultiSegmentEntry(name), new ParameterValue(name, value));
+        } else {
+            _parameters.put(name, new ParameterValue(name, value));
+        }
+    }
+
+    public void set(String name, final String value, final String charset) {
+        name = name.toLowerCase();
+        // only encode if told to and this contains non-ASCII charactes.
+        if (encodeParameters && !ASCIIUtil.isAscii(value)) {
+            final ByteArrayOutputStream out = new ByteArrayOutputStream();
+
+            try {
+                final RFC2231Encoder encoder = new RFC2231Encoder(HeaderTokenizer.MIME);
+
+                // extract the bytes using the given character set and encode
+                final byte[] valueBytes = value.getBytes(MimeUtility.javaCharset(charset));
+
+                // the string format is charset''data
+                out.write(charset.getBytes("ISO8859-1"));
+                out.write('\'');
+                out.write('\'');
+                encoder.encode(valueBytes, 0, valueBytes.length, out);
+
+                
+                if (isMultiSegmentName(name)) {
+                    // multisegment parameter
+                    _multiSegmentParameters.put(new MultiSegmentEntry(name), new ParameterValue(name, value, new String(out.toByteArray(), "ISO8859-1")));
+                } else {
+                    _parameters.put(name, new ParameterValue(name, value, new String(out.toByteArray(), "ISO8859-1")));
+                }
+                
+                
+                return;
+
+            } catch (final Exception e) {
+                // just fall through and set the value directly if there is an error
+            }
+        }
+        // default in case there is an exception
+        if (isMultiSegmentName(name)) {
+            // multisegment parameter
+            _multiSegmentParameters.put(new MultiSegmentEntry(name), new ParameterValue(name, value));
+        } else {
+            _parameters.put(name, new ParameterValue(name, value));
+        }
+    }
+
+    public void remove(final String name) {
+        _parameters.remove(name);
+    }
+
+    public Enumeration getNames() {
+        return Collections.enumeration(_parameters.keySet());
+    }
+
+    @Override
+    public String toString() {
+        // we need to perform folding, but out starting point is 0.
+        return toString(0);
+    }
+
+    public String toString(int used) {
+        final StringBuffer stringValue = new StringBuffer();
+
+        final Iterator values = _parameters.values().iterator();
+
+        while (values.hasNext()) {
+            final ParameterValue parm = (ParameterValue)values.next();
+            // get the values we're going to encode in here.
+            final String name = parm.getEncodedName();
+            final String value = parm.toString();
+
+            // add the semicolon separator.  We also add a blank so that folding/unfolding rules can be used.
+            stringValue.append("; ");
+            used += 2;
+
+            // too big for the current header line?
+            if ((used + name.length() + value.length() + 1) > HEADER_SIZE_LIMIT) {
+                // and a CRLF-combo combo.
+                stringValue.append("\r\n\t");
+                // reset the counter for a fresh line
+                // note we use use 8 because we're using a rather than a blank
+                used = 8;
+            }
+            // now add the keyword/value pair.
+            stringValue.append(name);
+            stringValue.append("=");
+
+            used += name.length() + 1;
+
+            // we're not out of the woods yet.  It is possible that the keyword/value pair by itself might
+            // be too long for a single line.  If that's the case, the we need to fold the value, if possible
+            if (used + value.length() > HEADER_SIZE_LIMIT) {
+                final String foldedValue = MimeUtility.fold(used, value);
+
+                stringValue.append(foldedValue);
+
+                // now we need to sort out how much of the current line is in use.
+                final int lastLineBreak = foldedValue.lastIndexOf('\n');
+
+                if (lastLineBreak != -1) {
+                    used = foldedValue.length() - lastLineBreak + 1;
+                }
+                else {
+                    used += foldedValue.length();
+                }
+            }
+            else {
+                // no folding required, just append.
+                stringValue.append(value);
+                used += value.length();
+            }
+        }
+
+        return stringValue.toString();
+    }
+
+
+    /**
+     * Utility class for representing parameter values in the list.
+     */
+    class ParameterValue {
+        public String name;              // the name of the parameter
+        public String value;             // the original set value
+        public String encodedValue;      // an encoded value, if encoding is requested.
+
+        public ParameterValue(final String name, final String value) {
+            this.name = name;
+            this.value = value;
+            this.encodedValue = null;
+        }
+
+        public ParameterValue(final String name, final String value, final String encodedValue) {
+            this.name = name;
+            this.value = value;
+            this.encodedValue = encodedValue;
+        }
+
+        @Override
+        public String toString() {
+            if (encodedValue != null) {
+                return MimeUtility.quote(encodedValue, HeaderTokenizer.MIME);
+            }
+            return MimeUtility.quote(value, HeaderTokenizer.MIME);
+        }
+
+        public String getEncodedName() {
+            if (encodedValue != null) {
+                return name + "*";
+            }
+            return name;
+        }
+    }
+    
+    static class MultiSegmentEntry implements Comparable<MultiSegmentEntry>{
+        final String original;
+        final String normalized;
+        final String name;
+        final int range;
+        final boolean encoded;
+        
+        public MultiSegmentEntry(final String original) {
+            super();
+            this.original = original;
+        
+            final int firstAsterixIndex1 = original.indexOf('*');
+            encoded=original.endsWith("*");
+            final int endIndex1 = encoded?original.length()-1:original.length();
+            name = original.substring(0, firstAsterixIndex1);
+            range = Integer.parseInt(original.substring(firstAsterixIndex1+1, endIndex1));
+            normalized = original.substring(0, endIndex1);
+        }
+      
+ 
+       @Override
+        public int hashCode() {
+            final int prime = 31;
+            int result = 1;
+            result = prime * result + ((normalized == null) ? 0 : normalized.hashCode());
+            return result;
+        }
+
+        @Override
+        public boolean equals(final Object obj) {
+            if (this == obj) {
+				return true;
+			}
+            if (obj == null) {
+				return false;
+			}
+            if (getClass() != obj.getClass()) {
+				return false;
+			}
+            final MultiSegmentEntry other = (MultiSegmentEntry) obj;
+            if (normalized == null) {
+                if (other.normalized != null) {
+					return false;
+				}
+            } else if (!normalized.equals(other.normalized)) {
+				return false;
+			}
+            return true;
+        }
+
+        public int compareTo(final MultiSegmentEntry o) {
+            
+            if(this.equals(o)) {
+				return 0;
+			}
+            
+            if(name.equals(o.name)) {
+                return range>o.range?1:-1;
+            }else
+            {
+                return name.compareTo(o.name);
+            }
+            
+            
+            
+        }
+
+
+        @Override
+        public String toString() {
+            return "MultiSegmentEntry\n[original=" + original + ", name=" + name + ", range=" + range + "]\n";
+        }
+        
+    }
+    
+    /*class MultiSegmentComparator implements Comparator<String> {
+
+        public int compare(String o1, String o2) {
+            
+            if(o1.equals(o2)) return 0;
+           
+            int firstAsterixIndex1 = o1.indexOf('*');
+            int firstAsterixIndex2 = o2.indexOf('*');
+            String prefix1 = o1.substring(0, firstAsterixIndex1);
+            String prefix2 = o2.substring(0, firstAsterixIndex2);
+            
+            if(!prefix1.equals(prefix2)) {
+                return prefix1.compareTo(prefix2);
+            }           
+            
+            int endIndex1 = o1.endsWith("*")?o1.length()-1:o1.length();           
+            int endIndex2 = o2.endsWith("*")?o2.length()-1:o2.length();
+            
+            int num1 = Integer.parseInt(o1.substring(firstAsterixIndex1+1, endIndex1));
+            int num2 = Integer.parseInt(o2.substring(firstAsterixIndex2+1, endIndex2));
+            
+            return num1>num2?1:-1;
+           
+        }
+        
+    }*/
+}

Added: geronimo/specs/trunk/geronimo-javamail_1.5_spec/src/main/java/javax/mail/internet/ParseException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-javamail_1.5_spec/src/main/java/javax/mail/internet/ParseException.java?rev=1620683&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-javamail_1.5_spec/src/main/java/javax/mail/internet/ParseException.java (added)
+++ geronimo/specs/trunk/geronimo-javamail_1.5_spec/src/main/java/javax/mail/internet/ParseException.java Tue Aug 26 18:17:06 2014
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package javax.mail.internet;
+
+import javax.mail.MessagingException;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class ParseException extends MessagingException {
+	
+	private static final long serialVersionUID = 7649991205183658089L;
+	
+    public ParseException() {
+        super();
+    }
+
+    public ParseException(final String message) {
+        super(message);
+    }
+}



Mime
View raw message