Author: jleroux
Date: Tue Apr 5 06:57:54 2016
New Revision: 1737789
URL: http://svn.apache.org/viewvc?rev=1737789&view=rev
Log:
Partial improvement for "Remove from trunk the deprecated code if deprecated
before December 2014" https://issues.apache.org/jira/browse/OFBIZ-6273
Replaces the deprecated StAXSOAPModelBuilder(XMLStreamReader) and
StAXOMBuilder(reader) in SOAPEventHandler.java. I did not find how to test
though...
Modified:
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/SOAPEventHandler.java
Modified:
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/SOAPEventHandler.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/SOAPEventHandler.java?rev=1737789&r1=1737788&r2=1737789&view=diff
==============================================================================
---
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/SOAPEventHandler.java
(original)
+++
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/SOAPEventHandler.java
Tue Apr 5 06:57:54 2016
@@ -19,6 +19,7 @@
package org.ofbiz.webapp.event;
import java.io.IOException;
+import java.io.InputStream;
import java.io.OutputStream;
import java.io.StringReader;
import java.io.Writer;
@@ -37,12 +38,12 @@ import javax.xml.stream.XMLStreamReader;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMXMLBuilderFactory;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-import org.apache.axiom.om.util.StAXUtils;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
-import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
+import org.apache.axiom.soap.SOAPModelBuilder;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilGenerics;
import org.ofbiz.base.util.UtilProperties;
@@ -54,6 +55,7 @@ import org.ofbiz.service.LocalDispatcher
import org.ofbiz.service.ModelService;
import org.ofbiz.service.ServiceUtil;
import org.ofbiz.service.engine.SoapSerializer;
+import org.ofbiz.webapp.control.ConfigXMLReader;
import org.ofbiz.webapp.control.ConfigXMLReader.Event;
import org.ofbiz.webapp.control.ConfigXMLReader.RequestMap;
import org.ofbiz.webapp.control.RequestHandler;
@@ -150,8 +152,8 @@ public class SOAPEventHandler implements
// get the service name and parameters
try {
- XMLStreamReader xmlReader =
StAXUtils.createXMLStreamReader(request.getInputStream());
- StAXSOAPModelBuilder builder = new StAXSOAPModelBuilder(xmlReader);
+ InputStream inputStream = (InputStream) request.getInputStream();
+ SOAPModelBuilder builder = (SOAPModelBuilder)
OMXMLBuilderFactory.createSOAPModelBuilder(inputStream, "UTF-8");
reqEnv = (SOAPEnvelope) builder.getDocumentElement();
// log the request message
@@ -238,7 +240,7 @@ public class SOAPEventHandler implements
String xmlResults = SoapSerializer.serialize(serviceResults);
//Debug.logInfo("xmlResults ==================" + xmlResults,
module);
XMLStreamReader reader =
XMLInputFactory.newInstance().createXMLStreamReader(new
StringReader(xmlResults));
- StAXOMBuilder resultsBuilder = new StAXOMBuilder(reader);
+ StAXOMBuilder resultsBuilder = (StAXOMBuilder)
OMXMLBuilderFactory.createStAXOMBuilder(OMAbstractFactory.getOMFactory(),
reader);
OMElement resultSer = resultsBuilder.getDocumentElement();
// create the response soap
@@ -287,7 +289,7 @@ public class SOAPEventHandler implements
res.setContentType("text/xml");
String xmlResults= SoapSerializer.serialize(object);
XMLStreamReader xmlReader =
XMLInputFactory.newInstance().createXMLStreamReader(new
StringReader(xmlResults));
- StAXOMBuilder resultsBuilder = new StAXOMBuilder(xmlReader);
+ StAXOMBuilder resultsBuilder = (StAXOMBuilder)
OMXMLBuilderFactory.createStAXOMBuilder(OMAbstractFactory.getOMFactory(),
xmlReader);
OMElement resultSer = resultsBuilder.getDocumentElement();
// create the response soap
