Author: veithen
Date: Fri Dec 30 13:27:08 2016
New Revision: 1776561
URL: http://svn.apache.org/viewvc?rev=1776561&view=rev
Log:
Adapt to changes in the Axiom API.
Removed:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/util/impl/AttachmentsMimePartProvider.java
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBAttachmentUnmarshaller.java
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBDSContext.java
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/util/impl/SAAJConverterImpl.java
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/util/SAAJUtil.java
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBAttachmentUnmarshaller.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBAttachmentUnmarshaller.java?rev=1776561&r1=1776560&r2=1776561&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBAttachmentUnmarshaller.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBAttachmentUnmarshaller.java
Fri Dec 30 13:27:08 2016
@@ -19,7 +19,7 @@
package org.apache.axis2.datasource.jaxb;
-import org.apache.axiom.mime.MimePartProvider;
+import org.apache.axiom.om.OMAttachmentAccessor;
import org.apache.axiom.om.OMException;
import org.apache.axis2.jaxws.i18n.Messages;
import org.apache.commons.logging.Log;
@@ -43,11 +43,11 @@ public final class JAXBAttachmentUnmarsh
private static final Log log =
LogFactory.getLog(JAXBAttachmentUnmarshaller.class);
private final AttachmentContext context;
- private final MimePartProvider mimePartProvider;
+ private final OMAttachmentAccessor attachmentAccessor;
- public JAXBAttachmentUnmarshaller(AttachmentContext context,
MimePartProvider mimePartProvider) {
+ public JAXBAttachmentUnmarshaller(AttachmentContext context,
OMAttachmentAccessor attachmentAccessor) {
this.context = context;
- this.mimePartProvider = mimePartProvider;
+ this.attachmentAccessor = attachmentAccessor;
}
public final boolean isXOPPackage() {
@@ -157,14 +157,7 @@ public final class JAXBAttachmentUnmarsh
if (blobcid.startsWith("cid:")) {
blobcid = blobcid.substring(4);
}
- DataHandler dh;
- try {
- dh = mimePartProvider.getDataHandler(blobcid);
- } catch (IllegalArgumentException ex) {
- dh = null;
- } catch (IOException ex) {
- throw new OMException("Failed to load attachment with content ID "
+ blobcid, ex);
- }
+ DataHandler dh = attachmentAccessor.getDataHandler(blobcid);
if (dh == null) {
dh = context.getDataHandlerForSwA(blobcid);
}
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBDSContext.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBDSContext.java?rev=1776561&r1=1776560&r2=1776561&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBDSContext.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBDSContext.java
Fri Dec 30 13:27:08 2016
@@ -306,7 +306,7 @@ public class JAXBDSContext {
// Create an attachment unmarshaller
- AttachmentUnmarshaller aum = new
JAXBAttachmentUnmarshaller(createAttachmentContext(),
xopEncodedStream.getMimePartProvider());
+ AttachmentUnmarshaller aum = new
JAXBAttachmentUnmarshaller(createAttachmentContext(),
xopEncodedStream.getAttachmentAccessor());
if (aum != null) {
if (DEBUG_ENABLED) {
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/util/impl/SAAJConverterImpl.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/util/impl/SAAJConverterImpl.java?rev=1776561&r1=1776560&r2=1776561&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/util/impl/SAAJConverterImpl.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/util/impl/SAAJConverterImpl.java
Fri Dec 30 13:27:08 2016
@@ -141,7 +141,7 @@ public class SAAJConverterImpl implement
builder = OMXMLBuilderFactory.createSOAPModelBuilder(
OMAbstractFactory.getMetaFactory(),
new DOMSource(saajEnvelope),
- new AttachmentsMimePartProvider(attachments));
+ attachments);
} else {
// Get a SOAP OM Builder.
builder = OMXMLBuilderFactory.createSOAPModelBuilder(new
DOMSource(saajEnvelope));
Modified:
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/util/SAAJUtil.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/util/SAAJUtil.java?rev=1776561&r1=1776560&r2=1776561&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/util/SAAJUtil.java
(original)
+++
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/util/SAAJUtil.java
Fri Dec 30 13:27:08 2016
@@ -19,8 +19,8 @@
package org.apache.axis2.saaj.util;
-import org.apache.axiom.mime.MimePartProvider;
import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMAttachmentAccessor;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMXMLBuilderFactory;
import org.w3c.dom.Document;
@@ -36,7 +36,6 @@ import javax.xml.transform.stax.StAXSour
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import java.io.IOException;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
@@ -105,19 +104,14 @@ public class SAAJUtil {
}
}
OMElement docElem =
(OMElement)message.getSOAPPart().getDocumentElement();
- MimePartProvider mimePartProvider = new MimePartProvider() {
+ OMAttachmentAccessor attachmentAccessor = new OMAttachmentAccessor() {
@Override
- public DataHandler getDataHandler(String contentID) throws
IOException {
- DataHandler dh = attachments.get(contentID);
- if (dh == null) {
- throw new IOException("No attachment with content ID " +
contentID + " found");
- } else {
- return dh;
- }
+ public DataHandler getDataHandler(String contentID) {
+ return attachments.get(contentID);
}
};
return
OMXMLBuilderFactory.createSOAPModelBuilder(OMAbstractFactory.getMetaFactory(),
- new StAXSource(docElem.getXMLStreamReader()),
mimePartProvider).getSOAPEnvelope();
+ new StAXSource(docElem.getXMLStreamReader()),
attachmentAccessor).getSOAPEnvelope();
}
/**
