Project: javamail
Repository: mercurial
Revision: 291
Author: shannon
Date: 2010-08-10 17:43:08 UTC
Link:
Log Message:
------------
Include package javadocs for com.sun.mail.dsn package.
Fix links to RFCs in DSN classes to use TARGET="_top".
Work around buggy IMAP servers that don't unfold the subject text.
Revisions:
----------
290
291
Modified Paths:
---------------
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/MultipartReport.java
javadoc/pom.xml
mail/src/main/java/com/sun/mail/imap/IMAPMessage.java
Diffs:
------
diff -r 1f3bd76155ad -r 06deed0f8949 dsn/src/main/java/com/sun/mail/dsn/DeliveryStatus.java
--- a/dsn/src/main/java/com/sun/mail/dsn/DeliveryStatus.java Mon Jun 21 10:20:15 2010 -0700
+++ b/dsn/src/main/java/com/sun/mail/dsn/DeliveryStatus.java Mon Jun 28 17:29:23 2010 -0700
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 1997-2010 Sun Microsystems, Inc. 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
@@ -48,7 +48,7 @@
/**
* A message/delivery-status message content, as defined in
- * <A HREF="
http://www.ietf.org/rfc/rfc3464.txt">RFC 3464</A>.
+ * <A HREF="
http://www.ietf.org/rfc/rfc3464.txt" TARGET="_top">RFC 3464</A>.
*
* @since JavaMail 1.4
*/
diff -r 1f3bd76155ad -r 06deed0f8949 dsn/src/main/java/com/sun/mail/dsn/DispositionNotification.java
--- a/dsn/src/main/java/com/sun/mail/dsn/DispositionNotification.java Mon Jun 21 10:20:15 2010 -0700
+++ b/dsn/src/main/java/com/sun/mail/dsn/DispositionNotification.java Mon Jun 28 17:29:23 2010 -0700
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 1997-2010 Sun Microsystems, Inc. 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
@@ -47,7 +47,7 @@
/**
* A message/disposition-notification message content, as defined in
- * <A HREF="
http://www.ietf.org/rfc/rfc3798.txt">RFC 3798</A>.
+ * <A HREF="
http://www.ietf.org/rfc/rfc3798.txt" TARGET="_top">RFC 3798</A>.
*
* @since JavaMail 1.4.2
*/
diff -r 1f3bd76155ad -r 06deed0f8949 dsn/src/main/java/com/sun/mail/dsn/MultipartReport.java
--- a/dsn/src/main/java/com/sun/mail/dsn/MultipartReport.java Mon Jun 21 10:20:15 2010 -0700
+++ b/dsn/src/main/java/com/sun/mail/dsn/MultipartReport.java Mon Jun 28 17:29:23 2010 -0700
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 1997-2010 Sun Microsystems, Inc. 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
@@ -45,7 +45,7 @@
/**
* A multipart/report message content, as defined in
- * <A HREF="
http://www.ietf.org/rfc/rfc3462.txt">RFC 3462</A>.
+ * <A HREF="
http://www.ietf.org/rfc/rfc3462.txt" TARGET="_top">RFC 3462</A>.
* A multipart/report content is a container for mail reports
* of any kind, and is most often used to return a delivery
* status report or a disposition notification report. <p>
diff -r 1f3bd76155ad -r 06deed0f8949 javadoc/pom.xml
--- a/javadoc/pom.xml Mon Jun 21 10:20:15 2010 -0700
+++ b/javadoc/pom.xml Mon Jun 28 17:29:23 2010 -0700
@@ -100,6 +100,7 @@
"/>
<fileset dir="../dsn/src/main/java"
includes="
+ com/sun/mail/dsn/package.html,
com/sun/mail/dsn/DeliveryStatus.java,
com/sun/mail/dsn/DispositionNotification.java,
com/sun/mail/dsn/MessageHeaders.java,
diff -r 06deed0f8949 -r 46611b82ce48 mail/src/main/java/com/sun/mail/imap/IMAPMessage.java
--- a/mail/src/main/java/com/sun/mail/imap/IMAPMessage.java Mon Jun 28 17:29:23 2010 -0700
+++ b/mail/src/main/java/com/sun/mail/imap/IMAPMessage.java Tue Aug 10 10:43:08 2010 -0700
@@ -1,7 +1,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
- * Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 1997-2010 Sun Microsystems, Inc. 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
@@ -315,7 +315,10 @@
// Cache and return the decoded value.
try {
- subject = MimeUtility.decodeText(envelope.subject);
+ // The server *should* unfold the value, but just in case it
+ // doesn't we unfold it here.
+ subject =
+ MimeUtility.decodeText(MimeUtility.unfold(envelope.subject));
} catch (UnsupportedEncodingException ex) {
subject = envelope.subject;
}