Author: dims
Date: Tue Dec 20 19:16:08 2005
New Revision: 358193
URL: http://svn.apache.org/viewcvs?rev=358193&view=rev
Log:
Fix for AXIS2-224 - Generated code always converts the XMLBeans things into OM
representation (vice versa)
PS: If anyone spots a streaming problem, please holler.
Modified:
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/JAXBSupporterTemplate.xsl
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/XMLBeansSupporterTemplate.xsl
Modified:
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/JAXBSupporterTemplate.xsl
URL:
http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/JAXBSupporterTemplate.xsl?rev=358193&r1=358192&r2=358193&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/JAXBSupporterTemplate.xsl
(original)
+++
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/JAXBSupporterTemplate.xsl
Tue Dec 20 19:16:08 2005
@@ -100,8 +100,6 @@
org.apache.axis2.om.impl.llom.builder.StAXOMBuilder builder =
new org.apache.axis2.om.impl.llom.builder.StAXOMBuilder
(org.apache.axis2.om.OMAbstractFactory.getOMFactory(),new
org.apache.axis2.util.StreamWrapper(reader)) ;
org.apache.axis2.om.OMElement documentElement =
builder.getDocumentElement();
- //Building the element is needed to avoid certain stream errors!
- documentElement.build();
return documentElement;
} catch(Exception e) {
System.err.println("Exception encountered in
echoStringDatabindingSupporter.toOM(). Returning null");
Modified:
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/XMLBeansSupporterTemplate.xsl
URL:
http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/XMLBeansSupporterTemplate.xsl?rev=358193&r1=358192&r2=358193&view=diff
==============================================================================
---
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/XMLBeansSupporterTemplate.xsl
(original)
+++
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/java/XMLBeansSupporterTemplate.xsl
Tue Dec 20 19:16:08 2005
@@ -35,10 +35,10 @@
org.apache.axis2.om.impl.llom.builder.StAXOMBuilder builder = new
org.apache.axis2.om.impl.llom.builder.StAXOMBuilder
(org.apache.axis2.om.OMAbstractFactory.getOMFactory(),new
org.apache.axis2.util.StreamWrapper(param.newXMLStreamReader())) ;
org.apache.axis2.om.OMElement documentElement =
builder.getDocumentElement();
- ///////Building the element is needed to avoid certain stream errors!
- documentElement.build();
- //////////////////////////////
- <xsl:if
test="$base64">optimizeContent(documentElement,qNameArray);</xsl:if>
+
+ <xsl:if test="$base64">
+ optimizeContent(documentElement,qNameArray);
+ </xsl:if>
return documentElement;
}
</xsl:if>
@@ -50,10 +50,6 @@
<xsl:for-each select="param">
<xsl:if test="@type!=''">
if (<xsl:value-of select="@type"/>.class.equals(type)){
- //////////////////////////////////////////////////
- /////////// Temporary hack to solve some streaming problems
- param.build();
- /////////////////////////////////////////////////
return <xsl:value-of
select="@type"/>.Factory.parse(param.getXMLStreamReader()) ;
}
</xsl:if>
