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/04/27 21:14:00 UTC
svn commit: r1741318 - in /webservices/axiom/trunk:
aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/
aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/xop/
axiom-api/src/main/java/org/apache/axiom/mime/ axiom-api...
Author: veithen
Date: Wed Apr 27 19:14:00 2016
New Revision: 1741318
URL: http://svn.apache.org/viewvc?rev=1741318&view=rev
Log:
Move MimePartProvider to org.apache.axiom.mime so that we get the correct API layering (the OM API shouldn't depend on utility packages in its interfaces).
Added:
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/MimePartProvider.java
- copied, changed from r1740738, webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/MimePartProvider.java
Removed:
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/MimePartProvider.java
Modified:
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/AbstractOMMetaFactory.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/BuilderFactory.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/xop/XOPDecodingFilter.java
webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/xop/XOPDecodingFilterHandler.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMMetaFactory.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/AttachmentsMimePartProvider.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/XOPDecodingStreamReader.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/XOPDecodingStreamWriter.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/XOPEncodedStream.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/XOPEncodingStreamWrapper.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/XOPUtils.java
webservices/axiom/trunk/axiom-jaxb/src/main/java/org/apache/axiom/om/ds/jaxb/DataHandlerWriterAttachmentMarshaller.java
webservices/axiom/trunk/axiom-jaxb/src/main/java/org/apache/axiom/util/jaxb/AttachmentUnmarshallerImpl.java
webservices/axiom/trunk/src/site/markdown/release-notes/1.3.0.md
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/AttachmentUnmarshallerImpl.java
webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/text/DummyMimePartProvider.java
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/AbstractOMMetaFactory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/AbstractOMMetaFactory.java?rev=1741318&r1=1741317&r2=1741318&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/AbstractOMMetaFactory.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/AbstractOMMetaFactory.java Wed Apr 27 19:14:00 2016
@@ -26,6 +26,7 @@ import javax.xml.transform.Source;
import javax.xml.transform.sax.SAXSource;
import org.apache.axiom.core.NodeFactory;
+import org.apache.axiom.mime.MimePartProvider;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.om.util.StAXParserConfiguration;
@@ -33,7 +34,6 @@ import org.apache.axiom.soap.SOAP12Const
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPModelBuilder;
import org.apache.axiom.soap.SOAPProcessingException;
-import org.apache.axiom.util.stax.xop.MimePartProvider;
import org.w3c.dom.Node;
import org.xml.sax.InputSource;
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/BuilderFactory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/BuilderFactory.java?rev=1741318&r1=1741317&r2=1741318&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/BuilderFactory.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/factory/BuilderFactory.java Wed Apr 27 19:14:00 2016
@@ -40,6 +40,7 @@ import org.apache.axiom.core.stream.Filt
import org.apache.axiom.core.stream.XmlInput;
import org.apache.axiom.core.stream.dom.DOMInput;
import org.apache.axiom.core.stream.sax.SAXInput;
+import org.apache.axiom.mime.MimePartProvider;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.om.impl.builder.Detachable;
@@ -57,7 +58,6 @@ import org.apache.axiom.soap.impl.intf.A
import org.apache.axiom.soap.impl.intf.AxiomSOAPMessage;
import org.apache.axiom.util.stax.XMLEventUtils;
import org.apache.axiom.util.stax.XMLFragmentStreamReader;
-import org.apache.axiom.util.stax.xop.MimePartProvider;
import org.w3c.dom.Node;
import org.xml.sax.InputSource;
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/xop/XOPDecodingFilter.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/xop/XOPDecodingFilter.java?rev=1741318&r1=1741317&r2=1741318&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/xop/XOPDecodingFilter.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/xop/XOPDecodingFilter.java Wed Apr 27 19:14:00 2016
@@ -20,7 +20,7 @@ package org.apache.axiom.om.impl.stream.
import org.apache.axiom.core.stream.XmlFilter;
import org.apache.axiom.core.stream.XmlHandler;
-import org.apache.axiom.util.stax.xop.MimePartProvider;
+import org.apache.axiom.mime.MimePartProvider;
public final class XOPDecodingFilter implements XmlFilter {
private final MimePartProvider mimePartProvider;
Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/xop/XOPDecodingFilterHandler.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/xop/XOPDecodingFilterHandler.java?rev=1741318&r1=1741317&r2=1741318&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/xop/XOPDecodingFilterHandler.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/stream/xop/XOPDecodingFilterHandler.java Wed Apr 27 19:14:00 2016
@@ -29,8 +29,8 @@ import org.apache.axiom.core.stream.Stre
import org.apache.axiom.core.stream.XmlHandler;
import org.apache.axiom.core.stream.XmlHandlerWrapper;
import org.apache.axiom.ext.stax.datahandler.DataHandlerProvider;
+import org.apache.axiom.mime.MimePartProvider;
import org.apache.axiom.om.impl.intf.TextContent;
-import org.apache.axiom.util.stax.xop.MimePartProvider;
final class XOPDecodingFilterHandler extends XmlHandlerWrapper {
private static class DataHandlerProviderImpl implements DataHandlerProvider {
Copied: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/MimePartProvider.java (from r1740738, webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/MimePartProvider.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/MimePartProvider.java?p2=webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/MimePartProvider.java&p1=webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/MimePartProvider.java&r1=1740738&r2=1741318&rev=1741318&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/MimePartProvider.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/MimePartProvider.java Wed Apr 27 19:14:00 2016
@@ -17,15 +17,14 @@
* under the License.
*/
-package org.apache.axiom.util.stax.xop;
+package org.apache.axiom.mime;
import java.io.IOException;
import javax.activation.DataHandler;
/**
- * Interface used by {@link XOPDecodingStreamReader} to load MIME parts referenced by
- * <tt>xop:Include</tt> elements.
+ * Interface to look up MIME parts.
*/
public interface MimePartProvider {
/**
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMMetaFactory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMMetaFactory.java?rev=1741318&r1=1741317&r2=1741318&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMMetaFactory.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMMetaFactory.java Wed Apr 27 19:14:00 2016
@@ -23,10 +23,10 @@ import javax.xml.stream.XMLStreamReader;
import javax.xml.transform.Source;
import javax.xml.transform.sax.SAXSource;
+import org.apache.axiom.mime.MimePartProvider;
import org.apache.axiom.om.util.StAXParserConfiguration;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPModelBuilder;
-import org.apache.axiom.util.stax.xop.MimePartProvider;
import org.w3c.dom.EntityReference;
import org.w3c.dom.Node;
import org.xml.sax.InputSource;
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/AttachmentsMimePartProvider.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/AttachmentsMimePartProvider.java?rev=1741318&r1=1741317&r2=1741318&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/AttachmentsMimePartProvider.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/AttachmentsMimePartProvider.java Wed Apr 27 19:14:00 2016
@@ -24,7 +24,7 @@ import java.io.IOException;
import javax.activation.DataHandler;
import org.apache.axiom.attachments.Attachments;
-import org.apache.axiom.util.stax.xop.MimePartProvider;
+import org.apache.axiom.mime.MimePartProvider;
/**
* Adapts an {@link Attachments} instance to the {@link MimePartProvider} interface.
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/XOPDecodingStreamReader.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/XOPDecodingStreamReader.java?rev=1741318&r1=1741317&r2=1741318&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/XOPDecodingStreamReader.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/XOPDecodingStreamReader.java Wed Apr 27 19:14:00 2016
@@ -31,6 +31,7 @@ import javax.xml.stream.XMLStreamReader;
import org.apache.axiom.ext.stax.datahandler.DataHandlerProvider;
import org.apache.axiom.ext.stax.datahandler.DataHandlerReader;
+import org.apache.axiom.mime.MimePartProvider;
import org.apache.axiom.util.base64.Base64Utils;
import org.apache.axiom.util.stax.XMLEventUtils;
import org.apache.axiom.util.stax.wrapper.XMLStreamReaderWrapper;
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/XOPDecodingStreamWriter.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/XOPDecodingStreamWriter.java?rev=1741318&r1=1741317&r2=1741318&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/XOPDecodingStreamWriter.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/XOPDecodingStreamWriter.java Wed Apr 27 19:14:00 2016
@@ -27,6 +27,7 @@ import javax.xml.stream.XMLStreamExcepti
import javax.xml.stream.XMLStreamWriter;
import org.apache.axiom.ext.stax.datahandler.DataHandlerWriter;
+import org.apache.axiom.mime.MimePartProvider;
import org.apache.axiom.util.stax.wrapper.XMLStreamWriterWrapper;
/**
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/XOPEncodedStream.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/XOPEncodedStream.java?rev=1741318&r1=1741317&r2=1741318&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/XOPEncodedStream.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/XOPEncodedStream.java Wed Apr 27 19:14:00 2016
@@ -21,6 +21,8 @@ package org.apache.axiom.util.stax.xop;
import javax.xml.stream.XMLStreamReader;
+import org.apache.axiom.mime.MimePartProvider;
+
/**
* Represents an XOP encoded stream. Since an XOP message is a MIME package with
* a root part in XML and a set of additional (binary) parts referenced from
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/XOPEncodingStreamWrapper.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/XOPEncodingStreamWrapper.java?rev=1741318&r1=1741317&r2=1741318&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/XOPEncodingStreamWrapper.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/XOPEncodingStreamWrapper.java Wed Apr 27 19:14:00 2016
@@ -28,6 +28,7 @@ import java.util.Set;
import javax.activation.DataHandler;
import org.apache.axiom.ext.stax.datahandler.DataHandlerProvider;
+import org.apache.axiom.mime.MimePartProvider;
/**
* Base class for {@link XOPEncodingStreamReader} and {@link XOPEncodingStreamWriter}.
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/XOPUtils.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/XOPUtils.java?rev=1741318&r1=1741317&r2=1741318&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/XOPUtils.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/xop/XOPUtils.java Wed Apr 27 19:14:00 2016
@@ -26,6 +26,7 @@ import java.net.URLDecoder;
import javax.activation.DataHandler;
import javax.xml.stream.XMLStreamReader;
+import org.apache.axiom.mime.MimePartProvider;
import org.apache.axiom.util.stax.XMLStreamReaderUtils;
/**
Modified: webservices/axiom/trunk/axiom-jaxb/src/main/java/org/apache/axiom/om/ds/jaxb/DataHandlerWriterAttachmentMarshaller.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-jaxb/src/main/java/org/apache/axiom/om/ds/jaxb/DataHandlerWriterAttachmentMarshaller.java?rev=1741318&r1=1741317&r2=1741318&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-jaxb/src/main/java/org/apache/axiom/om/ds/jaxb/DataHandlerWriterAttachmentMarshaller.java (original)
+++ webservices/axiom/trunk/axiom-jaxb/src/main/java/org/apache/axiom/om/ds/jaxb/DataHandlerWriterAttachmentMarshaller.java Wed Apr 27 19:14:00 2016
@@ -24,8 +24,8 @@ import java.util.Map;
import javax.activation.DataHandler;
+import org.apache.axiom.mime.MimePartProvider;
import org.apache.axiom.util.UIDGenerator;
-import org.apache.axiom.util.stax.xop.MimePartProvider;
final class DataHandlerWriterAttachmentMarshaller extends AttachmentMarshallerBase implements MimePartProvider {
private final Map<String,DataHandler> dataHandlers = new HashMap<String,DataHandler>();
Modified: webservices/axiom/trunk/axiom-jaxb/src/main/java/org/apache/axiom/util/jaxb/AttachmentUnmarshallerImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-jaxb/src/main/java/org/apache/axiom/util/jaxb/AttachmentUnmarshallerImpl.java?rev=1741318&r1=1741317&r2=1741318&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-jaxb/src/main/java/org/apache/axiom/util/jaxb/AttachmentUnmarshallerImpl.java (original)
+++ webservices/axiom/trunk/axiom-jaxb/src/main/java/org/apache/axiom/util/jaxb/AttachmentUnmarshallerImpl.java Wed Apr 27 19:14:00 2016
@@ -23,7 +23,7 @@ import java.io.IOException;
import javax.activation.DataHandler;
import javax.xml.bind.attachment.AttachmentUnmarshaller;
-import org.apache.axiom.util.stax.xop.MimePartProvider;
+import org.apache.axiom.mime.MimePartProvider;
import org.apache.axiom.util.stax.xop.XOPUtils;
final class AttachmentUnmarshallerImpl extends AttachmentUnmarshaller {
Modified: webservices/axiom/trunk/src/site/markdown/release-notes/1.3.0.md
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/src/site/markdown/release-notes/1.3.0.md?rev=1741318&r1=1741317&r2=1741318&view=diff
==============================================================================
--- webservices/axiom/trunk/src/site/markdown/release-notes/1.3.0.md (original)
+++ webservices/axiom/trunk/src/site/markdown/release-notes/1.3.0.md Wed Apr 27 19:14:00 2016
@@ -160,4 +160,6 @@ Changes in this release
handling has been removed. The only supported mechanism in Axiom 1.3.x is
defined by the `DataHandlerReader` API.
+* The `MimePartProvider` interface has been moved to `org.apache.axiom.mime`.
+
[AXIOM-474]: https://issues.apache.org/jira/browse/AXIOM-474
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/AttachmentUnmarshallerImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/AttachmentUnmarshallerImpl.java?rev=1741318&r1=1741317&r2=1741318&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/AttachmentUnmarshallerImpl.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/AttachmentUnmarshallerImpl.java Wed Apr 27 19:14:00 2016
@@ -24,7 +24,7 @@ import java.io.IOException;
import javax.activation.DataHandler;
import javax.xml.bind.attachment.AttachmentUnmarshaller;
-import org.apache.axiom.util.stax.xop.MimePartProvider;
+import org.apache.axiom.mime.MimePartProvider;
import org.apache.axiom.util.stax.xop.XOPUtils;
public class AttachmentUnmarshallerImpl extends AttachmentUnmarshaller {
Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/text/DummyMimePartProvider.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/text/DummyMimePartProvider.java?rev=1741318&r1=1741317&r2=1741318&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/text/DummyMimePartProvider.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/text/DummyMimePartProvider.java Wed Apr 27 19:14:00 2016
@@ -22,7 +22,7 @@ import java.io.IOException;
import javax.activation.DataHandler;
-import org.apache.axiom.util.stax.xop.MimePartProvider;
+import org.apache.axiom.mime.MimePartProvider;
final class DummyMimePartProvider implements MimePartProvider {
private final String contentID;