Author: veithen
Date: Sat Dec 4 13:19:54 2010
New Revision: 1042168
URL: http://svn.apache.org/viewvc?rev=1042168&view=rev
Log:
Replaced a couple of references to Axiom implementation classes by using the
API introduced in AXIOM-353. This should bring us a little bit closer to
solving AXIS2-4902.
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/ConverterUtil.java
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java
axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/utils/MultirefHelperTest.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/EndpointReference.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/EndpointReferenceHelper.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/dataretrieval/DataRetrievalUtil.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/Parameter.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=1042168&r1=1042167&r2=1042168&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
Sat Dec 4 13:19:54 2010
@@ -21,8 +21,6 @@ package org.apache.axis2.databinding.uti
import org.apache.axiom.om.*;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-import org.apache.axiom.om.impl.llom.factory.OMXMLBuilderFactory;
import org.apache.axiom.om.util.Base64;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
@@ -886,7 +884,7 @@ public class BeanUtil {
new ADBXMLStreamReaderImpl(opName, objects.toArray(), null,
typeTable, qualifed);
StreamWrapper parser = new StreamWrapper(xr);
- StAXOMBuilder stAXOMBuilder =
+ OMXMLParserWrapper stAXOMBuilder =
OMXMLBuilderFactory.createStAXOMBuilder(
OMAbstractFactory.getSOAP11Factory(), parser);
return stAXOMBuilder.getDocumentElement();
Modified:
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java?rev=1042168&r1=1042167&r2=1042168&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
(original)
+++
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
Sat Dec 4 13:19:54 2010
@@ -21,11 +21,9 @@ package org.apache.axis2.databinding.uti
import org.apache.axiom.attachments.ByteArrayDataSource;
import org.apache.axiom.attachments.utils.IOUtils;
-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.util.AXIOMUtil;
import org.apache.axiom.om.util.Base64;
-import org.apache.axiom.om.util.StAXUtils;
import org.apache.axiom.util.stax.XMLStreamReaderUtils;
import org.apache.axiom.util.stax.XMLStreamWriterUtils;
import org.apache.axis2.databinding.ADBBean;
@@ -70,7 +68,6 @@ import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
-import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Array;
@@ -471,10 +468,7 @@ public class ConverterUtil {
public static OMElement convertToAnyType(String s) {
try {
- XMLStreamReader r = StAXUtils.createXMLStreamReader(
- new ByteArrayInputStream(s.getBytes()));
- StAXOMBuilder builder = new
StAXOMBuilder(OMAbstractFactory.getOMFactory(), r);
- return builder.getDocumentElement();
+ return AXIOMUtil.stringToOM(s);
} catch (XMLStreamException e) {
return null;
}
Modified:
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java?rev=1042168&r1=1042167&r2=1042168&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java
(original)
+++
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/rpc/receivers/RPCUtil.java
Sat Dec 4 13:19:54 2010
@@ -23,8 +23,8 @@ import org.apache.axiom.om.OMAbstractFac
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMText;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-import org.apache.axiom.om.impl.llom.factory.OMXMLBuilderFactory;
+import org.apache.axiom.om.OMXMLBuilderFactory;
+import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.om.util.Base64;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
@@ -97,7 +97,7 @@ public class RPCUtil {
}
XMLStreamReader xr = BeanUtil.getPullParser(resObject,
returnWrapper, typeTable, qualified, false);
- StAXOMBuilder stAXOMBuilder =
+ OMXMLParserWrapper stAXOMBuilder =
OMXMLBuilderFactory.createStAXOMBuilder(
OMAbstractFactory.getOMFactory(), new
StreamWrapper(xr));
OMElement documentElement = stAXOMBuilder.getDocumentElement();
@@ -133,7 +133,7 @@ public class RPCUtil {
QName returnWrapper = new QName(ns.getNamespaceURI(), partName,
ns.getPrefix());
XMLStreamReader xr = BeanUtil.getPullParser(resObject,
returnWrapper, typeTable, qualified, true);
- StAXOMBuilder stAXOMBuilder =
+ OMXMLParserWrapper stAXOMBuilder =
OMXMLBuilderFactory.createStAXOMBuilder(
OMAbstractFactory.getOMFactory(), new
StreamWrapper(xr));
OMElement documentElement = stAXOMBuilder.getDocumentElement();
@@ -344,7 +344,7 @@ public class RPCUtil {
}
XMLStreamReader xr = new NullXMLStreamReader(resName);
StreamWrapper parser = new StreamWrapper(xr);
- StAXOMBuilder stAXOMBuilder =
+ OMXMLParserWrapper stAXOMBuilder =
OMXMLBuilderFactory.createStAXOMBuilder(
OMAbstractFactory.getSOAP11Factory(), parser);
envelope.getBody().addChild(stAXOMBuilder.getDocumentElement());
@@ -372,7 +372,7 @@ public class RPCUtil {
}
XMLStreamReader xr = new NullXMLStreamReader(resName);
StreamWrapper parser = new StreamWrapper(xr);
- StAXOMBuilder stAXOMBuilder =
+ OMXMLParserWrapper stAXOMBuilder =
OMXMLBuilderFactory.createStAXOMBuilder(
OMAbstractFactory.getSOAP11Factory(), parser);
ns = fac.createOMNamespace(service.getSchemaTargetNamespace(),
Modified:
axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/utils/MultirefHelperTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/utils/MultirefHelperTest.java?rev=1042168&r1=1042167&r2=1042168&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/utils/MultirefHelperTest.java
(original)
+++
axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/utils/MultirefHelperTest.java
Sat Dec 4 13:19:54 2010
@@ -22,15 +22,12 @@ package org.apache.axis2.databinding.uti
import junit.framework.TestCase;
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.util.StAXUtils;
+import org.apache.axiom.om.util.AXIOMUtil;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axis2.AxisFault;
import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import java.io.ByteArrayInputStream;
import java.util.Iterator;
@@ -102,10 +99,7 @@ public class MultirefHelperTest extends
private void testProcessHrefAttributes(String bodyElement){
try {
- XMLStreamReader xmlReader =
- StAXUtils.createXMLStreamReader(new
ByteArrayInputStream(bodyElement.getBytes()));
- StAXOMBuilder stAXOMBuilder = new StAXOMBuilder(xmlReader);
- OMElement generatedElement = stAXOMBuilder.getDocumentElement();
+ OMElement generatedElement = AXIOMUtil.stringToOM(bodyElement);
SOAPFactory soapFactory = OMAbstractFactory.getSOAP11Factory();
SOAPEnvelope soapEnvelope = soapFactory.getDefaultEnvelope();
OMElement omElement = null;
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/EndpointReference.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/EndpointReference.java?rev=1042168&r1=1042167&r2=1042168&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/EndpointReference.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/EndpointReference.java
Sat Dec 4 13:19:54 2010
@@ -26,8 +26,7 @@ import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMNode;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-import org.apache.axiom.om.util.StAXUtils;
+import org.apache.axiom.om.OMXMLBuilderFactory;
import org.apache.axiom.util.UIDGenerator;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.externalize.ExternalizeConstants;
@@ -760,9 +759,7 @@ public class EndpointReference implement
XMLStreamReader xmlReader = null;
try {
- xmlReader = StAXUtils.createXMLStreamReader(bais);
- StAXOMBuilder builder = new StAXOMBuilder(xmlReader);
- OMElement om = builder.getDocumentElement();
+ OMElement om =
OMXMLBuilderFactory.createOMBuilder(bais).getDocumentElement();
// expand the OM so we can close the stream reader
om.build();
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/EndpointReferenceHelper.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/EndpointReferenceHelper.java?rev=1042168&r1=1042167&r2=1042168&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/EndpointReferenceHelper.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/addressing/EndpointReferenceHelper.java
Sat Dec 4 13:19:54 2010
@@ -24,7 +24,7 @@ import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMNode;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
+import org.apache.axiom.om.util.AXIOMUtil;
import org.apache.axiom.om.util.AttributeHelper;
import org.apache.axiom.om.util.ElementHelper;
import org.apache.axiom.soap.SOAPFactory;
@@ -37,7 +37,6 @@ import org.apache.commons.logging.LogFac
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
-import java.io.ByteArrayInputStream;
import java.util.ArrayList;
import java.util.IdentityHashMap;
import java.util.Iterator;
@@ -154,8 +153,7 @@ public class EndpointReferenceHelper {
*/
public static EndpointReference fromString(String eprString) throws
AxisFault {
try {
- return fromOM(new StAXOMBuilder(
- new
ByteArrayInputStream(eprString.getBytes())).getDocumentElement());
+ return fromOM(AXIOMUtil.stringToOM(eprString));
} catch (XMLStreamException e) {
throw AxisFault.makeFault(e);
}
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/dataretrieval/DataRetrievalUtil.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/dataretrieval/DataRetrievalUtil.java?rev=1042168&r1=1042167&r2=1042168&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/dataretrieval/DataRetrievalUtil.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/dataretrieval/DataRetrievalUtil.java
Sat Dec 4 13:19:54 2010
@@ -19,17 +19,13 @@
package org.apache.axis2.dataretrieval;
-import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
-import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-import org.apache.axiom.om.util.StAXUtils;
+import org.apache.axiom.om.OMXMLBuilderFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
import java.io.InputStream;
public class DataRetrievalUtil {
@@ -80,11 +76,7 @@ public class DataRetrievalUtil {
throws XMLStreamException, OMException{
OMElement element = null;
- XMLStreamReader xmlReader = StAXUtils
- .createXMLStreamReader(servicexmlStream);
- OMFactory fac = OMAbstractFactory.getOMFactory();
- StAXOMBuilder staxOMBuilder = new StAXOMBuilder(fac, xmlReader);
- element = staxOMBuilder.getDocumentElement();
+ element =
OMXMLBuilderFactory.createOMBuilder(servicexmlStream).getDocumentElement();
element.build();
return element;
}
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/Parameter.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/Parameter.java?rev=1042168&r1=1042167&r2=1042168&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/Parameter.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/Parameter.java
Sat Dec 4 13:19:54 2010
@@ -19,9 +19,8 @@
package org.apache.axis2.description;
-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.util.AXIOMUtil;
import org.apache.axis2.context.externalize.ExternalizeConstants;
import org.apache.axis2.context.externalize.SafeObjectInputStream;
import org.apache.axis2.context.externalize.SafeObjectOutputStream;
@@ -29,9 +28,6 @@ import org.apache.axis2.context.external
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-import java.io.ByteArrayInputStream;
import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
@@ -376,14 +372,7 @@ public class Parameter implements Extern
// convert to an OMElement
if (tmp != null) {
try {
- ByteArrayInputStream bais = new
ByteArrayInputStream(tmp.getBytes());
-
- XMLStreamReader parser =
XMLInputFactory.newInstance().createXMLStreamReader(bais);
-
- // TODO: the StAXOMBuilder is an impl class - is there a
better mechanism rather than an impl class ?
- StAXOMBuilder builder = new
StAXOMBuilder(OMAbstractFactory.getOMFactory(), parser);
-
- OMElement docElement = builder.getDocumentElement();
+ OMElement docElement = AXIOMUtil.stringToOM(tmp);
if (docElement != null) {
parameterElement = docElement;
