svn commit: r1187875 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/externalize/MessageExternalizeUtils.java

[veithen]

Author: veithen
Date: Sun Oct 23 12:19:54 2011
New Revision: 1187875

URL: http://svn.apache.org/viewvc?rev=1187875&view=rev
Log:
Use the new OMXMLBuilderFactory API instead of creating a builder directly.

Modified:
    
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/externalize/MessageExternalizeUtils.java

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=1187875&r1=1187874&r2=1187875&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
 Sun Oct 23 12:19:54 2011
@@ -20,10 +20,9 @@
 package org.apache.axis2.context.externalize;
 
 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.om.OMXMLBuilderFactory;
+import org.apache.axiom.om.OMXMLParserWrapper;
 import org.apache.axiom.soap.SOAPEnvelope;
-import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.builder.BuilderUtil;
 import org.apache.axis2.context.MessageContext;
@@ -32,7 +31,6 @@ import org.apache.axis2.transport.Transp
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import javax.xml.stream.XMLStreamReader;
 import java.io.BufferedOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -229,7 +227,7 @@ public class MessageExternalizeUtils  im
         }
         
         MessageInputStream mis = new MessageInputStream(in);
-        StAXBuilder  builder = null;
+        OMXMLParserWrapper builder = null;
         try {
             if (optimized) {
                 boolean isSOAP = true;
@@ -241,8 +239,7 @@ public class MessageExternalizeUtils  im
                 envelope = (SOAPEnvelope) builder.getDocumentElement();
                 envelope.buildWithAttachments();
             } else {
-                XMLStreamReader xmlreader = 
StAXUtils.createXMLStreamReader(mis, charSetEnc);
-                builder = new StAXSOAPModelBuilder(xmlreader, namespaceURI);
+                builder = OMXMLBuilderFactory.createSOAPModelBuilder(mis, 
charSetEnc);
                 envelope = (SOAPEnvelope) builder.getDocumentElement();
                 envelope.build();
             }