commits@javamail.java.net

[javamail~mercurial:621] Add option to use canonical host name for SASL - bug 6201

From: <shannon_at_java.net>
Date: Wed, 4 Dec 2013 22:56:29 +0000

Project: javamail
Repository: mercurial
Revision: 621
Author: shannon
Date: 2013-12-04 20:08:41 UTC
Link:

Log Message:
------------
Update version to 1.5.2-SNAPSHOT.
Remove unneeded com.sun.mail.util.logging from subpackages list;
it trips a bug in JDK 1.8 javadoc.
Fix javadoc errors and warnings from JDK 1.8 javadoc.
Fix empty <p> tags; latest JDK 1.8 javadoc is getting very picky!
MailLogger return StackTraceElement instead of String array.
MailLogger Xlint and Xdoclint fixes.
SocketConnectException fixed assert.
SocketConnectException Xdoclint fixes.

(From Jason)
Xdoclint fixes for the logging package.

(From Jason)
Remove conflicting version definition for maven-javadoc-plugin.
Fix problem with <link> URLS.
Kludge around JDK 1.8 symbol file bug.
Fix more empty <p> tags.
Fix parsing of astring - bug 6203
allow IMAP search to throw SearchException when search is too complex - bug 5820
Prevent NPE in getMessageByUID if message can't be found - bug 6181
mode should be octal.
clear buffer after flushing.
only write suffix once.
Add option to use canonical host name for SASL - bug 6201


Revisions:
----------
608
609
610
611
612
613
614
615
616
617
618
619
620
621


Modified Paths:
---------------
client/pom.xml
demo/pom.xml
dsn/pom.xml
gimap/pom.xml
imap/pom.xml
javadoc/pom.xml
logging/pom.xml
mail/pom.xml
mailapi/pom.xml
mailapijar/pom.xml
mbox/native/pom.xml
mbox/pom.xml
oldmail/pom.xml
outlook/pom.xml
parent-distrib/pom.xml
pom.xml
pop3/pom.xml
publish/pom.xml
servlet/pom.xml
smtp/pom.xml
taglib/pom.xml
webapp/pom.xml
dsn/src/main/java/com/sun/mail/dsn/DeliveryStatus.java
dsn/src/main/java/com/sun/mail/dsn/DispositionNotification.java
dsn/src/main/java/com/sun/mail/dsn/MessageHeaders.java
dsn/src/main/java/com/sun/mail/dsn/MultipartReport.java
dsn/src/main/java/com/sun/mail/dsn/Report.java
gimap/src/main/java/com/sun/mail/gimap/GmailFolder.java
gimap/src/main/java/com/sun/mail/gimap/GmailMessage.java
gimap/src/main/java/com/sun/mail/gimap/GmailSSLStore.java
gimap/src/main/java/com/sun/mail/gimap/GmailStore.java
mail/src/main/java/com/sun/mail/auth/MD4.java
mail/src/main/java/com/sun/mail/iap/Protocol.java
mail/src/main/java/com/sun/mail/imap/IMAPFolder.java
mail/src/main/java/com/sun/mail/imap/IMAPInputStream.java
mail/src/main/java/com/sun/mail/imap/IMAPMessage.java
mail/src/main/java/com/sun/mail/imap/IMAPSSLStore.java
mail/src/main/java/com/sun/mail/imap/IMAPStore.java
mail/src/main/java/com/sun/mail/imap/ResyncData.java
mail/src/main/java/com/sun/mail/imap/Rights.java
mail/src/main/java/com/sun/mail/imap/protocol/BASE64MailboxEncoder.java
mail/src/main/java/com/sun/mail/imap/protocol/MailboxInfo.java
mail/src/main/java/com/sun/mail/imap/protocol/Namespaces.java
mail/src/main/java/com/sun/mail/pop3/POP3Folder.java
mail/src/main/java/com/sun/mail/pop3/POP3Message.java
mail/src/main/java/com/sun/mail/pop3/POP3Store.java
mail/src/main/java/com/sun/mail/smtp/SMTPAddressFailedException.java
mail/src/main/java/com/sun/mail/smtp/SMTPAddressSucceededException.java
mail/src/main/java/com/sun/mail/smtp/SMTPMessage.java
mail/src/main/java/com/sun/mail/smtp/SMTPSSLTransport.java
mail/src/main/java/com/sun/mail/smtp/SMTPSendFailedException.java
mail/src/main/java/com/sun/mail/smtp/SMTPSenderFailedException.java
mail/src/main/java/com/sun/mail/smtp/SMTPTransport.java
mail/src/main/java/com/sun/mail/util/MailSSLSocketFactory.java
mail/src/main/java/com/sun/mail/util/ReadableMime.java
mail/src/main/java/com/sun/mail/util/UUEncoderStream.java
mail/src/main/java/javax/mail/BodyPart.java
mail/src/main/java/javax/mail/FetchProfile.java
mail/src/main/java/javax/mail/Flags.java
mail/src/main/java/javax/mail/Folder.java
mail/src/main/java/javax/mail/FolderClosedException.java
mail/src/main/java/javax/mail/MailSessionDefinition.java
mail/src/main/java/javax/mail/Message.java
mail/src/main/java/javax/mail/MessageAware.java
mail/src/main/java/javax/mail/MessageContext.java
mail/src/main/java/javax/mail/Multipart.java
mail/src/main/java/javax/mail/MultipartDataSource.java
mail/src/main/java/javax/mail/Part.java
mail/src/main/java/javax/mail/Provider.java
mail/src/main/java/javax/mail/ReadOnlyFolderException.java
mail/src/main/java/javax/mail/Service.java
mail/src/main/java/javax/mail/Session.java
mail/src/main/java/javax/mail/Store.java
mail/src/main/java/javax/mail/StoreClosedException.java
mail/src/main/java/javax/mail/Transport.java
mail/src/main/java/javax/mail/UIDFolder.java
mail/src/main/java/javax/mail/URLName.java
mail/src/main/java/javax/mail/event/ConnectionEvent.java
mail/src/main/java/javax/mail/event/ConnectionListener.java
mail/src/main/java/javax/mail/event/FolderListener.java
mail/src/main/java/javax/mail/event/MailEvent.java
mail/src/main/java/javax/mail/event/MessageChangedListener.java
mail/src/main/java/javax/mail/event/MessageCountEvent.java
mail/src/main/java/javax/mail/event/MessageCountListener.java
mail/src/main/java/javax/mail/event/StoreEvent.java
mail/src/main/java/javax/mail/event/StoreListener.java
mail/src/main/java/javax/mail/event/TransportEvent.java
mail/src/main/java/javax/mail/internet/AddressException.java
mail/src/main/java/javax/mail/internet/ContentDisposition.java
mail/src/main/java/javax/mail/internet/ContentType.java
mail/src/main/java/javax/mail/internet/HeaderTokenizer.java
mail/src/main/java/javax/mail/internet/InternetAddress.java
mail/src/main/java/javax/mail/internet/InternetHeaders.java
mail/src/main/java/javax/mail/internet/MimeBodyPart.java
mail/src/main/java/javax/mail/internet/MimeMessage.java
mail/src/main/java/javax/mail/internet/MimeMultipart.java
mail/src/main/java/javax/mail/internet/MimePart.java
mail/src/main/java/javax/mail/internet/MimePartDataSource.java
mail/src/main/java/javax/mail/internet/MimeUtility.java
mail/src/main/java/javax/mail/internet/NewsAddress.java
mail/src/main/java/javax/mail/internet/PreencodedMimeBodyPart.java
mail/src/main/java/javax/mail/search/AddressTerm.java
mail/src/main/java/javax/mail/search/AndTerm.java
mail/src/main/java/javax/mail/search/DateTerm.java
mail/src/main/java/javax/mail/search/FlagTerm.java
mail/src/main/java/javax/mail/search/HeaderTerm.java
mail/src/main/java/javax/mail/search/IntegerComparisonTerm.java
mail/src/main/java/javax/mail/search/NotTerm.java
mail/src/main/java/javax/mail/search/OrTerm.java
mail/src/main/java/javax/mail/search/RecipientStringTerm.java
mail/src/main/java/javax/mail/search/RecipientTerm.java
mail/src/main/java/javax/mail/search/StringTerm.java
mail/src/main/java/javax/mail/util/SharedFileInputStream.java
mail/src/main/java/javax/mail/EncodingAware.java
mail/src/main/java/com/sun/mail/util/MailLogger.java
mail/src/main/java/com/sun/mail/util/SocketConnectException.java
logging/src/main/java/FileErrorManager.java
logging/src/main/java/MailHandlerDemo.java
logging/src/main/java/SummaryFormatter.java
logging/src/main/java/SummaryNameFormatter.java
mail/src/main/java/com/sun/mail/util/logging/LogManagerProperties.java
mail/src/main/java/com/sun/mail/util/logging/MailHandler.java
doc/release/CHANGES.txt
mail/src/main/java/com/sun/mail/iap/Response.java
mail/src/main/java/com/sun/mail/imap/protocol/IMAPProtocol.java
demo/src/main/java/search.java
mail/src/main/java/com/sun/mail/imap/package.html
mail/src/main/java/com/sun/mail/smtp/package.html


