You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2016/01/22 00:48:13 UTC

svn commit: r1726131 - in /axis/axis2/java/core/trunk/modules: adb/src/org/apache/axis2/databinding/utils/ adb/src/org/apache/axis2/rpc/receivers/ kernel/src/org/apache/axis2/builder/ kernel/src/org/apache/axis2/context/externalize/ metadata/src/org/ap...

Author: veithen
Date: Thu Jan 21 23:48:13 2016
New Revision: 1726131

URL: http://svn.apache.org/viewvc?rev=1726131&view=rev
Log:
Remove references to Axiom implementation classes.

Modified:
    axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
    axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/MultirefHelper.java
    axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/NamedStaxOMBuilder.java
    axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
    axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
    axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/externalize/MessageExternalizeUtils.java
    axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/util/SoapUtils.java
    axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPPartImpl.java
    axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/util/SAAJUtil.java
    axis/axis2/java/core/trunk/modules/transport/base/src/main/java/org/apache/axis2/transport/base/BaseUtils.java
    axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java
    axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java
    axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/AbstractTransportTest.java

Modified: axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java?rev=1726131&r1=1726130&r2=1726131&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java (original)
+++ axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/BeanUtil.java Thu Jan 21 23:48:13 2016
@@ -55,7 +55,6 @@ import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamReader;
 
 import org.apache.axiom.om.*;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
 import org.apache.axiom.util.base64.Base64Utils;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.classloader.BeanInfoCache;
@@ -1510,10 +1509,9 @@ public class BeanUtil {
                         entryQName, properties.toArray(), null,
                         typeTable, elementFormDefault);
 
-                StAXOMBuilder stAXOMBuilder = new StAXOMBuilder(
-                        OMAbstractFactory.getOMFactory(), new StreamWrapper(
-                                pullParser));
-                omEntry = stAXOMBuilder.getDocumentElement();
+                OMXMLParserWrapper builder = OMXMLBuilderFactory.createStAXOMBuilder(
+                        new StreamWrapper(pullParser));
+                omEntry = builder.getDocumentElement();
                 list.add(omEntry);
             }
         }
@@ -1823,9 +1821,9 @@ public class BeanUtil {
         XMLStreamReader pullParser = new ADBXMLStreamReaderImpl(eleQName, properties.toArray(), null, typeTable,
             elementFormDefault);
 
-        StAXOMBuilder stAXOMBuilder = new StAXOMBuilder(
-            OMAbstractFactory.getOMFactory(), new StreamWrapper(pullParser));
-        return stAXOMBuilder.getDocumentElement();
+        OMXMLParserWrapper builder = OMXMLBuilderFactory.createStAXOMBuilder(
+            new StreamWrapper(pullParser));
+        return builder.getDocumentElement();
     }
 
     /**

Modified: axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/MultirefHelper.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/MultirefHelper.java?rev=1726131&r1=1726130&r2=1726131&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/MultirefHelper.java (original)
+++ axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/MultirefHelper.java Thu Jan 21 23:48:13 2016
@@ -25,7 +25,7 @@ import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMFactory;
 import org.apache.axiom.om.OMNode;
 import org.apache.axiom.om.OMText;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
+import org.apache.axiom.om.OMXMLBuilderFactory;
 import org.apache.axiom.soap.SOAPBody;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axis2.AxisFault;
@@ -105,7 +105,7 @@ public class MultirefHelper {
     }
 
     private OMElement elementClone(OMElement ele) {
-        return new StAXOMBuilder(ele.getXMLStreamReader()).getDocumentElement();
+        return OMXMLBuilderFactory.createStAXOMBuilder(ele.getXMLStreamReader()).getDocumentElement();
     }
 
     public Object processRef(Class javatype, String id,

Modified: axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/NamedStaxOMBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/NamedStaxOMBuilder.java?rev=1726131&r1=1726130&r2=1726131&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/NamedStaxOMBuilder.java (original)
+++ axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/NamedStaxOMBuilder.java Thu Jan 21 23:48:13 2016
@@ -20,7 +20,8 @@
 package org.apache.axis2.databinding.utils;
 
 import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
+import org.apache.axiom.om.OMXMLBuilderFactory;
+import org.apache.axiom.om.OMXMLParserWrapper;
 
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamConstants;
@@ -28,8 +29,8 @@ import javax.xml.stream.XMLStreamReader;
 
 public class NamedStaxOMBuilder {
 
-    //wrap a StAXOMBuilder
-    private StAXOMBuilder builder;
+    //wrap an OMXMLParserWrapper
+    private OMXMLParserWrapper builder;
     private XMLStreamReader reader;
     private QName nameToMatch;
 
@@ -39,7 +40,7 @@ public class NamedStaxOMBuilder {
      */
     public NamedStaxOMBuilder(XMLStreamReader xmlStreamReader, QName nameToMatch) {
         reader = xmlStreamReader;
-        builder = new StAXOMBuilder(xmlStreamReader);
+        builder = OMXMLBuilderFactory.createStAXOMBuilder(xmlStreamReader);
         this.nameToMatch = nameToMatch;
     }
 

