- From: Jonathan Marsh via cvs-syncmail <cvsmail@w3.org>
- Date: Sat, 18 Nov 2006 02:58:32 +0000
- To: public-ws-desc-eds@w3.org
Update of /sources/public/2002/ws/desc/test-suite/results/wsdl-xslt
In directory hutz:/tmp/cvs-serv19753/test-suite/results/wsdl-xslt
Modified Files:
wsdl-component-model.xslt
Log Message:
Resolving Woden/wsdl-xslt discrepancies, updating baselines, regenerate results
Index: wsdl-component-model.xslt
===================================================================
RCS file: /sources/public/2002/ws/desc/test-suite/results/wsdl-xslt/wsdl-component-model.xslt,v
retrieving revision 1.21
retrieving revision 1.22
diff -C 2 -d -r1.21 -r1.22
*** wsdl-component-model.xslt 18 Nov 2006 01:27:29 -0000 1.21
--- wsdl-component-model.xslt 18 Nov 2006 02:58:29 -0000 1.22
***************
*** 354,360 ****
</xsl:when>
<xsl:otherwise>
<xsl:choose>
! <xsl:when test="self::wsdl:infault">In</xsl:when>
! <xsl:when test="self::wsdl:outfault">Out</xsl:when>
</xsl:choose>
</xsl:otherwise>
--- 354,381 ----
</xsl:when>
<xsl:otherwise>
+ <xsl:variable name="pattern" select="parent::wsdl:operation/@pattern"/>
<xsl:choose>
! <!-- No Faults Rule (never applicable in interfaceFaultReferenceComponents)
! <xsl:when test="$pattern='http://www.w3.org/2006/01/wsdl/in-only' or
! $pattern='http://www.w3.org/2006/01/wsdl/out-only'" />
! -->
! <!-- Fault Replaces Message Rule -->
! <xsl:when test="$pattern='http://www.w3.org/2006/01/wsdl/in-out' or
! $pattern='http://www.w3.org/2006/01/wsdl/in-out'">
! <xsl:choose>
! <xsl:when test="self::wsdl:infault">In</xsl:when>
! <xsl:when test="self::wsdl:outfault">Out</xsl:when>
! </xsl:choose>
! </xsl:when>
! <!-- Message Triggers Fault Rule -->
! <xsl:when test="$pattern='http://www.w3.org/2006/01/wsdl/robust-in-only' or
! $pattern='http://www.w3.org/2006/01/wsdl/in-opt-out' or
! $pattern='http://www.w3.org/2006/01/wsdl/robust-out-only' or
! $pattern='http://www.w3.org/2006/01/wsdl/out-opt-in' ">
! <xsl:choose>
! <xsl:when test="self::wsdl:infault">Out</xsl:when>
! <xsl:when test="self::wsdl:outfault">In</xsl:when>
! </xsl:choose>
! </xsl:when>
</xsl:choose>
</xsl:otherwise>
***************
*** 438,447 ****
<xsl:if test="@type='http://www.w3.org/2006/01/wsdl/soap'">
<soapcm:soapBindingExtension>
! <httpcm:httpCookies>
! <xsl:choose>
! <xsl:when test="@whttp:cookies"><xsl:value-of select="@whttp:cookies"/></xsl:when>
! <xsl:otherwise>false</xsl:otherwise>
! </xsl:choose>
! </httpcm:httpCookies>
<xsl:if test="@whttp:transferCodingDefault">
<httpcm:httpTransferCodingDefault>
--- 459,471 ----
<xsl:if test="@type='http://www.w3.org/2006/01/wsdl/soap'">
<soapcm:soapBindingExtension>
! <xsl:if test="(@wsoap:protocol='http://www.w3.org/2003/05/soap/bindings/HTTP/') or
! (@wsoap:version='1.1' and @wsoap:protocol='http://www.w3.org/2006/01/soap11/bindings/HTTP/')">
! <httpcm:httpCookies>
! <xsl:choose>
! <xsl:when test="@whttp:cookies"><xsl:value-of select="@whttp:cookies"/></xsl:when>
! <xsl:otherwise>false</xsl:otherwise>
! </xsl:choose>
! </httpcm:httpCookies>
! </xsl:if>
<xsl:if test="@whttp:transferCodingDefault">
<httpcm:httpTransferCodingDefault>
***************
*** 496,504 ****
<xsl:if test="parent::wsdl:binding/@type='http://www.w3.org/2006/01/wsdl/soap'">
<soapcm:soapBindingFaultExtension>
! <xsl:call-template name="http-headers"/>
! <xsl:if test="@whttp:transferCoding">
! <httpcm:httpTransferCoding>
! <xsl:value-of select="@whttp:transferCoding"/>
! </httpcm:httpTransferCoding>
</xsl:if>
<soapcm:soapFaultCode>
--- 520,531 ----
<xsl:if test="parent::wsdl:binding/@type='http://www.w3.org/2006/01/wsdl/soap'">
<soapcm:soapBindingFaultExtension>
! <xsl:if test="parent::wsdl:binding[(@wsoap:protocol='http://www.w3.org/2003/05/soap/bindings/HTTP/') or
! (@wsoap:version='1.1' and @wsoap:protocol='http://www.w3.org/2006/01/soap11/bindings/HTTP/')]">
! <xsl:call-template name="http-headers"/>
! <xsl:if test="@whttp:transferCoding">
! <httpcm:httpTransferCoding>
! <xsl:value-of select="@whttp:transferCoding"/>
! </httpcm:httpTransferCoding>
! </xsl:if>
</xsl:if>
<soapcm:soapFaultCode>
***************
*** 628,631 ****
--- 655,671 ----
<xsl:if test="parent::wsdl:binding/@type='http://www.w3.org/2006/01/wsdl/soap'">
<soapcm:soapBindingOperationExtension>
+ <xsl:if test="parent::wsdl:binding[(@wsoap:protocol='http://www.w3.org/2003/05/soap/bindings/HTTP/') or
+ (@wsoap:version='1.1' and @wsoap:protocol='http://www.w3.org/2006/01/soap11/bindings/HTTP/')]">
+ <xsl:if test="@whttp:location">
+ <httpcm:httpLocation>
+ <xsl:value-of select="@whttp:location"/>
+ </httpcm:httpLocation>
+ </xsl:if>
+ <xsl:if test="@whttp:transferCodingDefault">
+ <httpcm:httpTransferCodingDefault>
+ <xsl:value-of select="@whttp:transferCodingDefault"/>
+ </httpcm:httpTransferCodingDefault>
+ </xsl:if>
+ </xsl:if>
<xsl:if test="@wsoap:action">
<soapcm:soapAction>
***************
*** 678,686 ****
<xsl:if test="ancestor::wsdl:binding/@type='http://www.w3.org/2006/01/wsdl/soap'">
<soapcm:soapBindingMessageReferenceExtension>
! <xsl:call-template name="http-headers"/>
! <xsl:if test="@whttp:transferCoding">
! <httpcm:httpTransferCoding>
! <xsl:value-of select="@whttp:transferCoding"/>
! </httpcm:httpTransferCoding>
</xsl:if>
<xsl:call-template name="soap-module"/>
--- 718,729 ----
<xsl:if test="ancestor::wsdl:binding/@type='http://www.w3.org/2006/01/wsdl/soap'">
<soapcm:soapBindingMessageReferenceExtension>
! <xsl:if test="ancestor::wsdl:binding[(@wsoap:protocol='http://www.w3.org/2003/05/soap/bindings/HTTP/') or
! (@wsoap:version='1.1' and @wsoap:protocol='http://www.w3.org/2006/01/soap11/bindings/HTTP/')]">
! <xsl:call-template name="http-headers"/>
! <xsl:if test="@whttp:transferCoding">
! <httpcm:httpTransferCoding>
! <xsl:value-of select="@whttp:transferCoding"/>
! </httpcm:httpTransferCoding>
! </xsl:if>
</xsl:if>
<xsl:call-template name="soap-module"/>
***************
*** 695,711 ****
<interfaceFaultReference><xsl:attribute name="ref">
<xsl:call-template name="fault-reference-ref">
! <xsl:with-param name="label" >
! <xsl:choose>
! <xsl:when test="@messageLabel">
! <xsl:value-of select="@messageLabel"/>
! </xsl:when>
! <xsl:otherwise>
! <xsl:choose>
! <xsl:when test="self::wsdl:infault">In</xsl:when>
! <xsl:when test="self::wsdl:outfault">Out</xsl:when>
! </xsl:choose>
! </xsl:otherwise>
! </xsl:choose>
! </xsl:with-param>
<xsl:with-param name="operation" select="../@ref"/>
<xsl:with-param name="namespace-context" select="."/>
--- 738,742 ----
<interfaceFaultReference><xsl:attribute name="ref">
<xsl:call-template name="fault-reference-ref">
! <xsl:with-param name="ref" select="@ref"/>
<xsl:with-param name="operation" select="../@ref"/>
<xsl:with-param name="namespace-context" select="."/>
***************
*** 851,855 ****
</xsl:template>
<xsl:template name="fault-reference-ref">
! <xsl:param name="label"/>
<xsl:param name="operation"/>
<xsl:param name="namespace-context"/>
--- 882,886 ----
</xsl:template>
<xsl:template name="fault-reference-ref">
! <xsl:param name="ref"/>
<xsl:param name="operation"/>
<xsl:param name="namespace-context"/>
***************
*** 858,867 ****
<xsl:variable name="namespace-name" select="$namespace-context/namespace::*[local-name()=$prefix]"/>
<xsl:for-each select="$all-operations[@name=$local-name][ancestor::wsdl:description/@targetNamespace=$namespace-name]">
! <xsl:value-of select="generate-id(
! wsdl:infault[@messageLabel and @messageLabel=$label] |
! wsdl:outfault[@messageLabel and @messageLabel=$label] |
! wsdl:infault[$label='In'] |
! wsdl:outfault[$label='Out']
! )"/>
</xsl:for-each>
</xsl:template>
--- 889,893 ----
<xsl:variable name="namespace-name" select="$namespace-context/namespace::*[local-name()=$prefix]"/>
<xsl:for-each select="$all-operations[@name=$local-name][ancestor::wsdl:description/@targetNamespace=$namespace-name]">
! <xsl:value-of select="generate-id(wsdl:infault[@ref=$ref] | wsdl:outfault[@ref=$ref])"/>
</xsl:for-each>
</xsl:template>
Received on Saturday, 18 November 2006 02:59:05 UTC