Added Paths:
------------
mail/src/test/java/com/sun/mail/iap/ResponseTest.java


Diffs:
------
diff -r bc219882a32f -r 4a66d32ba54d client/pom.xml
--- a/client/pom.xml Tue Nov 12 14:46:51 2013 -0800
+++ b/client/pom.xml Fri Nov 22 15:42:06 2013 -0800
@@ -48,7 +48,7 @@
     <parent>
         <groupId>com.sun.mail</groupId>
         <artifactId>all</artifactId>
- <version>1.5.1</version>
+ <version>1.5.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.sun.mail</groupId>

diff -r bc219882a32f -r 4a66d32ba54d demo/pom.xml
--- a/demo/pom.xml Tue Nov 12 14:46:51 2013 -0800
+++ b/demo/pom.xml Fri Nov 22 15:42:06 2013 -0800
@@ -48,7 +48,7 @@
     <parent>
         <groupId>com.sun.mail</groupId>
         <artifactId>all</artifactId>
- <version>1.5.1</version>
+ <version>1.5.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.sun.mail</groupId>

diff -r bc219882a32f -r 4a66d32ba54d dsn/pom.xml
--- a/dsn/pom.xml Tue Nov 12 14:46:51 2013 -0800
+++ b/dsn/pom.xml Fri Nov 22 15:42:06 2013 -0800
@@ -48,7 +48,7 @@
     <parent>
         <groupId>com.sun.mail</groupId>
         <artifactId>all</artifactId>
- <version>1.5.1</version>
+ <version>1.5.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.sun.mail</groupId>

diff -r bc219882a32f -r 4a66d32ba54d gimap/pom.xml
--- a/gimap/pom.xml Tue Nov 12 14:46:51 2013 -0800
+++ b/gimap/pom.xml Fri Nov 22 15:42:06 2013 -0800
@@ -48,7 +48,7 @@
     <parent>
         <groupId>com.sun.mail</groupId>
         <artifactId>all</artifactId>
- <version>1.5.1</version>
+ <version>1.5.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.sun.mail</groupId>

diff -r bc219882a32f -r 4a66d32ba54d imap/pom.xml
--- a/imap/pom.xml Tue Nov 12 14:46:51 2013 -0800
+++ b/imap/pom.xml Fri Nov 22 15:42:06 2013 -0800
@@ -48,7 +48,7 @@
     <parent>
         <groupId>com.sun.mail</groupId>
         <artifactId>parent-distrib</artifactId>
- <version>1.5.1</version>
+ <version>1.5.2-SNAPSHOT</version>
         <relativePath>../parent-distrib/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff -r bc219882a32f -r 4a66d32ba54d javadoc/pom.xml
--- a/javadoc/pom.xml Tue Nov 12 14:46:51 2013 -0800
+++ b/javadoc/pom.xml Fri Nov 22 15:42:06 2013 -0800
@@ -48,13 +48,13 @@
     <parent>
         <groupId>com.sun.mail</groupId>
         <artifactId>all</artifactId>
- <version>1.5.1</version>
+ <version>1.5.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.sun.mail</groupId>
     <artifactId>javadoc</artifactId>
     <packaging>pom</packaging>
- <version>1.5.1</version>
+ <version>1.5.2-SNAPSHOT</version>
     <name>JavaMail API javadocs</name>
     <description>${project.name}</description>
 

diff -r bc219882a32f -r 4a66d32ba54d logging/pom.xml
--- a/logging/pom.xml Tue Nov 12 14:46:51 2013 -0800
+++ b/logging/pom.xml Fri Nov 22 15:42:06 2013 -0800
@@ -48,7 +48,7 @@
     <parent>
         <groupId>com.sun.mail</groupId>
         <artifactId>all</artifactId>
- <version>1.5.1</version>
+ <version>1.5.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.sun.mail</groupId>

diff -r bc219882a32f -r 4a66d32ba54d mail/pom.xml
--- a/mail/pom.xml Tue Nov 12 14:46:51 2013 -0800
+++ b/mail/pom.xml Fri Nov 22 15:42:06 2013 -0800
@@ -48,7 +48,7 @@
     <parent>
         <groupId>com.sun.mail</groupId>
         <artifactId>all</artifactId>
- <version>1.5.1</version>
+ <version>1.5.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.sun.mail</groupId>

diff -r bc219882a32f -r 4a66d32ba54d mailapi/pom.xml
--- a/mailapi/pom.xml Tue Nov 12 14:46:51 2013 -0800
+++ b/mailapi/pom.xml Fri Nov 22 15:42:06 2013 -0800
@@ -56,7 +56,7 @@
     <parent>
         <groupId>com.sun.mail</groupId>
         <artifactId>all</artifactId>
- <version>1.5.1</version>
+ <version>1.5.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.sun.mail</groupId>

diff -r bc219882a32f -r 4a66d32ba54d mailapijar/pom.xml
--- a/mailapijar/pom.xml Tue Nov 12 14:46:51 2013 -0800
+++ b/mailapijar/pom.xml Fri Nov 22 15:42:06 2013 -0800
@@ -55,7 +55,7 @@
     <parent>
         <groupId>com.sun.mail</groupId>
         <artifactId>all</artifactId>
- <version>1.5.1</version>
+ <version>1.5.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>javax.mail</groupId>

diff -r bc219882a32f -r 4a66d32ba54d mbox/native/pom.xml
--- a/mbox/native/pom.xml Tue Nov 12 14:46:51 2013 -0800
+++ b/mbox/native/pom.xml Fri Nov 22 15:42:06 2013 -0800
@@ -48,7 +48,7 @@
     <parent>
         <groupId>com.sun.mail</groupId>
         <artifactId>all</artifactId>
