Author: veithen
Date: Sun Jun 12 20:09:44 2016
New Revision: 1748045
URL: http://svn.apache.org/viewvc?rev=1748045&view=rev
Log:
Use latest Axiom APIs where appropriate.
Modified:
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/TextImplEx.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/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=1748045&r1=1748044&r2=1748045&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
Sun Jun 12 20:09:44 2016
@@ -20,6 +20,7 @@
package org.apache.axis2.jaxws.message.util.impl;
import org.apache.axiom.attachments.Attachments;
+import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMXMLBuilderFactory;
@@ -29,11 +30,9 @@ import org.apache.axiom.om.util.StAXUtil
import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axiom.soap.SOAPModelBuilder;
-import org.apache.axiom.util.stax.xop.XOPDecodingStreamReader;
import org.apache.axis2.jaxws.ExceptionFactory;
import org.apache.axis2.jaxws.i18n.Messages;
import org.apache.axis2.jaxws.message.util.SAAJConverter;
-import org.apache.axis2.jaxws.message.util.SOAPElementReader;
import org.apache.axis2.jaxws.utility.JavaUtils;
import org.apache.axis2.jaxws.utility.SAAJFactory;
import org.apache.commons.logging.Log;
@@ -138,14 +137,16 @@ public class SAAJConverterImpl implement
// Before we do the conversion, we have to fix the QNames for fault
elements
_fixFaultElements(saajEnvelope);
- // Get a XMLStreamReader backed by a SOAPElement tree
- XMLStreamReader reader = new SOAPElementReader(saajEnvelope);
+ SOAPModelBuilder builder;
if (attachments != null) {
- reader = new XOPDecodingStreamReader(reader, new
AttachmentsMimePartProvider(attachments));
+ builder = OMXMLBuilderFactory.createSOAPModelBuilder(
+ OMAbstractFactory.getMetaFactory(),
+ new DOMSource(saajEnvelope),
+ new AttachmentsMimePartProvider(attachments));
+ } else {
+ // Get a SOAP OM Builder.
+ builder = OMXMLBuilderFactory.createSOAPModelBuilder(new
DOMSource(saajEnvelope));
}
-
- // Get a SOAP OM Builder.
- SOAPModelBuilder builder =
OMXMLBuilderFactory.createStAXSOAPModelBuilder(reader);
// Create and return the OM Envelope
org.apache.axiom.soap.SOAPEnvelope omEnvelope =
builder.getSOAPEnvelope();
@@ -207,10 +208,8 @@ public class SAAJConverterImpl implement
log.debug("The conversion occurs due to " +
JavaUtils.stackToString());
}
- // Get a XMLStreamReader backed by a SOAPElement tree
- XMLStreamReader reader = new SOAPElementReader(soapElement);
// Get a OM Builder.
- OMXMLParserWrapper builder =
OMXMLBuilderFactory.createStAXOMBuilder(reader);
+ OMXMLParserWrapper builder = OMXMLBuilderFactory.createOMBuilder(new
DOMSource(soapElement));
// Create and return the Element
OMElement om = builder.getDocumentElement();
// TODO The following statement expands the OM tree. This is
Modified:
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/TextImplEx.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/TextImplEx.java?rev=1748045&r1=1748044&r2=1748045&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/TextImplEx.java
(original)
+++
axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/TextImplEx.java
Sun Jun 12 20:09:44 2016
@@ -64,8 +64,7 @@ public class TextImplEx extends NodeImpl
}
public boolean isElementContentWhitespace() {
- // TODO - Fixme.
- throw new UnsupportedOperationException("TODO");
+ return ((org.w3c.dom.Text)target).isElementContentWhitespace();
}
public String getWholeText() {
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=1748045&r1=1748044&r2=1748045&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
Sun Jun 12 20:09:44 2016
@@ -23,7 +23,6 @@ import org.apache.axiom.mime.MimePartPro
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMXMLBuilderFactory;
-import org.apache.axiom.util.stax.xop.XOPDecodingStreamReader;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -33,6 +32,7 @@ import javax.xml.soap.AttachmentPart;
import javax.xml.soap.MimeHeader;
import javax.xml.soap.MimeHeaders;
import javax.xml.soap.SOAPException;
+import javax.xml.transform.stax.StAXSource;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -119,7 +119,8 @@ public class SAAJUtil {
}
}
};
- return OMXMLBuilderFactory.createStAXSOAPModelBuilder(new
XOPDecodingStreamReader(docElem.getXMLStreamReader(),
mimePartProvider)).getSOAPEnvelope();
+ return
OMXMLBuilderFactory.createSOAPModelBuilder(OMAbstractFactory.getMetaFactory(),
+ new StAXSource(docElem.getXMLStreamReader()),
mimePartProvider).getSOAPEnvelope();
}
/**
