You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2016/06/12 21:24:53 UTC
svn commit: r1748051 - in /webservices/axiom/trunk/axiom-api: ./
src/main/java/org/apache/axiom/attachments/
src/main/java/org/apache/axiom/mime/
Author: veithen
Date: Sun Jun 12 21:24:53 2016
New Revision: 1748051
URL: http://svn.apache.org/viewvc?rev=1748051&view=rev
Log:
Make MIMEMessage a public API.
Added:
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/DebugInputStream.java
- copied, changed from r1748050, webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/DebugInputStream.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/MIMEMessage.java
- copied, changed from r1748050, webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/MIMEMessage.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/PartImpl.java
- copied, changed from r1748050, webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/PartImpl.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/PartInputStream.java
- copied, changed from r1748050, webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/PartInputStream.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/PartIterator.java
- copied, changed from r1748050, webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/PartIterator.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/QuotedPrintableInputStream.java
- copied, changed from r1748050, webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/QuotedPrintableInputStream.java
Removed:
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/DebugInputStream.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/MIMEMessage.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/PartImpl.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/PartInputStream.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/PartIterator.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/QuotedPrintableInputStream.java
Modified:
webservices/axiom/trunk/axiom-api/pom.xml
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/IncomingAttachmentStreams.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/MIMEMessageAdapter.java
Modified: webservices/axiom/trunk/axiom-api/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/pom.xml?rev=1748051&r1=1748050&r2=1748051&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/pom.xml (original)
+++ webservices/axiom/trunk/axiom-api/pom.xml Sun Jun 12 21:24:53 2016
@@ -271,7 +271,7 @@
<visibilityRules>
<value>
<packages>
- <value>org.apache.axiom.attachments</value>
+ <value>org.apache.axiom.mime</value>
</packages>
<allowPublicUsage>false</allowPublicUsage>
</value>
@@ -299,11 +299,12 @@
org.apache.axiom.attachments.AttachmentsDelegate -> org.apache.axiom.om.OMException,
org.apache.axiom.attachments.AttachmentSet -> org.apache.axiom.om.OMException,
org.apache.axiom.attachments.IncomingAttachmentStreams -> org.apache.axiom.om.OMException,
- org.apache.axiom.attachments.MIMEMessage -> org.apache.axiom.om.OMException,
org.apache.axiom.attachments.MIMEMessageAdapter -> org.apache.axiom.om.OMException,
- org.apache.axiom.attachments.PartImpl -> org.apache.axiom.om.OMException,
<!-- Bad API design: a public API shouldn't depend on classes in an impl package in its interface -->
org.apache.axiom.attachments.lifecycle.LifecycleManager -> org.apache.axiom.attachments.lifecycle.impl.FileAccessor,
+ <!-- TODO -->
+ org.apache.axiom.mime.MIMEMessage -> org.apache.axiom.om.OMException,
+ org.apache.axiom.mime.PartImpl -> org.apache.axiom.om.OMException,
<!-- o.a.a.soap should be a layer on top of o.a.a.om -->
org.apache.axiom.om.OMAbstractFactory -> org.apache.axiom.soap.SOAPFactory,
org.apache.axiom.om.OMMetaFactory -> org.apache.axiom.soap.SOAPFactory,
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/IncomingAttachmentStreams.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/IncomingAttachmentStreams.java?rev=1748051&r1=1748050&r2=1748051&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/IncomingAttachmentStreams.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/IncomingAttachmentStreams.java Sun Jun 12 21:24:53 2016
@@ -23,6 +23,7 @@ import java.io.IOException;
import java.util.Iterator;
import org.apache.axiom.mime.Header;
+import org.apache.axiom.mime.MIMEMessage;
import org.apache.axiom.mime.Part;
import org.apache.axiom.om.OMException;
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/MIMEMessageAdapter.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/MIMEMessageAdapter.java?rev=1748051&r1=1748050&r2=1748051&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/MIMEMessageAdapter.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/MIMEMessageAdapter.java Sun Jun 12 21:24:53 2016
@@ -32,6 +32,7 @@ import org.apache.axiom.blob.WritableBlo
import org.apache.axiom.mime.ContentType;
import org.apache.axiom.mime.DataHandlerFactory;
import org.apache.axiom.mime.Header;
+import org.apache.axiom.mime.MIMEMessage;
import org.apache.axiom.mime.Part;
import org.apache.axiom.om.OMException;
import org.apache.axiom.util.UIDGenerator;
Copied: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/DebugInputStream.java (from r1748050, webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/DebugInputStream.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/DebugInputStream.java?p2=webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/DebugInputStream.java&p1=webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/DebugInputStream.java&r1=1748050&r2=1748051&rev=1748051&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/DebugInputStream.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/DebugInputStream.java Sun Jun 12 21:24:53 2016
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.attachments;
+package org.apache.axiom.mime;
import java.io.IOException;
import java.io.InputStream;
Copied: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/MIMEMessage.java (from r1748050, webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/MIMEMessage.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/MIMEMessage.java?p2=webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/MIMEMessage.java&p1=webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/MIMEMessage.java&r1=1748050&r2=1748051&rev=1748051&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/MIMEMessage.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/MIMEMessage.java Sun Jun 12 21:24:53 2016
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.attachments;
+package org.apache.axiom.mime;
import java.io.IOException;
import java.io.InputStream;
@@ -31,10 +31,6 @@ import javax.activation.DataHandler;
import org.apache.axiom.blob.MemoryBlob;
import org.apache.axiom.blob.WritableBlobFactory;
-import org.apache.axiom.mime.ContentType;
-import org.apache.axiom.mime.DataHandlerFactory;
-import org.apache.axiom.mime.Header;
-import org.apache.axiom.mime.Part;
import org.apache.axiom.om.OMException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -46,10 +42,9 @@ import org.apache.james.mime4j.stream.Mi
import org.apache.james.mime4j.stream.RecursionMode;
/**
- * {@link AttachmentsDelegate} implementation that represents a MIME multipart message read from a
- * stream.
+ * Represents a MIME multipart message read from a stream.
*/
-class MIMEMessage implements Iterable<Part> {
+public final class MIMEMessage implements Iterable<Part> {
private static final Log log = LogFactory.getLog(MIMEMessage.class);
/** <code>ContentType</code> of the MIME message */
@@ -73,7 +68,7 @@ class MIMEMessage implements Iterable<Pa
private final WritableBlobFactory<?> attachmentBlobFactory;
private final DataHandlerFactory dataHandlerFactory;
- MIMEMessage(InputStream inStream, String contentTypeString,
+ public MIMEMessage(InputStream inStream, String contentTypeString,
WritableBlobFactory<?> attachmentBlobFactory,
DataHandlerFactory dataHandlerFactory) throws OMException {
this.attachmentBlobFactory = attachmentBlobFactory;
@@ -125,7 +120,7 @@ class MIMEMessage implements Iterable<Pa
return dataHandlerFactory;
}
- ContentType getContentType() {
+ public ContentType getContentType() {
return contentType;
}
@@ -146,7 +141,7 @@ class MIMEMessage implements Iterable<Pa
return firstPart;
}
- Part getRootPart() {
+ public Part getRootPart() {
do {
if (rootPart != null) {
return rootPart;
Copied: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/PartImpl.java (from r1748050, webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/PartImpl.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/PartImpl.java?p2=webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/PartImpl.java&p1=webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/PartImpl.java&r1=1748050&r2=1748051&rev=1748051&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/PartImpl.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/PartImpl.java Sun Jun 12 21:24:53 2016
@@ -17,15 +17,13 @@
* under the License.
*/
-package org.apache.axiom.attachments;
+package org.apache.axiom.mime;
import org.apache.axiom.blob.Blob;
import org.apache.axiom.blob.OverflowableBlob;
import org.apache.axiom.blob.WritableBlob;
import org.apache.axiom.blob.WritableBlobFactory;
import org.apache.axiom.ext.io.StreamCopyException;
-import org.apache.axiom.mime.Header;
-import org.apache.axiom.mime.Part;
import org.apache.axiom.om.OMException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Copied: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/PartInputStream.java (from r1748050, webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/PartInputStream.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/PartInputStream.java?p2=webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/PartInputStream.java&p1=webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/PartInputStream.java&r1=1748050&r2=1748051&rev=1748051&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/PartInputStream.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/PartInputStream.java Sun Jun 12 21:24:53 2016
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.attachments;
+package org.apache.axiom.mime;
import java.io.IOException;
import java.io.InputStream;
Copied: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/PartIterator.java (from r1748050, webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/PartIterator.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/PartIterator.java?p2=webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/PartIterator.java&p1=webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/PartIterator.java&r1=1748050&r2=1748051&rev=1748051&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/PartIterator.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/PartIterator.java Sun Jun 12 21:24:53 2016
@@ -16,13 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.attachments;
+package org.apache.axiom.mime;
import java.util.Iterator;
import java.util.NoSuchElementException;
-import org.apache.axiom.mime.Part;
-
final class PartIterator implements Iterator<Part> {
private final MIMEMessage message;
private PartImpl part;
Copied: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/QuotedPrintableInputStream.java (from r1748050, webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/QuotedPrintableInputStream.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/QuotedPrintableInputStream.java?p2=webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/QuotedPrintableInputStream.java&p1=webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/QuotedPrintableInputStream.java&r1=1748050&r2=1748051&rev=1748051&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/QuotedPrintableInputStream.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/QuotedPrintableInputStream.java Sun Jun 12 21:24:53 2016
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.axiom.attachments;
+package org.apache.axiom.mime;
import java.io.IOException;
import java.io.InputStream;