- <version>1.5.1</version>
+ <version>1.5.2-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff -r bc219882a32f -r 4a66d32ba54d mbox/pom.xml
--- a/mbox/pom.xml Tue Nov 12 14:46:51 2013 -0800
+++ b/mbox/pom.xml Fri Nov 22 15:42:06 2013 -0800
@@ -48,7 +48,7 @@
     <parent>
         <groupId>com.sun.mail</groupId>
         <artifactId>all</artifactId>
- <version>1.5.1</version>
+ <version>1.5.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.sun.mail</groupId>

diff -r bc219882a32f -r 4a66d32ba54d oldmail/pom.xml
--- a/oldmail/pom.xml Tue Nov 12 14:46:51 2013 -0800
+++ b/oldmail/pom.xml Fri Nov 22 15:42:06 2013 -0800
@@ -53,7 +53,7 @@
     <parent>
         <groupId>com.sun.mail</groupId>
         <artifactId>all</artifactId>
- <version>1.5.1</version>
+ <version>1.5.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>javax.mail</groupId>

diff -r bc219882a32f -r 4a66d32ba54d outlook/pom.xml
--- a/outlook/pom.xml Tue Nov 12 14:46:51 2013 -0800
+++ b/outlook/pom.xml Fri Nov 22 15:42:06 2013 -0800
@@ -48,7 +48,7 @@
     <parent>
         <groupId>com.sun.mail</groupId>
         <artifactId>all</artifactId>
- <version>1.5.1</version>
+ <version>1.5.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.sun.mail</groupId>

diff -r bc219882a32f -r 4a66d32ba54d parent-distrib/pom.xml
--- a/parent-distrib/pom.xml Tue Nov 12 14:46:51 2013 -0800
+++ b/parent-distrib/pom.xml Fri Nov 22 15:42:06 2013 -0800
@@ -48,7 +48,7 @@
     <parent>
         <groupId>com.sun.mail</groupId>
         <artifactId>all</artifactId>
- <version>1.5.1</version>
+ <version>1.5.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.sun.mail</groupId>

diff -r bc219882a32f -r 4a66d32ba54d pom.xml
--- a/pom.xml Tue Nov 12 14:46:51 2013 -0800
+++ b/pom.xml Fri Nov 22 15:42:06 2013 -0800
@@ -54,7 +54,7 @@
     <groupId>com.sun.mail</groupId>
     <artifactId>all</artifactId>
     <packaging>pom</packaging>
- <version>1.5.1</version>
+ <version>1.5.2-SNAPSHOT</version>
     <name>JavaMail API distribution</name>
     <description>${project.name}</description>
     <url>http://javamail.java.net</url>
@@ -85,9 +85,9 @@
     </organization>
 
     <properties>
- <mail.version>1.5.1</mail.version>
+ <mail.version>1.5.2-SNAPSHOT</mail.version>
         <!-- like mail.version, but with underscores instead of dots -->
- <mail.zipversion>1_5_1</mail.zipversion>
+ <mail.zipversion>1_5_2-SNAPSHOT</mail.zipversion>
         <mail.spec.version>1.5</mail.spec.version>
         <activation-api.version>1.1</activation-api.version>
         <!-- defaults that are overridden in mail module -->

diff -r bc219882a32f -r 4a66d32ba54d pop3/pom.xml
--- a/pop3/pom.xml Tue Nov 12 14:46:51 2013 -0800
+++ b/pop3/pom.xml Fri Nov 22 15:42:06 2013 -0800
@@ -48,7 +48,7 @@
     <parent>
         <groupId>com.sun.mail</groupId>
         <artifactId>parent-distrib</artifactId>
- <version>1.5.1</version>
+ <version>1.5.2-SNAPSHOT</version>
         <relativePath>../parent-distrib/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff -r bc219882a32f -r 4a66d32ba54d publish/pom.xml
--- a/publish/pom.xml Tue Nov 12 14:46:51 2013 -0800
+++ b/publish/pom.xml Fri Nov 22 15:42:06 2013 -0800
@@ -48,13 +48,13 @@
     <parent>
         <groupId>com.sun.mail</groupId>
         <artifactId>all</artifactId>
- <version>1.5.1</version>
+ <version>1.5.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.sun.mail</groupId>
     <artifactId>publish</artifactId>
     <packaging>pom</packaging>
- <version>1.5.1</version>
+ <version>1.5.2-SNAPSHOT</version>
     <name>JavaMail API publish project</name>
 
     <build>
@@ -89,44 +89,44 @@
         <dependency>
             <groupId>com.sun.mail</groupId>
             <artifactId>javax.mail</artifactId>
- <version>1.5.1</version>
+ <version>1.5.2-SNAPSHOT</version>
         </dependency>
     <!--
         <dependency>
             <groupId>com.sun.mail</groupId>
             <artifactId>demo</artifactId>
- <version>1.5.1</version>
+ <version>1.5.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.sun.mail</groupId>
             <artifactId>client</artifactId>
- <version>1.5.1</version>
+ <version>1.5.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.sun.mail</groupId>
             <artifactId>servlet</artifactId>
- <version>1.5.1</version>
+ <version>1.5.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.sun.mail</groupId>
             <artifactId>webapp</artifactId>
             <type>war</type>
- <version>1.5.1</version>
+ <version>1.5.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.sun.mail</groupId>
             <artifactId>taglib</artifactId>
- <version>1.5.1</version>
+ <version>1.5.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.sun.mail</groupId>
             <artifactId>logging</artifactId>
- <version>1.5.1</version>
+ <version>1.5.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.sun.mail</groupId>
             <artifactId>outlook</artifactId>
- <version>1.5.1</version>
+ <version>1.5.2-SNAPSHOT</version>
         </dependency>
     -->
     </dependencies>

diff -r bc219882a32f -r 4a66d32ba54d servlet/pom.xml
--- a/servlet/pom.xml Tue Nov 12 14:46:51 2013 -0800
+++ b/servlet/pom.xml Fri Nov 22 15:42:06 2013 -0800
@@ -48,7 +48,7 @@
     <parent>
         <groupId>com.sun.mail</groupId>
         <artifactId>all</artifactId>
- <version>1.5.1</version>
+ <version>1.5.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.sun.mail</groupId>

diff -r bc219882a32f -r 4a66d32ba54d smtp/pom.xml
--- a/smtp/pom.xml Tue Nov 12 14:46:51 2013 -0800
+++ b/smtp/pom.xml Fri Nov 22 15:42:06 2013 -0800
@@ -48,7 +48,7 @@
     <parent>
         <groupId>com.sun.mail</groupId>
         <artifactId>parent-distrib</artifactId>
- <version>1.5.1</version>
+ <version>1.5.2-SNAPSHOT</version>
         <relativePath>../parent-distrib/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff -r bc219882a32f -r 4a66d32ba54d taglib/pom.xml
--- a/taglib/pom.xml Tue Nov 12 14:46:51 2013 -0800
+++ b/taglib/pom.xml Fri Nov 22 15:42:06 2013 -0800
@@ -48,7 +48,7 @@
     <parent>
         <groupId>com.sun.mail</groupId>
         <artifactId>all</artifactId>
