You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2006/05/02 05:38:59 UTC
svn commit: r398793 [2/2] - in /webservices/axis2/trunk/java/modules:
adb/src/org/apache/axis2/databinding/utils/
adb/test/org/apache/axis2/databinding/
adb/test/org/apache/axis2/databinding/utils/
adb/test/org/apache/axis2/databinding/utils/reader/ ad...
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java?rev=398793&r1=398792&r2=398793&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPEchoRawXMLTest.java Mon May 1 20:38:53 2006
@@ -22,6 +22,7 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
+import org.apache.axiom.om.util.StAXUtils;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axis2.AxisFault;
@@ -114,7 +115,7 @@
Callback callback = new Callback() {
public void onComplete(AsyncResult result) {
try {
- result.getResponseEnvelope().serialize(XMLOutputFactory.newInstance()
+ result.getResponseEnvelope().serialize(StAXUtils
.createXMLStreamWriter(System.out));
} catch (XMLStreamException e) {
onError(e);
@@ -158,7 +159,7 @@
sender.setOptions(options);
OMElement result = sender.sendReceive(operationName, payload);
- result.serialize(XMLOutputFactory.newInstance().createXMLStreamWriter(
+ result.serialize(StAXUtils.createXMLStreamWriter(
System.out));
sender.finalizeInvoke();
}
@@ -182,7 +183,7 @@
sender.setOptions(options);
OMElement result = sender.sendReceive(operationName, payloadElement);
- result.serialize(XMLOutputFactory.newInstance().createXMLStreamWriter(
+ result.serialize(StAXUtils.createXMLStreamWriter(
System.out));
sender.finalizeInvoke();
@@ -225,7 +226,7 @@
MessageContext response = opClient.getMessageContext(WSDLConstants.MESSAGE_LABEL_IN_VALUE);
SOAPEnvelope env = response.getEnvelope();
assertNotNull(env);
- env.getBody().serialize(XMLOutputFactory.newInstance().createXMLStreamWriter(
+ env.getBody().serialize(StAXUtils.createXMLStreamWriter(
System.out));
sender.finalizeInvoke();
}
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPTwoChannelEchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPTwoChannelEchoRawXMLTest.java?rev=398793&r1=398792&r2=398793&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPTwoChannelEchoRawXMLTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/tcp/TCPTwoChannelEchoRawXMLTest.java Mon May 1 20:38:53 2006
@@ -22,6 +22,7 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
+import org.apache.axiom.om.util.StAXUtils;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
import org.apache.axis2.addressing.EndpointReference;
@@ -101,7 +102,7 @@
Callback callback = new Callback() {
public void onComplete(AsyncResult result) {
try {
- result.getResponseEnvelope().serializeAndConsume(XMLOutputFactory.newInstance()
+ result.getResponseEnvelope().serializeAndConsume(StAXUtils
.createXMLStreamWriter(System.out));
} catch (XMLStreamException e) {
onError(e);
Modified: webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2OMBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2OMBuilder.java?rev=398793&r1=398792&r2=398793&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2OMBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2OMBuilder.java Mon May 1 20:38:53 2006
@@ -16,6 +16,7 @@
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMNode;
+import org.apache.axiom.om.util.StAXUtils;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.ws.commons.schema.XmlSchema;
import org.apache.ws.commons.schema.XmlSchemaObject;
@@ -152,7 +153,7 @@
writer.write("<xmlSchemas>");
writeSchemas(writer);
writer.write("</xmlSchemas>");
- XMLStreamReader xmlReader = XMLInputFactory.newInstance()
+ XMLStreamReader xmlReader = StAXUtils
.createXMLStreamReader(
new ByteArrayInputStream(writer.toString().getBytes()));
Modified: webservices/axis2/trunk/java/modules/jibx/src/org/apache/axis2/jibx/JiBXDataSource.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/jibx/src/org/apache/axis2/jibx/JiBXDataSource.java?rev=398793&r1=398792&r2=398793&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jibx/src/org/apache/axis2/jibx/JiBXDataSource.java (original)
+++ webservices/axis2/trunk/java/modules/jibx/src/org/apache/axis2/jibx/JiBXDataSource.java Mon May 1 20:38:53 2006
@@ -27,6 +27,7 @@
import org.apache.axiom.om.OMDataSource;
import org.apache.axiom.om.OMOutputFormat;
+import org.apache.axiom.om.util.StAXUtils;
import org.jibx.runtime.IBindingFactory;
import org.jibx.runtime.IMarshallable;
import org.jibx.runtime.IMarshallingContext;
@@ -103,7 +104,6 @@
public XMLStreamReader getReader() throws XMLStreamException {
ByteArrayOutputStream bos = new ByteArrayOutputStream();
serialize(bos, null);
- XMLInputFactory inputFactory = XMLInputFactory.newInstance();
- return inputFactory.createXMLStreamReader(new ByteArrayInputStream(bos.toByteArray()));
+ return StAXUtils.createXMLStreamReader(new ByteArrayInputStream(bos.toByteArray()));
}
}
Modified: webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPPartImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPPartImpl.java?rev=398793&r1=398792&r2=398793&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPPartImpl.java (original)
+++ webservices/axis2/trunk/java/modules/saaj/src/org/apache/axis2/saaj/SOAPPartImpl.java Mon May 1 20:38:53 2006
@@ -18,6 +18,7 @@
import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
import org.apache.axis2.saaj.util.IDGenerator;
import org.apache.axiom.soap.impl.dom.soap11.SOAP11Factory;
+import org.apache.axiom.om.util.StAXUtils;
import org.apache.axis2.transport.http.HTTPConstants;
import org.w3c.dom.Attr;
import org.w3c.dom.CDATASection;
@@ -79,7 +80,7 @@
try {
InputStreamReader isReader = new InputStreamReader(inputStream);
StAXSOAPModelBuilder builder =
- new StAXSOAPModelBuilder(XMLInputFactory.newInstance().createXMLStreamReader(isReader),
+ new StAXSOAPModelBuilder(StAXUtils.createXMLStreamReader(isReader),
new SOAP11Factory(),
null);
org.apache.axiom.soap.SOAPEnvelope soapEnvelope = builder.getSOAPEnvelope();
Modified: webservices/axis2/trunk/java/modules/samples/src/sample/groovy/GroovyReceiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/src/sample/groovy/GroovyReceiver.java?rev=398793&r1=398792&r2=398793&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/src/sample/groovy/GroovyReceiver.java (original)
+++ webservices/axis2/trunk/java/modules/samples/src/sample/groovy/GroovyReceiver.java Mon May 1 20:38:53 2006
@@ -22,6 +22,7 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
+import org.apache.axiom.om.util.StAXUtils;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
@@ -122,7 +123,7 @@
private OMElement getpayLoad(String str) throws XMLStreamException {
XMLStreamReader xmlReader =
- XMLInputFactory.newInstance().createXMLStreamReader(
+ StAXUtils.createXMLStreamReader(
new ByteArrayInputStream(str.getBytes()));
OMFactory fac = OMAbstractFactory.getOMFactory();
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/Axis2Util.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/Axis2Util.java?rev=398793&r1=398792&r2=398793&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/Axis2Util.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/axis2/security/util/Axis2Util.java Mon May 1 20:38:53 2006
@@ -20,6 +20,7 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNode;
+import org.apache.axiom.om.util.StAXUtils;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.axiom.om.impl.dom.DOOMAbstractFactory;
import org.apache.axiom.om.impl.dom.factory.OMDOMFactory;
@@ -172,7 +173,7 @@
XMLUtils.outputDOM(element, os, true);
ByteArrayInputStream is = new ByteArrayInputStream(os.toByteArray());
- XMLStreamReader reader = XMLInputFactory.newInstance()
+ XMLStreamReader reader = StAXUtils
.createXMLStreamReader(is);
StAXOMBuilder builder = new StAXOMBuilder(reader);