Modified: axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java?rev=1726131&r1=1726130&r2=1726131&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java (original)
+++ axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java Thu Jan 21 23:48:13 2016
@@ -25,8 +25,8 @@ package org.apache.axis2.rpc.receivers;
 
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
+import org.apache.axiom.om.OMXMLBuilderFactory;
+import org.apache.axiom.om.OMXMLParserWrapper;
 import org.apache.axiom.soap.SOAPBody;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFactory;
@@ -201,8 +201,8 @@ public class RPCMessageReceiver extends
                         QName innerElementQName = new QName(elementQName.getNamespaceURI(), getSimpleClassName(exceptionType));
                         XMLStreamReader xr = BeanUtil.getPullParser(cause,
                                 innerElementQName, typeTable, true, false);
-                        StAXOMBuilder stAXOMBuilder = new StAXOMBuilder(OMAbstractFactory.getOMFactory(), new StreamWrapper(xr));
-                        OMElement documentElement = stAXOMBuilder.getDocumentElement();
+                        OMXMLParserWrapper builder = OMXMLBuilderFactory.createStAXOMBuilder(new StreamWrapper(xr));
+                        OMElement documentElement = builder.getDocumentElement();
                         exceptionElement.addChild(documentElement);
                         }
                     }

Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java?rev=1726131&r1=1726130&r2=1726131&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java Thu Jan 21 23:48:13 2016
@@ -29,10 +29,7 @@ import org.apache.axiom.om.OMNamespace;
 import org.apache.axiom.om.OMText;
 import org.apache.axiom.om.OMXMLBuilderFactory;
 import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.impl.builder.StAXBuilder;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
 import org.apache.axiom.om.util.StAXParserConfiguration;
-import org.apache.axiom.om.util.StAXUtils;
 import org.apache.axiom.soap.SOAP11Constants;
 import org.apache.axiom.soap.SOAP12Constants;
 import org.apache.axiom.soap.SOAPBody;
@@ -41,7 +38,6 @@ import org.apache.axiom.soap.SOAPEnvelop
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPModelBuilder;
 import org.apache.axiom.soap.SOAPProcessingException;
-import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.Constants;
 import org.apache.axis2.context.MessageContext;