- <version>1.5.1</version>
+ <version>1.5.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.sun.mail</groupId>

diff -r bc219882a32f -r 4a66d32ba54d webapp/pom.xml
--- a/webapp/pom.xml Tue Nov 12 14:46:51 2013 -0800
+++ b/webapp/pom.xml Fri Nov 22 15:42:06 2013 -0800
@@ -48,7 +48,7 @@
     <parent>
         <groupId>com.sun.mail</groupId>
         <artifactId>all</artifactId>
- <version>1.5.1</version>
+ <version>1.5.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.sun.mail</groupId>


diff -r 4a66d32ba54d -r 7af7a6dde8ed javadoc/pom.xml
--- a/javadoc/pom.xml Fri Nov 22 15:42:06 2013 -0800
+++ b/javadoc/pom.xml Mon Nov 25 15:37:17 2013 -0800
@@ -187,7 +187,7 @@
                                 </group>
                             </groups>
                             <subpackages>
-javax:com.sun.mail.imap:com.sun.mail.pop3:com.sun.mail.smtp:com.sun.mail.dsn:com.sun.mail.util:com.sun.mail.util.logging:com.sun.mail.gimap
+javax:com.sun.mail.imap:com.sun.mail.pop3:com.sun.mail.smtp:com.sun.mail.dsn:com.sun.mail.util:com.sun.mail.gimap
                             </subpackages>
                             <!-- XXX - following should work, but doesn't -->
                             <excludePackageNames>


