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/09/07 22:41:56 UTC
svn commit: r441219 -
/webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl
Author: dims
Date: Thu Sep 7 13:41:55 2006
New Revision: 441219
URL: http://svn.apache.org/viewvc?view=rev&rev=441219
Log:
Fix for AXIS2-1121 - binary and enumFacet are incompatible with unordered in ADBBeanTemplate
Modified:
webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl
Modified: webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl?view=diff&rev=441219&r1=441218&r2=441219
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate.xsl Thu Sep 7 13:41:55 2006
@@ -1325,6 +1325,9 @@
<xsl:if test="not(@binary)">
if (reader.isStartElement() && <xsl:value-of select="$propQName"/>.equals(reader.getName())){
</xsl:if>
+ <xsl:if test="@binary">
+ if (reader.isStartElement()){
+ </xsl:if>
</xsl:if>
<xsl:choose>
<xsl:when test="@array">
@@ -1539,11 +1542,9 @@
</xsl:otherwise>
</xsl:choose>
<xsl:if test="not(enumFacet)">
- <xsl:if test="not(@binary)">
} // End of if for expected property start element
</xsl:if>
- </xsl:if>
- <xsl:if test="$ordered and $min!=0 and not(@binary)">
+ <xsl:if test="$ordered and $min!=0">
else{
// A start element we are not expecting indicates an invalid parameter was passed
throw new java.lang.RuntimeException("Unexpected subelement " + reader.getLocalName());
@@ -1562,13 +1563,11 @@
<xsl:if test="property[not(@attribute)]"> <!-- this if is needed to skip all this when there are no propoerties-->
<xsl:if test="$unordered">
<xsl:if test="not(property/enumFacet)">
- <xsl:if test="not(property[@binary])">
else{
// A start element we are not expecting indicates an invalid parameter was passed
throw new java.lang.RuntimeException("Unexpected subelement " + reader.getLocalName());
}
</xsl:if>
- </xsl:if>
} else reader.next(); <!-- At neither a start nor an end element, skip it -->
} // end of while loop
</xsl:if>
@@ -2521,7 +2520,7 @@
} // End of if for expected property start element
- <xsl:if test="$ordered and $min!=0 and not(@binary)">
+ <xsl:if test="$ordered and $min!=0">
else{
// A start element we are not expecting indicates an invalid parameter was passed
throw new java.lang.RuntimeException("Unexpected subelement " + reader.getLocalName());
@@ -2538,7 +2537,7 @@
</xsl:if>
<xsl:if test="property[not(@attribute)]"> <!-- this if is needed to skip all this when there are no propoerties-->
- <xsl:if test="$unordered and property[not(@binary)]">
+ <xsl:if test="$unordered">
else{
// A start element we are not expecting indicates an invalid parameter was passed
throw new java.lang.RuntimeException("Unexpected subelement " + reader.getLocalName());
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org