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 2010/12/29 20:44:39 UTC
svn commit: r1053718 - in /axis/axis2/java/core/trunk/modules:
jaxws-integration/test/server/ kernel/src/org/apache/axis2/builder/
xmlbeans/src/org/apache/axis2/xmlbeans/template/
Author: veithen
Date: Wed Dec 29 19:44:39 2010
New Revision: 1053718
URL: http://svn.apache.org/viewvc?rev=1053718&view=rev
Log:
Used the new API introduced by AXIOM-313 to eliminate references to org.apache.axiom.om.impl.OMNodeEx, which is considered as an internal API.
Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/test/server/EchoServiceMessageReceiverInOut.java
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/ApplicationXMLBuilder.java
axis/axis2/java/core/trunk/modules/xmlbeans/src/org/apache/axis2/xmlbeans/template/XmlbeansDatabindingTemplate.xsl
Modified: axis/axis2/java/core/trunk/modules/jaxws-integration/test/server/EchoServiceMessageReceiverInOut.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/test/server/EchoServiceMessageReceiverInOut.java?rev=1053718&r1=1053717&r2=1053718&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jaxws-integration/test/server/EchoServiceMessageReceiverInOut.java (original)
+++ axis/axis2/java/core/trunk/modules/jaxws-integration/test/server/EchoServiceMessageReceiverInOut.java Wed Dec 29 19:44:39 2010
@@ -93,8 +93,7 @@
= new org.apache.axiom.om.impl.builder.StAXOMBuilder
(org.apache.axiom.om.OMAbstractFactory.getOMFactory(),
new org.apache.axis2.util.StreamWrapper(param.getPullParser(server.EchoString.MY_QNAME)));
- org.apache.axiom.om.OMElement documentElement = builder.getDocumentElement();
- ((org.apache.axiom.om.impl.OMNodeEx) documentElement).setParent(null); // remove the parent link
+ org.apache.axiom.om.OMElement documentElement = builder.getDocumentElement(true);
return documentElement;
}else{
Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/ApplicationXMLBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/ApplicationXMLBuilder.java?rev=1053718&r1=1053717&r2=1053718&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/ApplicationXMLBuilder.java (original)
+++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/ApplicationXMLBuilder.java Wed Dec 29 19:44:39 2010
@@ -21,7 +21,6 @@ package org.apache.axis2.builder;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.impl.OMNodeEx;
import org.apache.axiom.om.impl.builder.StAXBuilder;
import org.apache.axiom.om.util.DetachableInputStream;
import org.apache.axiom.soap.SOAPBody;
@@ -65,8 +64,7 @@ public class ApplicationXMLBuilder imple
BuilderUtil.getPOXBuilder(pushbackInputStream,
(String) messageContext.getProperty(
Constants.Configuration.CHARACTER_SET_ENCODING));
- OMNodeEx documentElement = (OMNodeEx) builder.getDocumentElement();
- documentElement.setParent(null);
+ OMElement documentElement = builder.getDocumentElement(true);
SOAPBody body = soapEnvelope.getBody();
body.addChild(documentElement);
}
Modified: axis/axis2/java/core/trunk/modules/xmlbeans/src/org/apache/axis2/xmlbeans/template/XmlbeansDatabindingTemplate.xsl
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/xmlbeans/src/org/apache/axis2/xmlbeans/template/XmlbeansDatabindingTemplate.xsl?rev=1053718&r1=1053717&r2=1053718&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/xmlbeans/src/org/apache/axis2/xmlbeans/template/XmlbeansDatabindingTemplate.xsl (original)
+++ axis/axis2/java/core/trunk/modules/xmlbeans/src/org/apache/axis2/xmlbeans/template/XmlbeansDatabindingTemplate.xsl Wed Dec 29 19:44:39 2010
@@ -47,9 +47,8 @@
if (optimizeContent) {
org.apache.axiom.om.impl.builder.StAXOMBuilder builder = new org.apache.axiom.om.impl.builder.StAXOMBuilder
(org.apache.axiom.om.OMAbstractFactory.getOMFactory(),new org.apache.axis2.util.StreamWrapper(param.newXMLStreamReader())) ;
- org.apache.axiom.om.OMElement documentElement = builder.getDocumentElement();
+ org.apache.axiom.om.OMElement documentElement = builder.getDocumentElement(true);
optimizeContent(documentElement,qNameArray);
- ((org.apache.axiom.om.impl.OMNodeEx)documentElement).setParent(null);
return documentElement;
} else {
return toOM(param);