@@ -62,8 +58,6 @@ import org.apache.ws.commons.schema.*;
 
 import javax.activation.DataHandler;
 import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -259,22 +253,6 @@ public class BuilderUtil {
     }
 
     /**
-     * @deprecated Please use {@link #createPOXBuilder(InputStream, String)} to enable usage of non
-     *             standard Axiom implementations.
-     */
-    public static StAXBuilder getPOXBuilder(InputStream inStream, String charSetEnc)
-            throws XMLStreamException {
-        StAXBuilder builder;
-        // We use the StAXParserConfiguration.SOAP here as well because we don't want to allow
-        // document type declarations (that potentially reference external entities), even
-        // in plain XML messages.
-        XMLStreamReader xmlreader =
-                StAXUtils.createXMLStreamReader(StAXParserConfiguration.SOAP, inStream, charSetEnc);
-        builder = new StAXOMBuilder(xmlreader);
-        return builder;
-    }
-
-    /**
      * Create a builder suitable for an XML message. This method uses
      * {@link StAXParserConfiguration#SOAP} to disallow document type declarations (that potentially
      * reference external entities).
@@ -575,27 +553,6 @@ public class BuilderUtil {
     }
 
     /**
-     * Utility method to get a StAXBuilder
-     *
-     * @param in an InputStream
-     * @return a StAXSOAPModelBuilder for the given InputStream
-     * @throws XMLStreamException
-     * @deprecated If some one really need this method, please shout.
-     */
-    public static StAXBuilder getBuilder(Reader in) throws XMLStreamException {
-        XMLStreamReader xmlreader = StAXUtils.createXMLStreamReader(in);
-        return new StAXSOAPModelBuilder(xmlreader, null);
-    }
-
-    /**
-     * @deprecated Please use {@link OMXMLBuilderFactory#createOMBuilder(InputStream)} instead.
-     */
-    public static StAXBuilder getBuilder(InputStream inStream) throws XMLStreamException {
-        XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(inStream);
-        return new StAXOMBuilder(xmlReader);
-    }
-
-    /**
      * Create a SOAP model builder. This method delegates to
      * {@link OMXMLBuilderFactory#createSOAPModelBuilder(InputStream, String)} but generates
      * additional logging if an error occurs.
@@ -623,76 +580,6 @@ public class BuilderUtil {
     }
 
     /**
-     * @deprecated Please use {@link #createSOAPModelBuilder(InputStream, String)} to enable usage
-     *             of non standard Axiom implementations.
-     */
-    public static StAXBuilder getBuilder(InputStream inStream, String charSetEnc)
-            throws XMLStreamException {
-        XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(inStream, charSetEnc);
-        try {
-            return new StAXSOAPModelBuilder(xmlReader);
-        } catch (OMException e) {
-            log.info("OMException in getSOAPBuilder", e);
-            try {
-                log.info("Remaining input stream :[" +
-                         new String(IOUtils.toByteArray(inStream), charSetEnc) + "]");
-            } catch (IOException e1) {
-                // Nothing here?
-            }
-            throw e;
-        }
-    }
-
-    /**
-     * @deprecated Please use {@link #createSOAPModelBuilder(InputStream, String)} to enable usage
-     *             of non standard Axiom implementations.
-     */
-    public static StAXBuilder getSOAPBuilder(InputStream inStream) throws XMLStreamException {
-        XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(inStream);
-        try {
-            return new StAXSOAPModelBuilder(xmlReader);
-        } catch (OMException e) {
-            log.info("OMException in getSOAPBuilder", e);
-            try {
-                log.info("Remaining input stream :[" +
-                         new String(IOUtils.toByteArray(inStream)) + "]");
-            } catch (IOException e1) {
-                // Nothing here?
-            }
-            throw e;
-        }
-    }
-
-    /**
-     * @deprecated Please use {@link #createSOAPModelBuilder(InputStream, String)} to enable usage
-     *             of non standard Axiom implementations.
-     */
-    public static StAXBuilder getSOAPBuilder(InputStream inStream, String charSetEnc)
-            throws XMLStreamException {
-        XMLStreamReader xmlReader = StAXUtils.createXMLStreamReader(inStream, charSetEnc);
-        try {
-            return new StAXSOAPModelBuilder(xmlReader);
-        } catch (OMException e) {
-            log.info("OMException in getSOAPBuilder", e);
-            try {
-                log.info("Remaining input stream :[" +
-                         new String(IOUtils.toByteArray(inStream), charSetEnc) + "]");
-            } catch (IOException e1) {
-                // Nothing here?
-            }
-            throw e;
-        }
-    }
-
-    public static StAXBuilder getBuilder(SOAPFactory soapFactory, InputStream in, String charSetEnc)
-            throws XMLStreamException {
-        StAXBuilder builder;
-        XMLStreamReader xmlreader = StAXUtils.createXMLStreamReader(in, charSetEnc);
-        builder = new StAXOMBuilder(soapFactory, xmlreader);
-        return builder;
-    }
-
-    /**
      * Initial work for a builder selector which selects the builder for a given message format
      * based on the the content type of the recieved message. content-type to builder mapping can be
      * specified through the Axis2.xml.

Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/externalize/MessageExternalizeUtils.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/externalize/MessageExternalizeUtils.java?rev=1726131&r1=1726130&r2=1726131&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/externalize/MessageExternalizeUtils.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/externalize/MessageExternalizeUtils.java Thu Jan 21 23:48:13 2016
@@ -25,11 +25,8 @@ import org.apache.axiom.om.OMOutputForma
 import org.apache.axiom.om.OMXMLBuilderFactory;
 import org.apache.axiom.om.OMXMLParserWrapper;
 import org.apache.axiom.om.impl.MTOMConstants;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
 import org.apache.axiom.om.util.StAXParserConfiguration;
-import org.apache.axiom.om.util.StAXUtils;
 import org.apache.axiom.soap.SOAPEnvelope;
-import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.Constants;
 import org.apache.axis2.builder.BuilderUtil;
@@ -48,7 +45,6 @@ import java.io.OutputStream;
 
 import javax.xml.parsers.FactoryConfigurationError;
 import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
 
 /**
  * Utility to read/write the Message of a MessageContext
@@ -185,9 +181,6 @@ public class MessageExternalizeUtils  im
                 InputStream inStream, String contentTypeString,
                 boolean isSOAP)
             throws OMException, XMLStreamException, FactoryConfigurationError {
-        OMXMLParserWrapper builder = null;
-        XMLStreamReader streamReader;
-
         Attachments attachments = BuilderUtil.createAttachmentsMap(msgContext, inStream, contentTypeString);
         String charSetEncoding = BuilderUtil.getCharSetEncoding(attachments.getRootPartContentType());
 
@@ -198,41 +191,26 @@ public class MessageExternalizeUtils  im
         msgContext.setProperty(Constants.Configuration.CHARACTER_SET_ENCODING,
                                charSetEncoding);
 
-        streamReader = StAXUtils.createXMLStreamReader(attachments.getRootPartInputStream(), charSetEncoding);
-
         // Setting the Attachments map to new SwA API
         msgContext.setAttachmentMap(attachments);
 
-        String soapEnvelopeNamespaceURI = BuilderUtil.getEnvelopeNamespace(contentTypeString);
-
         if (isSOAP) {
             if (attachments.getAttachmentSpecType().equals(
                     MTOMConstants.MTOM_TYPE)) {
-                builder = OMXMLBuilderFactory.createSOAPModelBuilder(attachments);
-            } else if (attachments.getAttachmentSpecType().equals(
-                    MTOMConstants.SWA_TYPE)) {
-                builder = new StAXSOAPModelBuilder(streamReader,
-                        soapEnvelopeNamespaceURI);
-            } else if (attachments.getAttachmentSpecType().equals(
-                    MTOMConstants.SWA_TYPE_12)) {
-                builder = new StAXSOAPModelBuilder(streamReader,
-                        soapEnvelopeNamespaceURI);
+                return OMXMLBuilderFactory.createSOAPModelBuilder(attachments);
+            } else {
+                return OMXMLBuilderFactory.createSOAPModelBuilder(attachments.getRootPartInputStream(), charSetEncoding);
             }
 
         }
         // To handle REST XOP case
         else {
             if (attachments.getAttachmentSpecType().equals(MTOMConstants.MTOM_TYPE)) {
-                builder = OMXMLBuilderFactory.createOMBuilder(StAXParserConfiguration.DEFAULT, attachments);
-
-            } else if (attachments.getAttachmentSpecType().equals(MTOMConstants.SWA_TYPE)) {
-                builder = new StAXOMBuilder(streamReader);
-            } else if (attachments.getAttachmentSpecType().equals(MTOMConstants.SWA_TYPE_12)) {
-                builder = new StAXOMBuilder(streamReader);
+                return OMXMLBuilderFactory.createOMBuilder(StAXParserConfiguration.DEFAULT, attachments);
+            } else {
+                return OMXMLBuilderFactory.createOMBuilder(attachments.getRootPartInputStream(), charSetEncoding);
             }
         }
-
-        return builder;
     }
 
     /**

Modified: axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/util/SoapUtils.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/util/SoapUtils.java?rev=1726131&r1=1726130&r2=1726131&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/util/SoapUtils.java (original)
+++ axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/util/SoapUtils.java Thu Jan 21 23:48:13 2016
@@ -21,23 +21,15 @@ package org.apache.axis2.jaxws.util;
 
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
+import org.apache.axiom.om.OMXMLBuilderFactory;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFactory;
 
-import javax.xml.stream.XMLStreamReader;
-
 public class SoapUtils {
 
 
     public static OMElement getOMElement(SOAPEnvelope response) {
-        XMLStreamReader parser = response.getXMLStreamReader();
-
-        StAXOMBuilder builder =
-                new StAXOMBuilder(OMAbstractFactory.getOMFactory(), parser);
-
-        return builder.getDocumentElement();
-
+        return OMXMLBuilderFactory.createStAXOMBuilder(response.getXMLStreamReader()).getDocumentElement();
     }
 
     public static SOAPFactory getSoapFactory(String soapVersionURI) {

Modified: axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPPartImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPPartImpl.java?rev=1726131&r1=1726130&r2=1726131&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPPartImpl.java (original)
+++ axis/axis2/java/core/trunk/modules/saaj/src/org/apache/axis2/saaj/SOAPPartImpl.java Thu Jan 21 23:48:13 2016
@@ -25,12 +25,8 @@ import org.apache.axiom.mime.MediaType;
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMXMLBuilderFactory;
-import org.apache.axiom.om.util.StAXUtils;
-import org.apache.axiom.soap.SOAP11Constants;
-import org.apache.axiom.soap.SOAP12Constants;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPModelBuilder;
-import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
 import org.apache.axis2.saaj.util.IDGenerator;
 import org.apache.axis2.saaj.util.SAAJUtil;
 import org.apache.axis2.transport.http.HTTPConstants;
@@ -61,7 +57,6 @@ import javax.xml.soap.SOAPException;
 import javax.xml.soap.SOAPMessage;
 import javax.xml.soap.SOAPPart;
 import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.transform.Result;
 import javax.xml.transform.Source;
@@ -139,14 +134,12 @@ public class SOAPPartImpl extends SOAPPa
 
         String charset;
         boolean isMTOM;
-        String soapEnvelopeNamespaceURI;
         OMMetaFactory metaFactory = OMAbstractFactory.getMetaFactory(OMAbstractFactory.FEATURE_DOM);
         SOAPFactory soapFactory;
         if (contentType == null) {
             charset = null;
             isMTOM = false;
-            soapFactory = metaFactory.getSOAP11Factory();
-            soapEnvelopeNamespaceURI = null;
+            soapFactory = null;
         } else {
             MediaType baseType = contentType.getMediaType();
             MediaType soapContentType;
@@ -168,10 +161,8 @@ public class SOAPPartImpl extends SOAPPa
             }
             
             if (soapContentType.equals(MediaType.TEXT_XML)) {
-                soapEnvelopeNamespaceURI = SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI;
                 soapFactory = metaFactory.getSOAP11Factory();
             } else if (soapContentType.equals(MediaType.APPLICATION_SOAP_XML)) {
-                soapEnvelopeNamespaceURI = SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI;
                 soapFactory = metaFactory.getSOAP12Factory();
             } else {
                 throw new SOAPException("Unrecognized content type '" + soapContentType + "'");
@@ -180,28 +171,18 @@ public class SOAPPartImpl extends SOAPPa
             charset = contentType.getParameter("charset");
         }
         
-        XMLStreamReader streamReader;
-        try {
-            if (charset != null) {
-            	streamReader = StAXUtils.createXMLStreamReader(inputStream, charset);
-            } else {
-            	streamReader = StAXUtils.createXMLStreamReader(inputStream);                	
-            }
-        } catch (XMLStreamException e) {
-            throw new SOAPException(e);
-        }
-
         SOAPModelBuilder builder;
         if (isMTOM && attachments != null) {
-            builder = OMXMLBuilderFactory.createSOAPModelBuilder(attachments);
+            builder = OMXMLBuilderFactory.createSOAPModelBuilder(metaFactory, attachments);
         } else {
-            builder = new StAXSOAPModelBuilder(streamReader,
-                                               soapFactory,
-                                               soapEnvelopeNamespaceURI);
+            builder = OMXMLBuilderFactory.createSOAPModelBuilder(metaFactory, inputStream, charset);
         }
         
         try {
             org.apache.axiom.soap.SOAPEnvelope soapEnvelope = builder.getSOAPEnvelope();
+            if (soapFactory != null && soapEnvelope.getOMFactory() != soapFactory) {
+                throw new SOAPException("SOAP version of message doesn't match Content-Type");
+            }
             envelope = new SOAPEnvelopeImpl(soapEnvelope);
             envelope.omTarget.build();
             this.document = envelope.getOwnerDocument();
@@ -351,9 +332,8 @@ public class SOAPPartImpl extends SOAPPa
                 reader = inputFactory.createXMLStreamReader(is);
             }
 
-            StAXSOAPModelBuilder builder1 = new StAXSOAPModelBuilder(reader,
-                                                (SOAPFactory)this.envelope.omTarget
-                                                        .getOMFactory(), null);
+            SOAPModelBuilder builder1 = OMXMLBuilderFactory.createStAXSOAPModelBuilder(
+                    envelope.omTarget.getOMFactory().getMetaFactory(), reader);
 
             envelope = new SOAPEnvelopeImpl(builder1.getSOAPEnvelope());
             envelope.omTarget.build();

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=1726131&r1=1726130&r2=1726131&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 Thu Jan 21 23:48:13 2016
@@ -21,13 +21,7 @@ package org.apache.axis2.saaj.util;
 
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMXMLBuilderFactory;
-import org.apache.axiom.soap.SOAP11Constants;
-import org.apache.axiom.soap.SOAP12Constants;
-import org.apache.axiom.soap.SOAPEnvelope;
-import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
 import org.apache.axiom.util.stax.xop.MimePartProvider;
 import org.apache.axiom.util.stax.xop.XOPDecodingStreamReader;
 import org.w3c.dom.Document;
@@ -57,28 +51,9 @@ public class SAAJUtil {
      * @return the DOM Document of the given SOAP Envelope
      */
     public static Document getDocumentFromSOAPEnvelope(org.apache.axiom.soap.SOAPEnvelope env) {
-        env.build();
-
-        //Check the namespace and find SOAP version and factory
-        String nsURI;
-        OMMetaFactory metaFactory = OMAbstractFactory.getMetaFactory(OMAbstractFactory.FEATURE_DOM);
-        SOAPFactory factory;
-        if (env.getNamespace().getNamespaceURI()
-                .equals(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI)) {
-            nsURI = SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI;
-            factory = metaFactory.getSOAP11Factory();
-        } else {
-            nsURI = SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI;
-            factory = metaFactory.getSOAP12Factory();
-        }
-
-        StAXSOAPModelBuilder stAXSOAPModelBuilder =
-                new StAXSOAPModelBuilder(env.getXMLStreamReader(), factory, nsURI);
-        SOAPEnvelope envelope = (stAXSOAPModelBuilder).getSOAPEnvelope();
-        envelope.build();
-
-        Element envElem = (Element)envelope;
-        return envElem.getOwnerDocument();
+        return (Document)OMXMLBuilderFactory.createStAXSOAPModelBuilder(
+                OMAbstractFactory.getMetaFactory(OMAbstractFactory.FEATURE_DOM),
+                env.getXMLStreamReader()).getSOAPMessage();
     }
 
     /**
@@ -88,46 +63,20 @@ public class SAAJUtil {
      * @return the org.apache.axis2.soap.impl.dom.SOAPEnvelopeImpl of the given SOAP Envelope
      */
     public static Element toDOOMSOAPEnvelope(org.apache.axiom.soap.SOAPEnvelope env) {
-        env.build();
-
-        //Check the namespace and find SOAP version and factory
-        String nsURI;
-        OMMetaFactory metaFactory = OMAbstractFactory.getMetaFactory(OMAbstractFactory.FEATURE_DOM);
-        SOAPFactory factory;
-        if (env.getNamespace().getNamespaceURI()
-                .equals(SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI)) {
-            nsURI = SOAP11Constants.SOAP_ENVELOPE_NAMESPACE_URI;
-            factory = metaFactory.getSOAP11Factory();
-        } else {
-            nsURI = SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI;
-            factory = metaFactory.getSOAP11Factory();
-        }
-
-        StAXSOAPModelBuilder stAXSOAPModelBuilder =
-                new StAXSOAPModelBuilder(env.getXMLStreamReader(), factory, nsURI);
-        SOAPEnvelope envelope = (stAXSOAPModelBuilder).getSOAPEnvelope();
-        envelope.build();
-
-        return (Element)envelope;
+        return (Element)OMXMLBuilderFactory.createStAXSOAPModelBuilder(
+                OMAbstractFactory.getMetaFactory(OMAbstractFactory.FEATURE_DOM),
+                env.getXMLStreamReader()).getSOAPEnvelope();
     }
 
     public static org.apache.axiom.soap.SOAPEnvelope
             getSOAPEnvelopeFromDOOMDocument(org.w3c.dom.Document doc) {
-
-        OMElement docElem = (OMElement)doc.getDocumentElement();
-        StAXSOAPModelBuilder stAXSOAPModelBuilder =
-                new StAXSOAPModelBuilder(docElem.getXMLStreamReader(), null);
-        return stAXSOAPModelBuilder.getSOAPEnvelope();
+        return OMXMLBuilderFactory.createStAXSOAPModelBuilder(((OMElement)doc.getDocumentElement()).getXMLStreamReader()).getSOAPEnvelope();
     }
 
 
     public static org.apache.axiom.soap.SOAPEnvelope
             toOMSOAPEnvelope(org.w3c.dom.Element elem) {
-
-        OMElement docElem = (OMElement)elem;
-        StAXSOAPModelBuilder stAXSOAPModelBuilder =
-                new StAXSOAPModelBuilder(docElem.getXMLStreamReader(), null);
-        return stAXSOAPModelBuilder.getSOAPEnvelope();
+        return OMXMLBuilderFactory.createStAXSOAPModelBuilder(((OMElement)elem).getXMLStreamReader()).getSOAPEnvelope();
     }
     
     /**

Modified: axis/axis2/java/core/trunk/modules/transport/base/src/main/java/org/apache/axis2/transport/base/BaseUtils.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/base/src/main/java/org/apache/axis2/transport/base/BaseUtils.java?rev=1726131&r1=1726130&r2=1726131&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/base/src/main/java/org/apache/axis2/transport/base/BaseUtils.java (original)
+++ axis/axis2/java/core/trunk/modules/transport/base/src/main/java/org/apache/axis2/transport/base/BaseUtils.java Thu Jan 21 23:48:13 2016
@@ -21,10 +21,6 @@ package org.apache.axis2.transport.base;
 
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMOutputFormat;
-import org.apache.axiom.om.impl.builder.StAXBuilder;
-import org.apache.axiom.om.util.StAXUtils;
-import org.apache.axiom.soap.SOAPEnvelope;
-import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.Constants;
 import org.apache.axis2.context.MessageContext;
@@ -39,8 +35,6 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -96,24 +90,6 @@ public class BaseUtils {
     }
 
     /**
-     * Create a SOAP envelope using SOAP 1.1 or 1.2 depending on the namespace
-     * @param in InputStream for the payload
-     * @param namespace the SOAP namespace
-     * @return the SOAP envelope for the correct version
-     * @throws javax.xml.stream.XMLStreamException on error
-     */
-    public static SOAPEnvelope getEnvelope(InputStream in, String namespace) throws XMLStreamException {
-
-        try {
-            in.reset();
-        } catch (IOException ignore) {}
-        XMLStreamReader xmlreader =
-            StAXUtils.createXMLStreamReader(in, MessageContext.DEFAULT_CHAR_SET_ENCODING);
-        StAXBuilder builder = new StAXSOAPModelBuilder(xmlreader, namespace);
-        return (SOAPEnvelope) builder.getDocumentElement();
-    }
-
-    /**
      * Get the OMOutput format for the given message
      * @param msgContext the axis message context
      * @return the OMOutput format to be used

Modified: axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java?rev=1726131&r1=1726130&r2=1726131&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java (original)
+++ axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java Thu Jan 21 23:48:13 2016
@@ -20,13 +20,12 @@
 
 package org.apache.axis2.transport.local;
 
-import org.apache.axiom.om.OMXMLParserWrapper;
+import org.apache.axiom.om.OMXMLBuilderFactory;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.Constants;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.addressing.RelatesTo;
-import org.apache.axis2.builder.BuilderUtil;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.description.TransportOutDescription;
@@ -39,7 +38,6 @@ import org.apache.axis2.wsdl.WSDLConstan
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import javax.xml.stream.XMLStreamException;
 import java.io.*;
 import java.util.Map;
 
@@ -217,14 +215,6 @@ public class LocalResponder extends Abst
 
         ByteArrayInputStream bs = new ByteArrayInputStream(out.toByteArray());
         InputStreamReader streamReader = new InputStreamReader(bs);
-        OMXMLParserWrapper builder;
-
-        try {
-            builder = BuilderUtil.getBuilder(streamReader);
-        } catch (XMLStreamException e) {
-            throw AxisFault.makeFault(e);
-        }
-
-        return (SOAPEnvelope) builder.getDocumentElement();
+        return OMXMLBuilderFactory.createSOAPModelBuilder(streamReader).getSOAPEnvelope();
     }
 }

Modified: axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java?rev=1726131&r1=1726130&r2=1726131&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java (original)
+++ axis/axis2/java/core/trunk/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java Thu Jan 21 23:48:13 2016
@@ -20,12 +20,11 @@
 
 package org.apache.axis2.transport.local;
 
-import org.apache.axiom.om.OMXMLParserWrapper;
+import org.apache.axiom.om.OMXMLBuilderFactory;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.Constants;
 import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.builder.BuilderUtil;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.context.SessionContext;
@@ -38,7 +37,6 @@ import org.apache.axis2.util.MessageCont
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import javax.xml.stream.XMLStreamException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
@@ -144,13 +142,7 @@ public class LocalTransportReceiver impl
             msgCtx.setServerSide(true);
 
             InputStreamReader streamReader = new InputStreamReader(in);
-            OMXMLParserWrapper builder;
-            try {
-                builder = BuilderUtil.getBuilder(streamReader);
-            } catch (XMLStreamException e) {
-                throw AxisFault.makeFault(e);
-            }
-            SOAPEnvelope envelope = (SOAPEnvelope) builder.getDocumentElement();
+            SOAPEnvelope envelope = OMXMLBuilderFactory.createSOAPModelBuilder(streamReader).getSOAPEnvelope();
 
             msgCtx.setEnvelope(envelope);
 

Modified: axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/AbstractTransportTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/AbstractTransportTest.java?rev=1726131&r1=1726130&r2=1726131&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/AbstractTransportTest.java (original)
+++ axis/axis2/java/core/trunk/modules/transport/testkit/src/main/java/org/apache/axis2/transport/AbstractTransportTest.java Thu Jan 21 23:48:13 2016
@@ -27,8 +27,8 @@ import org.apache.axiom.om.OMAbstractFac
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMFactory;
 import org.apache.axiom.om.OMNamespace;
+import org.apache.axiom.om.OMXMLBuilderFactory;
 import org.apache.axiom.soap.SOAPEnvelope;
-import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.transport.UtilsTransportServer;
@@ -89,7 +89,7 @@ public abstract class AbstractTransportT
     }
     
     protected void assertSOAPEchoResponse(String textValue, XMLStreamReader reader) {
-        SOAPEnvelope env = new StAXSOAPModelBuilder(reader).getSOAPEnvelope();
+        SOAPEnvelope env = OMXMLBuilderFactory.createStAXSOAPModelBuilder(reader).getSOAPEnvelope();
         assertEchoResponse(textValue, env.getBody().getFirstElement());
     }