diff -r 7af7a6dde8ed -r b2ddec86d99b dsn/src/main/java/com/sun/mail/dsn/DeliveryStatus.java
--- a/dsn/src/main/java/com/sun/mail/dsn/DeliveryStatus.java Mon Nov 25 15:37:17 2013 -0800
+++ b/dsn/src/main/java/com/sun/mail/dsn/DeliveryStatus.java Wed Nov 27 11:26:19 2013 -0800
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 1997-2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997-2013 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -78,6 +78,8 @@
 
     /**
      * Construct a delivery status notification with no content.
+ *
+ * @exception MessagingException for failures
      */
     public DeliveryStatus() throws MessagingException {
         super("delivery-status");
@@ -88,6 +90,10 @@
     /**
      * Construct a delivery status notification by parsing the
      * supplied input stream.
+ *
+ * @param is the input stream
+ * @exception IOException for I/O errors reading the stream
+ * @exception MessagingException for other failures
      */
     public DeliveryStatus(InputStream is)
                                 throws MessagingException, IOException {
@@ -123,6 +129,8 @@
      * [ arrival-date-field CRLF ]
      * *( extension-field CRLF )
      * </pre>
+ *
+ * @return the per-message DSN fields
      */
     // XXX - could parse each of these fields
     public InternetHeaders getMessageDSN() {
@@ -131,6 +139,8 @@
 
     /**
      * Set the per-message fields in the delivery status notification.
+ *
+ * @param messageDSN the per-message DSN fields
      */
     public void setMessageDSN(InternetHeaders messageDSN) {
         this.messageDSN = messageDSN;
@@ -139,6 +149,8 @@
     /**
      * Return the number of recipients for which we have
      * per-recipient delivery status notification information.
+ *
+ * @return the number of recipients
      */
     public int getRecipientDSNCount() {
         return recipientDSN.length;
@@ -147,6 +159,9 @@
     /**
      * Return the delivery status notification information for
      * the specified recipient.
+ *
+ * @param n the recipient number
+ * @return the DSN fields for the recipient
      */
     public InternetHeaders getRecipientDSN(int n) {
         return recipientDSN[n];
@@ -155,6 +170,8 @@
     /**
      * Add deliver status notification information for another
      * recipient.
+ *
+ * @param h the DSN fields for the recipient
      */
     public void addRecipientDSN(InternetHeaders h) {
         InternetHeaders[] rh = new InternetHeaders[recipientDSN.length + 1];

diff -r 7af7a6dde8ed -r b2ddec86d99b dsn/src/main/java/com/sun/mail/dsn/DispositionNotification.java
--- a/dsn/src/main/java/com/sun/mail/dsn/DispositionNotification.java Mon Nov 25 15:37:17 2013 -0800
+++ b/dsn/src/main/java/com/sun/mail/dsn/DispositionNotification.java Wed Nov 27 11:26:19 2013 -0800
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 1997-2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997-2013 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -71,6 +71,8 @@
 
     /**
      * Construct a disposition notification with no content.
+ *
+ * @exception MessagingException for failures
      */
     public DispositionNotification() throws MessagingException {
         super("disposition-notification");
@@ -80,6 +82,10 @@
     /**
      * Construct a disposition notification by parsing the
      * supplied input stream.
+ *
+ * @param is the input stream
+ * @exception IOException for I/O errors reading the stream
+ * @exception MessagingException for other failures
      */
     public DispositionNotification(InputStream is)
                                 throws MessagingException, IOException {
@@ -106,6 +112,8 @@
      * *( warning-field CRLF )
      * *( extension-field CRLF )
      * </pre>
+ *
+ * @return the DSN fields
      */
     // XXX - could parse each of these fields
     public InternetHeaders getNotifications() {
@@ -115,6 +123,8 @@
     /**
      * Set the disposition notification fields in the
      * disposition notification.
+ *
+ * @param notifications the DSN fields
      */
     public void setNotifications(InternetHeaders notifications) {
         this.notifications = notifications;

diff -r 7af7a6dde8ed -r b2ddec86d99b dsn/src/main/java/com/sun/mail/dsn/MessageHeaders.java
--- a/dsn/src/main/java/com/sun/mail/dsn/MessageHeaders.java Mon Nov 25 15:37:17 2013 -0800
+++ b/dsn/src/main/java/com/sun/mail/dsn/MessageHeaders.java Wed Nov 27 11:26:19 2013 -0800
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997-2013 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -56,6 +56,8 @@
 
     /**
      * Construct a MessageHeaders object.
+ *
+ * @exception MessagingException for failures
      */
     public MessageHeaders() throws MessagingException {
         super((Session)null);
@@ -66,6 +68,7 @@
      * Constructs a MessageHeaders object from the given InputStream.
      *
      * @param is InputStream
+ * @exception MessagingException for failures
      */
     public MessageHeaders(InputStream is) throws MessagingException {
         super(null, is);
@@ -76,6 +79,7 @@
      * Constructs a MessageHeaders object using the given InternetHeaders.
      *
      * @param headers InternetHeaders to use
+ * @exception MessagingException for failures
      */
     public MessageHeaders(InternetHeaders headers) throws MessagingException {
         super((Session)null);

diff -r 7af7a6dde8ed -r b2ddec86d99b dsn/src/main/java/com/sun/mail/dsn/MultipartReport.java
--- a/dsn/src/main/java/com/sun/mail/dsn/MultipartReport.java Mon Nov 25 15:37:17 2013 -0800
+++ b/dsn/src/main/java/com/sun/mail/dsn/MultipartReport.java Wed Nov 27 11:26:19 2013 -0800
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 1997-2011 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997-2013 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -76,6 +76,8 @@
 
     /**
      * Construct a multipart/report object with no content.
+ *
+ * @exception MessagingException for failures
      */
     public MultipartReport() throws MessagingException {
         super("report");
@@ -91,6 +93,10 @@
      * Construct a multipart/report object with the specified plain
      * text and report type (DeliveryStatus or DispositionNotification)
      * to be returned to the user.
+ *
+ * @param text the plain text
+ * @param report the Report object
+ * @exception MessagingException for failures
      */
     public MultipartReport(String text, Report report)
                                 throws MessagingException {
@@ -112,6 +118,11 @@
     /**
      * Construct a multipart/report object with the specified plain
      * text, report, and original message to be returned to the user.
+ *
+ * @param text the plain text
+ * @param report the Report object
+ * @param msg the message this report is about
+ * @exception MessagingException for failures
      */
     public MultipartReport(String text, Report report, MimeMessage msg)
                                 throws MessagingException {
@@ -127,6 +138,11 @@
      * Construct a multipart/report object with the specified plain
      * text, report, and headers from the original message
      * to be returned to the user.
+ *
+ * @param text the plain text
+ * @param report the Report object
+ * @param hdr the headers of the message this report is about
+ * @exception MessagingException for failures
      */
     public MultipartReport(String text, Report report, InternetHeaders hdr)
                                 throws MessagingException {
@@ -143,6 +159,7 @@
      * given DataSource. <p>
      *
      * @param ds DataSource, can be a MultipartDataSource
+ * @exception MessagingException for failures
      */
     public MultipartReport(DataSource ds) throws MessagingException {
         super(ds);
@@ -166,6 +183,9 @@
      * and contains a text/plain part, the text from that part is
      * returned. Otherwise, null is return and the {_at_link #getTextBodyPart
      * getTextBodyPart} method may be used to extract the data.
+ *
+ * @return the text
+ * @exception MessagingException for failures
      */
     public synchronized String getText() throws MessagingException {
         try {
@@ -189,6 +209,9 @@
     /**
      * Set the message to be presented to the user as just a text/plain
      * part containing the specified text.
+ *
+ * @param text the text
+ * @exception MessagingException for failures
      */
     public synchronized void setText(String text) throws MessagingException {
         MimeBodyPart mbp = new MimeBodyPart();
@@ -199,6 +222,9 @@
     /**
      * Return the body part containing the message to be presented to
      * the user, usually just a text/plain part.
+ *
+ * @return the body part containing the text
+ * @exception MessagingException for failures
      */
     public synchronized MimeBodyPart getTextBodyPart()
                                 throws MessagingException {
@@ -211,6 +237,9 @@
      * a text/html part or a multipart/alternative part containing
      * text/plain and text/html parts. Any type is allowed here
      * but these types are most common.
+ *
+ * @param mbp the body part containing the text
+ * @exception MessagingException for failures
      */
     public synchronized void setTextBodyPart(MimeBodyPart mbp)
                                 throws MessagingException {
@@ -220,6 +249,8 @@
     /**
      * Get the report associated with this multipart/report.
      *
+ * @return the Report object
+ * @exception MessagingException for failures
      * @since JavaMail 1.4.2
      */
     public synchronized Report getReport() throws MessagingException {
@@ -239,6 +270,8 @@
     /**
      * Set the report associated with this multipart/report.
      *
+ * @param report the Report object
+ * @exception MessagingException for failures
      * @since JavaMail 1.4.2
      */
     public synchronized void setReport(Report report)
@@ -256,6 +289,8 @@
     /**
      * Get the delivery status associated with this multipart/report.
      *
+ * @return the delivery status
+ * @exception MessagingException for failures
      * @deprecated use getReport instead
      */
     public synchronized DeliveryStatus getDeliveryStatus()
@@ -276,6 +311,8 @@
     /**
      * Set the delivery status associated with this multipart/report.
      *
+ * @param status the deliver status
+ * @exception MessagingException for failures
      * @deprecated use setReport instead
      */
     public synchronized void setDeliveryStatus(DeliveryStatus status)
@@ -293,6 +330,9 @@
      * multipart/report. If no original message is included, null is
      * returned. In some cases only the headers of the original
      * message will be returned as an object of type MessageHeaders.
+ *
+ * @return the returned message
+ * @exception MessagingException for failures
      */
     public synchronized MimeMessage getReturnedMessage()
                                 throws MessagingException {
@@ -314,6 +354,9 @@
      * Set the original message to be returned as part of the
      * multipart/report. If msg is null, any previously set
      * returned message or headers is removed.
+ *
+ * @param msg the returned message
+ * @exception MessagingException for failures
      */
     public synchronized void setReturnedMessage(MimeMessage msg)
                                 throws MessagingException {

diff -r 7af7a6dde8ed -r b2ddec86d99b dsn/src/main/java/com/sun/mail/dsn/Report.java
--- a/dsn/src/main/java/com/sun/mail/dsn/Report.java Mon Nov 25 15:37:17 2013 -0800
+++ b/dsn/src/main/java/com/sun/mail/dsn/Report.java Wed Nov 27 11:26:19 2013 -0800
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997-2013 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -53,6 +53,8 @@
     /**
      * Construct a report of the indicated MIME subtype.
      * The primary MIME type is always "message".
+ *
+ * @param type the MIME subtype
      */
     protected Report(String type) {
         this.type = type;
@@ -61,6 +63,8 @@
     /**
      * Get the MIME subtype of the report.
      * The primary MIME type is always "message".
+ *
+ * @return the MIME subtype
      */
     public String getType() {
         return type;

diff -r 7af7a6dde8ed -r b2ddec86d99b gimap/src/main/java/com/sun/mail/gimap/GmailFolder.java
--- a/gimap/src/main/java/com/sun/mail/gimap/GmailFolder.java Mon Nov 25 15:37:17 2013 -0800
+++ b/gimap/src/main/java/com/sun/mail/gimap/GmailFolder.java Wed Nov 27 11:26:19 2013 -0800
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 1997-2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997-2013 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -132,6 +132,7 @@
      * @param separator the default separator character for this
      * folder's namespace
      * @param store the Store
+ * @param isNamespace does this name represent a namespace?
      */
     protected GmailFolder(String fullName, char separator, IMAPStore store,
                                 Boolean isNamespace) {
@@ -140,6 +141,9 @@
 
     /**
      * Constructor used to create an existing folder.
+ *
+ * @param li the ListInfo for this folder
+ * @param store the store containing this folder
      */
     protected GmailFolder(ListInfo li, IMAPStore store) {
         super(li, store);

diff -r 7af7a6dde8ed -r b2ddec86d99b gimap/src/main/java/com/sun/mail/gimap/GmailMessage.java
--- a/gimap/src/main/java/com/sun/mail/gimap/GmailMessage.java Mon Nov 25 15:37:17 2013 -0800
+++ b/gimap/src/main/java/com/sun/mail/gimap/GmailMessage.java Wed Nov 27 11:26:19 2013 -0800
@@ -61,6 +61,9 @@
 public class GmailMessage extends IMAPMessage {
     /**
      * Constructor.
+ *
+ * @param folder the containing folder
+ * @param msgnum the message sequence number
      */
     protected GmailMessage(IMAPFolder folder, int msgnum) {
         super(folder, msgnum);
@@ -68,6 +71,8 @@
 
     /**
      * Constructor, for use by IMAPNestedMessage.
+ *
+ * @param session the Session
      */
     protected GmailMessage(Session session) {
         super(session);
@@ -75,6 +80,9 @@
 
     /**
      * Return the Gmail unique message ID.
+ *
+ * @return the message ID
+ * @exception MessagingException for failures
      */
     public long getMsgId() throws MessagingException {
         Long msgid = (Long)getItem(GmailProtocol.MSGID_ITEM);
@@ -86,6 +94,9 @@
 
     /**
      * Return the Gmail unique thread ID.
+ *
+ * @return the thread ID
+ * @exception MessagingException for failures
      */
     public long getThrId() throws MessagingException {
         Long thrid = (Long)getItem(GmailProtocol.THRID_ITEM);
@@ -99,6 +110,7 @@
      * Return the Gmail labels associated with this message.
      *
      * @return array of labels, or empty array if none
+ * @exception MessagingException for failures
      */
     public String[] getLabels() throws MessagingException {
         String[] labels = (String[])getItem(GmailProtocol.LABELS_ITEM);

diff -r 7af7a6dde8ed -r b2ddec86d99b gimap/src/main/java/com/sun/mail/gimap/GmailSSLStore.java
--- a/gimap/src/main/java/com/sun/mail/gimap/GmailSSLStore.java Mon Nov 25 15:37:17 2013 -0800
+++ b/gimap/src/main/java/com/sun/mail/gimap/GmailSSLStore.java Wed Nov 27 11:26:19 2013 -0800
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 1997-2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997-2013 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -55,6 +55,9 @@
     /**
      * Constructor that takes a Session object and a URLName that
      * represents a specific IMAP server.
+ *
+ * @param session the Session
+ * @param url the URLName of this store
      */
     public GmailSSLStore(Session session, URLName url) {
         super(session, url, "gimaps", true);

diff -r 7af7a6dde8ed -r b2ddec86d99b gimap/src/main/java/com/sun/mail/gimap/GmailStore.java
--- a/gimap/src/main/java/com/sun/mail/gimap/GmailStore.java Mon Nov 25 15:37:17 2013 -0800
+++ b/gimap/src/main/java/com/sun/mail/gimap/GmailStore.java Wed Nov 27 11:26:19 2013 -0800
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 1997-2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997-2013 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -63,6 +63,9 @@
     /**
      * Constructor that takes a Session object and a URLName that
      * represents a specific IMAP server.
+ *
+ * @param session the Session
+ * @param url the URLName of this store
      */
     public GmailStore(Session session, URLName url) {
         this(session, url, "gimap", true);
@@ -70,6 +73,11 @@
 
     /**
      * Constructor used by GmailSSLStore subclass.
+ *
+ * @param session the Session
+ * @param url the URLName of this store
+ * @param name the protocol name
+ * @param isSSL use SSL to connect?
      */
     protected GmailStore(Session session, URLName url,
                                 String name, boolean isSSL) {

diff -r 7af7a6dde8ed -r b2ddec86d99b mail/src/main/java/com/sun/mail/auth/MD4.java
--- a/mail/src/main/java/com/sun/mail/auth/MD4.java Mon Nov 25 15:37:17 2013 -0800
+++ b/mail/src/main/java/com/sun/mail/auth/MD4.java Wed Nov 27 11:26:19 2013 -0800
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2005-2010 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005-2013 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -98,7 +98,9 @@
         padding[0] = (byte)0x80;
     }
 
- // Standard constructor, creates a new MD4 instance.
+ /**
+ * Standard constructor, creates a new MD4 instance.
+ */
     public MD4() {
         state = new int[4];
         x = new int[16];
@@ -107,6 +109,9 @@
 
     /**
      * Compute and return the message digest of the input byte array.
+ *
+ * @param in the input byte array
+ * @return the message digest byte array
      */
     public byte[] digest(byte[] in) {
         implReset();

diff -r 7af7a6dde8ed -r b2ddec86d99b mail/src/main/java/com/sun/mail/iap/Protocol.java
--- a/mail/src/main/java/com/sun/mail/iap/Protocol.java Mon Nov 25 15:37:17 2013 -0800
+++ b/mail/src/main/java/com/sun/mail/iap/Protocol.java Wed Nov 27 11:26:19 2013 -0800
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 1997-2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997-2013 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -415,7 +415,8 @@
 
     /**
      * Get the name of the local host.
- * The property <prefix>.localhost overrides <prefix>.localaddress,
+ * The property &lt;prefix&gt;.localhost overrides
+ * &lt;prefix&gt;.localaddress,
      * which overrides what InetAddress would tell us.
      */
     protected synchronized String getLocalHost() {

diff -r 7af7a6dde8ed -r b2ddec86d99b mail/src/main/java/com/sun/mail/imap/IMAPFolder.java
--- a/mail/src/main/java/com/sun/mail/imap/IMAPFolder.java Mon Nov 25 15:37:17 2013 -0800
+++ b/mail/src/main/java/com/sun/mail/imap/IMAPFolder.java Wed Nov 27 11:26:19 2013 -0800
@@ -334,6 +334,7 @@
      * @param separator the default separator character for this
      * folder's namespace
      * @param store the Store
+ * @param isNamespace if this folder represents a namespace
      */
     protected IMAPFolder(String fullName, char separator, IMAPStore store,
                                 Boolean isNamespace) {
@@ -373,6 +374,9 @@
 
     /**
      * Constructor used to create an existing folder.
+ *
+ * @param li the ListInfo for this folder
+ * @param store the store containing this folder
      */
     protected IMAPFolder(ListInfo li, IMAPStore store) {
         this(li.name, li.separator, store, null);
@@ -1239,6 +1243,7 @@
      * method to fetch more data when FetchProfile.Item.ENVELOPE
      * is requested.
      *
+ * @return the IMAP FETCH items to request
      * @since JavaMail 1.4.6
      */
     protected String getEnvelopeCommand() {
@@ -1250,6 +1255,8 @@
      * Subclasses of IMAPFolder may override this method to create a
      * subclass of IMAPMessage.
      *
+ * @param msgnum the message sequence number
+ * @return the new IMAPMessage object
      * @since JavaMail 1.4.6
      */
     protected IMAPMessage newIMAPMessage(int msgnum) {
@@ -1343,6 +1350,8 @@
 
     /**
      * Close this folder without waiting for the server.
+ *
+ * @exception MessagingException for failures
      */
     public synchronized void forceClose() throws MessagingException {
         close(false, true);
@@ -1733,6 +1742,9 @@
      * UIDPLUS extension -
      * <A HREF="http://www.ietf.org/rfc/rfc2359.txt">RFC 2359</A>.
      *
+ * @param msgs the messages to append
+ * @return array of AppendUID objects
+ * @exception MessagingException for failures
      * @since JavaMail 1.4
      */
     public synchronized AppendUID[] appendUIDMessages(Message[] msgs)
@@ -1792,6 +1804,9 @@
      * UIDPLUS extension -
      * <A HREF="http://www.ietf.org/rfc/rfc2359.txt">RFC 2359</A>.
      *
+ * @param msgs the messages to add
+ * @return the messages in this folder
+ * @exception MessagingException for failures
      * @since JavaMail 1.4
      */
     public synchronized Message[] addMessages(Message[] msgs)
@@ -1867,6 +1882,10 @@
      * UIDPLUS extension -
      * <A HREF="http://www.ietf.org/rfc/rfc2359.txt">RFC 2359</A>.
      *
+ * @param msgs the messages to copy
+ * @param folder the folder to copy the messages to
+ * @return array of AppendUID objects
+ * @exception MessagingException for failures
      * @since JavaMail 1.5.1
      */
     public synchronized AppendUID[] copyUIDMessages(Message[] msgs,
@@ -1977,6 +1996,10 @@
      *
      * Depends on the UIDPLUS extension -
      * <A HREF="http://www.ietf.org/rfc/rfc2359.txt">RFC 2359</A>.
+ *
+ * @param msgs the messages to expunge
+ * @return the expunged messages
+ * @exception MessagingException for failures
      */
     public synchronized Message[] expunge(Message[] msgs)
                                 throws MessagingException {
@@ -2138,6 +2161,9 @@
      * Depends on the SORT extension -
      * <A HREF="http://www.ietf.org/rfc/rfc5256.txt">RFC 5256</A>.
      *
+ * @param term the SortTerms
+ * @return the messages in sorted order
+ * @exception MessagingException for failures
      * @since JavaMail 1.4.4
      */
     public synchronized Message[] getSortedMessages(SortTerm[] term)
@@ -2154,6 +2180,10 @@
      * Depends on the SORT extension -
      * <A HREF="http://www.ietf.org/rfc/rfc5256.txt">RFC 5256</A>.
      *
+ * @param term the SortTerms
+ * @param sterm the SearchTerm
+ * @return the messages in sorted order
+ * @exception MessagingException for failures
      * @since JavaMail 1.4.4
      */
     public synchronized Message[] getSortedMessages(SortTerm[] term,
@@ -2248,6 +2278,7 @@
      * should return this value when a folder is opened. <p>
      *
      * @return the UIDNEXT value, or -1 if unknown
+ * @exception MessagingException for failures
      * @since JavaMail 1.3.3
      */
     // Not a UIDFolder method, but still useful
@@ -2478,6 +2509,8 @@
     /**
      * Returns the HIGHESTMODSEQ for this folder.
      *
+ * @return the HIGHESTMODSEQ value
+ * @exception MessagingException for failures
      * @see "RFC 4551"
      * @since JavaMail 1.5.1
      */
@@ -2515,6 +2548,11 @@
      *
      * The server must support the CONDSTORE extension.
      *
+ * @param start the first message number
+ * @param end the last message number
+ * @param modseq the MODSEQ value
+ * @return the changed messages
+ * @exception MessagingException for failures
      * @see "RFC 4551"
      * @since JavaMail 1.5.1
      */
@@ -2730,6 +2768,8 @@
      * Get the attributes that the IMAP server returns with the
      * LIST response.
      *
+ * @return array of attributes for this folder
+ * @exception MessagingException for failures
      * @since JavaMail 1.3.3
      */
     public synchronized String[] getAttributes() throws MessagingException {
@@ -2772,6 +2812,7 @@
      * IDLE command after the first notification, to allow the caller
      * to process any notification synchronously.
      *
+ * @param once only do one notification?
      * @exception MessagingException if the server doesn't support the
      * IDLE extension
      * @exception IllegalStateException if the folder isn't open
@@ -3107,6 +3148,7 @@
      * When acquiring a store protocol object, it is important to
      * use the following steps:
      *
+ * <blockquote><pre>
      * IMAPProtocol p = null;
      * try {
      * p = getStoreProtocol();
@@ -3116,6 +3158,10 @@
      * } finally {
      * releaseStoreProtocol(p);
      * }
+ * </pre></blockquote>
+ *
+ * @return the IMAPProtocol for the Store's connection
+ * @exception ProtocolException for protocol errors
      */
     protected synchronized IMAPProtocol getStoreProtocol()
             throws ProtocolException {
@@ -3125,6 +3171,10 @@
 
     /**
      * Throw the appropriate 'closed' exception.
+ *
+ * @param cex the ConnectionException
+ * @exception FolderClosedException if the folder is closed
+ * @exception StoreClosedException if the store is closed
      */
     protected synchronized void throwClosedException(ConnectionException cex)
             throws FolderClosedException, StoreClosedException {
@@ -3149,6 +3199,7 @@
      * command to finish.
      *
      * @return the IMAPProtocol object used when the folder is open
+ * @exception ProtocolException for protocol errors
      */
     protected IMAPProtocol getProtocol() throws ProtocolException {
         assert Thread.holdsLock(messageCacheLock);
@@ -3163,6 +3214,10 @@
         /**
          * Execute the user-defined command using the supplied IMAPProtocol
          * object.
+ *
+ * @param protocol the IMAPProtocol for the connection
+ * @return the results of the command
+ * @exception ProtocolException for protocol errors
          */
         public Object doCommand(IMAPProtocol protocol) throws ProtocolException;
     }
@@ -3207,7 +3262,7 @@
      * Here's a more complex example showing how to use the proposed
      * IMAP SORT extension: <p>
      *
- * <pre><blockquote>
+ * <blockquote><pre>
      * import com.sun.mail.iap.*;
      * import com.sun.mail.imap.*;
      * import com.sun.mail.imap.protocol.*;
@@ -3231,7 +3286,7 @@
      * // Grab response
      * Vector v = new Vector();
      * if (response.isOK()) { // command succesful
- * for (int i = 0, len = r.length; i < len; i++) {
+ * for (int i = 0, len = r.length; i &lt; len; i++) {
      * if (!(r[i] instanceof IMAPResponse))
      * continue;
      *
@@ -3253,6 +3308,10 @@
      * }
      * });
      * </pre></blockquote>
+ *
+ * @param cmd the protocol command
+ * @return the result of the command
+ * @exception MessagingException for failures
      */
     public Object doCommand(ProtocolCommand cmd) throws MessagingException {
         try {
@@ -3326,6 +3385,8 @@
      * Release the store protocol object. If we borrowed a protocol
      * object from the connection pool, give it back. If we used our
      * own protocol object, nothing to do.
+ *
+ * @param p the IMAPProtocol object
      */
     protected synchronized void releaseStoreProtocol(IMAPProtocol p) {
         if (p != protocol)
@@ -3341,6 +3402,8 @@
      *
      * ASSERT: This method must be called only when holding the
      * messageCacheLock
+ *
+ * @param returnToPool return the protocol object to the pool?
      */
     protected void releaseProtocol(boolean returnToPool) {
         if (protocol != null) {
@@ -3363,6 +3426,9 @@
      *
      * ASSERT: This method must be called only when holding the
      * messageCacheLock
+ *
+ * @param keepStoreAlive keep the Store alive too?
+ * @exception ProtocolException for protocol errors
      */
     protected void keepConnectionAlive(boolean keepStoreAlive)
                     throws ProtocolException {
@@ -3391,6 +3457,9 @@
      *
      * ASSERT: This method must be called only when holding the
      * messageCacheLock
+ *
+ * @param seqnum the message sequence number
+ * @return the IMAPMessage object
      */
     protected IMAPMessage getMessageBySeqNumber(int seqnum) {
         return messageCache.getMessageBySeqnum(seqnum);

diff -r 7af7a6dde8ed -r b2ddec86d99b mail/src/main/java/com/sun/mail/imap/IMAPInputStream.java
--- a/mail/src/main/java/com/sun/mail/imap/IMAPInputStream.java Mon Nov 25 15:37:17 2013 -0800
+++ b/mail/src/main/java/com/sun/mail/imap/IMAPInputStream.java Wed Nov 27 11:26:19 2013 -0800
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 1997-2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997-2013 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -74,6 +74,11 @@
 
     /**
      * Create an IMAPInputStream.
+ *
+ * @param msg the IMAPMessage the data will come from
+ * @param section the IMAP section/part identifier for the data
+ * @param max the number of bytes in this section
+ * @param peek peek instead of fetch?
      */
     public IMAPInputStream(IMAPMessage msg, String section, int max,
                                 boolean peek) {

diff -r 7af7a6dde8ed -r b2ddec86d99b mail/src/main/java/com/sun/mail/imap/IMAPMessage.java
--- a/mail/src/main/java/com/sun/mail/imap/IMAPMessage.java Mon Nov 25 15:37:17 2013 -0800
+++ b/mail/src/main/java/com/sun/mail/imap/IMAPMessage.java Wed Nov 27 11:26:19 2013 -0800
@@ -128,6 +128,9 @@
 
     /**
      * Constructor.
+ *
+ * @param folder the folder containing this message
+ * @param msgnum the message sequence number
      */
     protected IMAPMessage(IMAPFolder folder, int msgnum) {
         super(folder, msgnum);
@@ -136,6 +139,8 @@
 
     /**
      * Constructor, for use by IMAPNestedMessage.
+ *
+ * @param session the Session
      */
     protected IMAPMessage(Session session) {
         super(session);
@@ -147,6 +152,10 @@
      * is not available.
      *
      * ASSERT: Must hold the messageCacheLock.
+ *
+ * @return the IMAPProtocol object for the containing folder
+ * @exception ProtocolException for protocol errors
+ * @exception FolderClosedException if the folder is closed
      */
     protected IMAPProtocol getProtocol()
                             throws ProtocolException, FolderClosedException {
@@ -174,6 +183,8 @@
     /**
      * Get the messageCacheLock, associated with this Message's
      * Folder.
+ *
+ * @return the message cache lock object
      */
     protected Object getMessageCacheLock() {
         return ((IMAPFolder)folder).messageCacheLock;
@@ -184,6 +195,8 @@
      *
      * ASSERT: This method must be called only when holding the
      * messageCacheLock.
+ *
+ * @return the message sequence number
      */
     protected int getSequenceNumber() {
         return ((IMAPFolder)folder).messageCache.seqnumOf(getMessageNumber());
@@ -217,6 +230,7 @@
      * Returns -1 if not known.
      *
      * @return the modification sequence number
+ * @exception MessagingException for failures
      * @see "RFC 4551"
      * @since JavaMail 1.5.1
      */
@@ -263,6 +277,9 @@
     /**
      * Do a NOOP to force any untagged EXPUNGE responses
      * and then check if this message is expunged.
+ *
+ * @exception MessageRemovedException if the message has been removed
+ * @exception FolderClosedException if the folder has been closed
      */
     protected void forceCheckExpunged()
                         throws MessageRemovedException, FolderClosedException {
@@ -490,6 +507,8 @@
     /**
      * Get the In-Reply-To header.
      *
+ * @return the In-Reply-To header
+ * @exception MessagingException for failures
      * @since JavaMail 1.3.3
      */
     public String getInReplyTo() throws MessagingException {
@@ -974,6 +993,7 @@
      * Set whether or not to use the PEEK variant of FETCH when
      * fetching message content.
      *
+ * @param peek the peek flag
      * @since JavaMail 1.3.3
      */
     public synchronized void setPeek(boolean peek) {
@@ -984,6 +1004,7 @@
      * Get whether or not to use the PEEK variant of FETCH when
      * fetching message content.
      *
+ * @return the peek flag
      * @since JavaMail 1.3.3
      */
     public synchronized boolean getPeek() {
@@ -1031,6 +1052,9 @@
         /**
          * Create a FetchProfileCondition to determine if we need to fetch
          * any of the information specified in the FetchProfile.
+ *
+ * @param fp the FetchProfile
+ * @param fitems the FETCH items
          */
         public FetchProfileCondition(FetchProfile fp, FetchItem[] fitems) {
             if (fp.contains(FetchProfile.Item.ENVELOPE))
@@ -1093,6 +1117,11 @@
      *
      * ASSERT: Must hold the messageCacheLock.
      *
+ * @param item the fetch item
+ * @param hdrs the headers we're asking for
+ * @param allHeaders load all headers?
+ * @return did we handle this fetch item?
+ * @exception MessagingException for failures
      * @since JavaMail 1.4.6
      */
     protected boolean handleFetchItem(Item item,
@@ -1187,6 +1216,8 @@
      *
      * ASSERT: Must hold the messageCacheLock.
      *
+ * @param extensionItems the Map to add fetch items to
+ * @exception MessagingException for failures
      * @since JavaMail 1.4.6
      */
     protected void handleExtensionFetchItems(Map extensionItems)
@@ -1203,6 +1234,9 @@
      * to store this item in the message before this method
      * returns.
      *
+ * @param fitem the FetchItem
+ * @return the data associated with the FetchItem
+ * @exception MessagingException for failures
      * @since JavaMail 1.4.6
      */
     protected Object fetchItem(FetchItem fitem)
@@ -1254,6 +1288,9 @@
      * method to fetch it. Returns null if there is no
      * data for the FetchItem.
      *
+ * @param fitem the FetchItem
+ * @return the data associated with the FetchItem
+ * @exception MessagingException for failures
      * @since JavaMail 1.4.6
      */
     public synchronized Object getItem(FetchItem fitem)

diff -r 7af7a6dde8ed -r b2ddec86d99b mail/src/main/java/com/sun/mail/imap/IMAPSSLStore.java
--- a/mail/src/main/java/com/sun/mail/imap/IMAPSSLStore.java Mon Nov 25 15:37:17 2013 -0800
+++ b/mail/src/main/java/com/sun/mail/imap/IMAPSSLStore.java Wed Nov 27 11:26:19 2013 -0800
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997-2013 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -51,6 +51,9 @@
     /**
      * Constructor that takes a Session object and a URLName that
      * represents a specific IMAP server.
+ *
+ * @param session the Session
+ * @param url the URLName of this store
      */
     public IMAPSSLStore(Session session, URLName url) {
         super(session, url, "imaps", true); // call super constructor

diff -r 7af7a6dde8ed -r b2ddec86d99b mail/src/main/java/com/sun/mail/imap/IMAPStore.java
--- a/mail/src/main/java/com/sun/mail/imap/IMAPStore.java Mon Nov 25 15:37:17 2013 -0800
+++ b/mail/src/main/java/com/sun/mail/imap/IMAPStore.java Wed Nov 27 11:26:19 2013 -0800
@@ -412,6 +412,9 @@
     /**
      * Constructor that takes a Session object and a URLName that
      * represents a specific IMAP server.
+ *
+ * @param session the Session
+ * @param url the URLName of this store
      */
     public IMAPStore(Session session, URLName url) {
         this(session, url, "imap", false);
@@ -419,6 +422,11 @@
 
     /**
      * Constructor used by this class and by IMAPSSLStore subclass.
+ *
+ * @param session the Session
+ * @param url the URLName of this store
+ * @param name the protocol name for this store
+ * @param isSSL use SSL?
      */
     protected IMAPStore(Session session, URLName url,
                                 String name, boolean isSSL) {
@@ -703,6 +711,11 @@
      * Subclasses of IMAPStore may override this method to return a
      * subclass of IMAPProtocol that supports product-specific extensions.
      *
+ * @param host the host name
+ * @param port the port number
+ * @return the new IMAPProtocol object
+ * @exc
[truncated due to length]