Author: veithen
Date: Sat May 4 12:00:00 2019
New Revision: 1858597
URL: http://svn.apache.org/viewvc?rev=1858597&view=rev
Log:
Merge r1795105 (with changes) to the 1.2 branch.
Removed:
webservices/axiom/branches/1.2.x/axiom-api/src/main/java/org/apache/axiom/attachments/QuotedPrintableInputStream.java
Modified:
webservices/axiom/branches/1.2.x/ (props changed)
webservices/axiom/branches/1.2.x/axiom-api/src/main/java/org/apache/axiom/attachments/MIMEMessage.java
webservices/axiom/branches/1.2.x/axiom-api/src/main/java/org/apache/axiom/attachments/PartImpl.java
webservices/axiom/branches/1.2.x/pom.xml
Propchange: webservices/axiom/branches/1.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat May 4 12:00:00 2019
@@ -14,4 +14,4 @@
/webservices/axiom/branches/maven-site-plugin-3.5:1731125-1732708
/webservices/axiom/branches/namespaceURIInterning:1293148-1293587
/webservices/axiom/branches/osgi-redesign:1180368-1180596
-/webservices/axiom/trunk:1726096,1726101,1726419,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727541,1727549,1727640,1727660,1727688,1727743,1727755,1727758,1727761,1728022,1728240,1728929,1730261,1730278,1731157,1731314-1731315,1731373,1731376,1731378,1731406,1731522,1731541,1732710,1733743,1739812,1740914,1741786,1741791,1741979,1747866,1758113,1762239,1762241,1762243,1762287,1777898,1781319,1781488,1787644,1790322,1791831,1795059,1795067,1795081,1796489,1796558,1797614,1798352,1806321,1815009,1817725,1817727,1817735,1819411,1821701,1821707,1826041,1843069,1843073,1843075,1843350,1843517,1844631,1845037,1845039,1845623,1846359,1846362,1846368,1846677,1848452,1848486,1848490,1848720,1849251,1849743,1849758,1849791,1849806,1850517,1850796,1850798,1850800,1850810,1853727
+/webservices/axiom/trunk:1726096,1726101,1726419,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727541,1727549,1727640,1727660,1727688,1727743,1727755,1727758,1727761,1728022,1728240,1728929,1730261,1730278,1731157,1731314-1731315,1731373,1731376,1731378,1731406,1731522,1731541,1732710,1733743,1739812,1740914,1741786,1741791,1741979,1747866,1758113,1762239,1762241,1762243,1762287,1777898,1781319,1781488,1787644,1790322,1791831,1795059,1795067,1795081,1795105,1796489,1796558,1797614,1798352,1806321,1815009,1817725,1817727,1817735,1819411,1821701,1821707,1826041,1843069,1843073,1843075,1843350,1843517,1844631,1845037,1845039,1845623,1846359,1846362,1846368,1846677,1848452,1848486,1848490,1848720,1849251,1849743,1849758,1849791,1849806,1850517,1850796,1850798,1850800,1850810,1853727
Modified:
webservices/axiom/branches/1.2.x/axiom-api/src/main/java/org/apache/axiom/attachments/MIMEMessage.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/axiom-api/src/main/java/org/apache/axiom/attachments/MIMEMessage.java?rev=1858597&r1=1858596&r2=1858597&view=diff
==============================================================================
---
webservices/axiom/branches/1.2.x/axiom-api/src/main/java/org/apache/axiom/attachments/MIMEMessage.java
(original)
+++
webservices/axiom/branches/1.2.x/axiom-api/src/main/java/org/apache/axiom/attachments/MIMEMessage.java
Sat May 4 12:00:00 2019
@@ -55,6 +55,8 @@ import org.apache.james.mime4j.stream.Re
class MIMEMessage extends AttachmentsDelegate {
private static final Log log = LogFactory.getLog(MIMEMessage.class);
+ private static final MimeConfig config =
MimeConfig.custom().setStrictParsing(true).build();
+
private static final WritableBlobFactory rootPartBlobFactory = new
WritableBlobFactory() {
public WritableBlob createBlob() {
return Blobs.createMemoryBlob();
@@ -122,8 +124,6 @@ class MIMEMessage extends AttachmentsDel
filterIS = null;
}
- MimeConfig config = new MimeConfig();
- config.setStrictParsing(true);
parser = new MimeTokenStream(config);
parser.setRecursionMode(RecursionMode.M_NO_RECURSE);
parser.parseHeadless(is, contentTypeString);
Modified:
webservices/axiom/branches/1.2.x/axiom-api/src/main/java/org/apache/axiom/attachments/PartImpl.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/axiom-api/src/main/java/org/apache/axiom/attachments/PartImpl.java?rev=1858597&r1=1858596&r2=1858597&view=diff
==============================================================================
---
webservices/axiom/branches/1.2.x/axiom-api/src/main/java/org/apache/axiom/attachments/PartImpl.java
(original)
+++
webservices/axiom/branches/1.2.x/axiom-api/src/main/java/org/apache/axiom/attachments/PartImpl.java
Sat May 4 12:00:00 2019
@@ -166,14 +166,7 @@ final class PartImpl implements Part {
}
private InputStream getDecodedInputStream() {
- InputStream in;
- if
("quoted-printable".equalsIgnoreCase(getHeader("Content-Transfer-Encoding"))) {
- // Temporary workaround for AXIOM-467 while waiting for MIME4J
0.7.3:
- // use a copy of QuotedPrintableInputStream from the 0.7 branch.
- in = new QuotedPrintableInputStream(parser.getInputStream(), true);
- } else {
- in = parser.getDecodedInputStream();
- }
+ InputStream in = parser.getDecodedInputStream();
if (log.isDebugEnabled()) {
in = new DebugInputStream(in, log);
}
Modified: webservices/axiom/branches/1.2.x/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/pom.xml?rev=1858597&r1=1858596&r2=1858597&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/pom.xml (original)
+++ webservices/axiom/branches/1.2.x/pom.xml Sat May 4 12:00:00 2019
@@ -343,8 +343,7 @@
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-mime4j-core</artifactId>
- <!-- Note: snapshot versions are currently not stable because
of MIME4J-231 -->
- <version>0.7.2</version>
+ <version>0.8.0</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
