geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject svn commit: r1827416 - in /geronimo/javamail/trunk/geronimo-javamail_1.5: ./ geronimo-javamail_1.5_provider/src/main/java/org/apache/geronimo/javamail/store/imap/ geronimo-javamail_1.5_provider/src/test/java/org/apache/geronimo/javamail/issues/
Date Wed, 21 Mar 2018 15:18:06 GMT
Author: rmannibucau
Date: Wed Mar 21 15:18:06 2018
New Revision: 1827416

URL: http://svn.apache.org/viewvc?rev=1827416&view=rev
Log:
fixing master build

Modified:
    geronimo/javamail/trunk/geronimo-javamail_1.5/geronimo-javamail_1.5_provider/src/main/java/org/apache/geronimo/javamail/store/imap/IMAPMimeBodyPart.java
    geronimo/javamail/trunk/geronimo-javamail_1.5/geronimo-javamail_1.5_provider/src/test/java/org/apache/geronimo/javamail/issues/GERONIMO6480Test.java
    geronimo/javamail/trunk/geronimo-javamail_1.5/pom.xml

Modified: geronimo/javamail/trunk/geronimo-javamail_1.5/geronimo-javamail_1.5_provider/src/main/java/org/apache/geronimo/javamail/store/imap/IMAPMimeBodyPart.java
URL: http://svn.apache.org/viewvc/geronimo/javamail/trunk/geronimo-javamail_1.5/geronimo-javamail_1.5_provider/src/main/java/org/apache/geronimo/javamail/store/imap/IMAPMimeBodyPart.java?rev=1827416&r1=1827415&r2=1827416&view=diff
==============================================================================
--- geronimo/javamail/trunk/geronimo-javamail_1.5/geronimo-javamail_1.5_provider/src/main/java/org/apache/geronimo/javamail/store/imap/IMAPMimeBodyPart.java
(original)
+++ geronimo/javamail/trunk/geronimo-javamail_1.5/geronimo-javamail_1.5_provider/src/main/java/org/apache/geronimo/javamail/store/imap/IMAPMimeBodyPart.java
Wed Mar 21 15:18:06 2018
@@ -180,7 +180,7 @@ public class IMAPMimeBodyPart extends Mi
         }
         
         // if we have a name, we might need to decode this if an additional property is set.
-        if (filename != null && SessionUtil.getBooleanProperty(MIME_DECODEFILENAME,
false)) {
+        if (filename != null && SessionUtil.getBooleanProperty("mail.mime.decodefilename",
false)) {
             try {
                 filename = MimeUtility.decodeText(filename);
             } catch (UnsupportedEncodingException e) {

Modified: geronimo/javamail/trunk/geronimo-javamail_1.5/geronimo-javamail_1.5_provider/src/test/java/org/apache/geronimo/javamail/issues/GERONIMO6480Test.java
URL: http://svn.apache.org/viewvc/geronimo/javamail/trunk/geronimo-javamail_1.5/geronimo-javamail_1.5_provider/src/test/java/org/apache/geronimo/javamail/issues/GERONIMO6480Test.java?rev=1827416&r1=1827415&r2=1827416&view=diff
==============================================================================
--- geronimo/javamail/trunk/geronimo-javamail_1.5/geronimo-javamail_1.5_provider/src/test/java/org/apache/geronimo/javamail/issues/GERONIMO6480Test.java
(original)
+++ geronimo/javamail/trunk/geronimo-javamail_1.5/geronimo-javamail_1.5_provider/src/test/java/org/apache/geronimo/javamail/issues/GERONIMO6480Test.java
Wed Mar 21 15:18:06 2018
@@ -37,17 +37,19 @@ import junit.framework.Assert;
 import org.apache.geronimo.javamail.testserver.AbstractProtocolTest;
 
 public class GERONIMO6480Test extends AbstractProtocolTest {
-
     public void testGERONIMO6480_0() throws Exception {
+        System.setProperty("mail.mime.setcontenttypefilename", "false");
         BodyPart attachmentPart = new MimeBodyPart();
         attachmentPart.setDataHandler(new DataHandler(new FileDataSource(getAbsoluteFilePathFromClassPath("pdf-test.pdf"))));
         attachmentPart.setFileName("test.pdf");
         String contentType = getSendedAttachmentContentType(attachmentPart);
         Assert.assertEquals("application/octet-stream; name=test.pdf".toLowerCase(), contentType.toLowerCase());
         // "text/plain; name=test.pdf" with Geronimo because setFileName force it to 'text/plain'
when adding the 'name=' part instead of keeping it null
+        System.clearProperty("mail.mime.setcontenttypefilename");
     }
 
     public void testGERONIMO6480_1() throws Exception {
+        System.setProperty("mail.mime.setcontenttypefilename", "false");
         BodyPart attachmentPart = new MimeBodyPart();
         attachmentPart.addHeader("Content-Type", "aplication/pdf");
         // setDataHandler reset "Content-Type" so equivalent to previous test
@@ -56,6 +58,7 @@ public class GERONIMO6480Test extends Ab
         String contentType = getSendedAttachmentContentType(attachmentPart);
         Assert.assertEquals("application/octet-stream; name=test.pdf".toLowerCase(), contentType.toLowerCase());
         // "text/plain; name=test.pdf" with Geronimo because setFileName force it to 'text/plain'
when adding the 'name=' part instead of keeping it null
+        System.clearProperty("mail.mime.setcontenttypefilename");
     }
 
     public void testGERONIMO6480_2() throws Exception {

Modified: geronimo/javamail/trunk/geronimo-javamail_1.5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/javamail/trunk/geronimo-javamail_1.5/pom.xml?rev=1827416&r1=1827415&r2=1827416&view=diff
==============================================================================
--- geronimo/javamail/trunk/geronimo-javamail_1.5/pom.xml (original)
+++ geronimo/javamail/trunk/geronimo-javamail_1.5/pom.xml Wed Mar 21 15:18:06 2018
@@ -65,7 +65,7 @@
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-javamail_1.5_spec</artifactId>
-                <version>${project.version}</version>
+                <version>1.0.0-SNAPSHOT</version>
             </dependency>
 
             <dependency>
@@ -125,7 +125,6 @@
         </pluginManagement>
 
         <plugins>
-
             <plugin>
                 <groupId>org.apache.rat</groupId>
                 <artifactId>apache-rat-plugin</artifactId>



Mime
View raw message