inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)

Browse Source 
72741: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      72386: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.3)
         72280: Merged V4.1.9 (4.1.9) to V4.1-BUG-FIX (4.1.10)
            72045: Merged DEV to PATCHES/V4.1.9
               72043: MNT-11099: Inbound emails : attachment names not preserved if they contain spaces or accents in the name (Implement UTF-8 content-disposition RFC 5987)
                  Upgrade Java mail from 1.4 to 1.5.2.
         72281: Merged V4.1.9 (4.1.9) to V4.1-BUG-FIX (4.1.10)
            72053: MNT-11099 Fix Maven coordinates of new version of javax.mail
         72282: Merged V4.1.9 (4.1.9) to V4.1-BUG-FIX (4.1.10)
            72162: Merged DEV to PATCHES/V4.1.9
               72153: MNT-11099: Inbound emails : attachment names not preserved if they contain spaces or accents in the name (Implement UTF-8 content-disposition RFC 5987)
                  Fixed compile error in the ImapMessageTest.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74739 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Will Abson
2014-06-25 15:38:38 +00:00
parent c624f32acf
commit 457b7e6048
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@@ -35,9 +35,9 @@
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.mail</groupId> <groupId>com.sun.mail</groupId>
<artifactId>mail</artifactId> <artifactId>javax.mail</artifactId>
<version>1.4</version> <version>1.5.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.icegreen</groupId> <groupId>com.icegreen</groupId>

6
source/test-java/org/alfresco/repo/imap/ImapMessageTest.java
View File

@@ -284,7 +284,7 @@ public class ImapMessageTest extends TestCase
BODY bodyNew = getMessageBody(folder, uid); BODY bodyNew = getMessageBody(folder, uid);
// The body should be updated // The body should be updated
assertFalse(Arrays.equals(bodyNew.data.getBytes(), body.data.getBytes())); assertFalse(Arrays.equals(bodyNew.getByteArray().getBytes(), body.getByteArray().getBytes()));
// Parse the multipart MIME message // Parse the multipart MIME message
message = new MimeMessage(Session.getDefaultInstance(new Properties()), new BufferedInputStream(bodyNew.getByteArrayInputStream())); message = new MimeMessage(Session.getDefaultInstance(new Properties()), new BufferedInputStream(bodyNew.getByteArrayInputStream()));
@@ -651,7 +651,7 @@ public class ImapMessageTest extends TestCase
{ {
FetchResponse fetchResponse = (FetchResponse) r[0]; FetchResponse fetchResponse = (FetchResponse) r[0];
UID uid = (UID) fetchResponse.getItem(UID.class); UID uid = (UID) fetchResponse.getItem(UID.class);
logger.debug("MSGNO=" + uid.msgno + ", UID="+uid.uid); logger.debug("SECNUM=" + uid.seqnum + ", UID="+uid.uid);
return uid.uid; return uid.uid;
} }
} }
@@ -691,7 +691,7 @@ public class ImapMessageTest extends TestCase
*/ */
private static Integer getMessageSize(IMAPFolder folder, final Long uid) throws MessagingException private static Integer getMessageSize(IMAPFolder folder, final Long uid) throws MessagingException
{ {
return getMessageBody(folder, uid).data.getCount(); return getMessageBody(folder, uid).getByteArray().getCount();
} }
/** /**