You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ff...@apache.org on 2012/11/20 06:43:01 UTC
svn commit: r1411547 - in /cxf/trunk:
api/src/main/java/org/apache/cxf/attachment/
api/src/test/java/org/apache/cxf/attachment/
systests/jaxws/src/test/java/org/apache/cxf/systest/provider/datasource/
Author: ffang
Date: Tue Nov 20 05:43:00 2012
New Revision: 1411547
URL: http://svn.apache.org/viewvc?rev=1411547&view=rev
Log:
[CXF-4482]remove the explicitly line.separator as it's not needed actually
Modified:
cxf/trunk/api/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java
cxf/trunk/api/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java
cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/datasource/DataSourceProviderTest.java
Modified: cxf/trunk/api/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java?rev=1411547&r1=1411546&r2=1411547&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java Tue Nov 20 05:43:00 2012
@@ -32,7 +32,6 @@ import java.util.Map;
import javax.activation.DataHandler;
-import org.apache.cxf.common.util.SystemPropertyAction;
import org.apache.cxf.message.Attachment;
import org.apache.cxf.message.Message;
@@ -154,9 +153,6 @@ public class AttachmentSerializer {
encoding = "UTF-8";
}
StringWriter writer = new StringWriter();
- String lineSeparator =
- SystemPropertyAction.getProperty("line.separator", "\r\n");
- writer.write(lineSeparator);
writer.write("--");
writer.write(bodyBoundary);
Modified: cxf/trunk/api/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java?rev=1411547&r1=1411546&r2=1411547&view=diff
==============================================================================
--- cxf/trunk/api/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java (original)
+++ cxf/trunk/api/src/test/java/org/apache/cxf/attachment/AttachmentSerializerTest.java Tue Nov 20 05:43:00 2012
@@ -27,6 +27,7 @@ import java.util.Collection;
import java.util.Properties;
import javax.activation.DataHandler;
+import javax.activation.DataSource;
import javax.mail.Session;
import javax.mail.internet.MimeBodyPart;
import javax.mail.internet.MimeMessage;
@@ -90,8 +91,11 @@ public class AttachmentSerializerTest ex
out.flush();
+ DataSource source = new ByteArrayDataSource(new ByteArrayInputStream(out.toByteArray()), ct);
+ MimeMultipart mpart = new MimeMultipart(source);
Session session = Session.getDefaultInstance(new Properties());
- MimeMessage inMsg = new MimeMessage(session, new ByteArrayInputStream(out.toByteArray()));
+ MimeMessage inMsg = new MimeMessage(session);
+ inMsg.setContent(mpart);
inMsg.addHeaderLine("Content-Type: " + ct);
MimeMultipart multipart = (MimeMultipart) inMsg.getContent();
@@ -158,9 +162,12 @@ public class AttachmentSerializerTest ex
serializer.writeAttachments();
out.flush();
-
+ DataSource source = new ByteArrayDataSource(new ByteArrayInputStream(out.toByteArray()), ct);
+ MimeMultipart mpart = new MimeMultipart(source);
Session session = Session.getDefaultInstance(new Properties());
- MimeMessage inMsg = new MimeMessage(session, new ByteArrayInputStream(out.toByteArray()));
+ MimeMessage inMsg = new MimeMessage(session);
+ inMsg.setContent(mpart);
+
inMsg.addHeaderLine("Content-Type: " + ct);
MimeMultipart multipart = (MimeMultipart) inMsg.getContent();
Modified: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/datasource/DataSourceProviderTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/datasource/DataSourceProviderTest.java?rev=1411547&r1=1411546&r2=1411547&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/datasource/DataSourceProviderTest.java (original)
+++ cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/datasource/DataSourceProviderTest.java Tue Nov 20 05:43:00 2012
@@ -28,10 +28,12 @@ import java.net.URL;
import java.util.Properties;
import java.util.logging.Logger;
+import javax.activation.DataSource;
import javax.mail.MessagingException;
import javax.mail.Session;
import javax.mail.internet.MimeMessage;
import javax.mail.internet.MimeMultipart;
+import javax.mail.util.ByteArrayDataSource;
import javax.xml.transform.OutputKeys;
import javax.xml.transform.Source;
import javax.xml.transform.Transformer;
@@ -116,8 +118,11 @@ public class DataSourceProviderTest exte
public static MimeMultipart readAttachmentParts(String contentType, InputStream bais) throws
MessagingException, IOException {
+ DataSource source = new ByteArrayDataSource(bais, contentType);
+ MimeMultipart mpart = new MimeMultipart(source);
Session session = Session.getDefaultInstance(new Properties());
- MimeMessage mm = new MimeMessage(session, bais);
+ MimeMessage mm = new MimeMessage(session);
+ mm.setContent(mpart);
mm.addHeaderLine("Content-Type:" + contentType);
return (MimeMultipart) mm.getContent();
}