Author: veithen
Date: Sat Nov 13 18:53:05 2010
New Revision: 1034847
URL: http://svn.apache.org/viewvc?rev=1034847&view=rev
Log:
Fixed an issue in the new MultipartWriter implementation where base64 encoded
parts were not completely written.
Added:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/mime/
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/mime/AbstractMultipartWriterTest.java
(with props)
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/mime/impl/
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/mime/impl/axiom/
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/mime/impl/axiom/MultipartWriterTest.java
(with props)
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/mime/impl/javamail/
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/mime/impl/javamail/MultipartWriterTest.java
(with props)
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/mime/impl/axiom/MultipartWriterImpl.java
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/mime/impl/axiom/MultipartWriterImpl.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/mime/impl/axiom/MultipartWriterImpl.java?rev=1034847&r1=1034846&r2=1034847&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/mime/impl/axiom/MultipartWriterImpl.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/mime/impl/axiom/MultipartWriterImpl.java
Sat Nov 13 18:53:05 2010
@@ -47,7 +47,9 @@ class MultipartWriterImpl implements Mul
}
public void close() throws IOException {
- parent.flush();
+ if (parent instanceof Base64EncodingOutputStream) {
+ ((Base64EncodingOutputStream)parent).complete();
+ }
writeAscii("\r\n");
}
}
Added:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/mime/AbstractMultipartWriterTest.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/mime/AbstractMultipartWriterTest.java?rev=1034847&view=auto
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/mime/AbstractMultipartWriterTest.java
(added)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/mime/AbstractMultipartWriterTest.java
Sat Nov 13 18:53:05 2010
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.axiom.mime;
+
+import java.io.ByteArrayOutputStream;
+import java.io.OutputStream;
+import java.util.Arrays;
+import java.util.Random;
+
+import javax.mail.internet.MimeBodyPart;
+import javax.mail.internet.MimeMultipart;
+
+import org.apache.axiom.attachments.ByteArrayDataSource;
+import org.apache.axiom.util.UIDGenerator;
+
+import junit.framework.TestCase;
+
+public abstract class AbstractMultipartWriterTest extends TestCase {
+ private final MultipartWriterFactory factory;
+
+ public AbstractMultipartWriterTest(MultipartWriterFactory factory) {
+ this.factory = factory;
+ }
+
+ private void test(String contentTransferEncoding) throws Exception {
+ Random random = new Random();
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ MultipartWriter mpw = factory.createMultipartWriter(baos,
UIDGenerator.generateMimeBoundary());
+ byte[] content = new byte[8192];
+ random.nextBytes(content);
+ OutputStream partOutputStream =
mpw.writePart("application/octet-stream", contentTransferEncoding,
UIDGenerator.generateContentId());
+ partOutputStream.write(content);
+ partOutputStream.close();
+ mpw.complete();
+
+ MimeMultipart mp = new MimeMultipart(new
ByteArrayDataSource(baos.toByteArray()));
+ assertEquals(1, mp.getCount());
+ MimeBodyPart bp = (MimeBodyPart)mp.getBodyPart(0);
+ assertEquals(contentTransferEncoding,
bp.getHeader("Content-Transfer-Encoding")[0]);
+ baos.reset();
+ bp.getDataHandler().writeTo(baos);
+ assertTrue(Arrays.equals(content, baos.toByteArray()));
+ }
+
+ public void testBinary() throws Exception {
+ test("binary");
+ }
+
+ public void testBase64() throws Exception {
+ test("base64");
+ }
+}
Propchange:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/mime/AbstractMultipartWriterTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/mime/impl/axiom/MultipartWriterTest.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/mime/impl/axiom/MultipartWriterTest.java?rev=1034847&view=auto
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/mime/impl/axiom/MultipartWriterTest.java
(added)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/mime/impl/axiom/MultipartWriterTest.java
Sat Nov 13 18:53:05 2010
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.axiom.mime.impl.axiom;
+
+import org.apache.axiom.mime.AbstractMultipartWriterTest;
+
+public class MultipartWriterTest extends AbstractMultipartWriterTest {
+ public MultipartWriterTest() {
+ super(AxiomMultipartWriterFactory.INSTANCE);
+ }
+}
Propchange:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/mime/impl/axiom/MultipartWriterTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/mime/impl/javamail/MultipartWriterTest.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/mime/impl/javamail/MultipartWriterTest.java?rev=1034847&view=auto
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/mime/impl/javamail/MultipartWriterTest.java
(added)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/mime/impl/javamail/MultipartWriterTest.java
Sat Nov 13 18:53:05 2010
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.axiom.mime.impl.javamail;
+
+import org.apache.axiom.mime.AbstractMultipartWriterTest;
+
+public class MultipartWriterTest extends AbstractMultipartWriterTest {
+ public MultipartWriterTest() {
+ super(JavaMailMultipartWriterFactory.INSTANCE);
+ }
+}
Propchange:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/mime/impl/javamail/MultipartWriterTest.java
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
