- From: Philippe Le Hegaret via cvs-syncmail <cvsmail@w3.org>
- Date: Tue, 09 Jan 2007 23:40:40 +0000
- To: public-ws-desc-eds@w3.org
Update of /sources/public/2002/ws/desc/test-suite/results-messages In directory hutz:/tmp/cvs-serv24501 Modified Files: generate-message-properties.xslt Log Message: Added style, safety, and various http binding message properties Index: generate-message-properties.xslt =================================================================== RCS file: /sources/public/2002/ws/desc/test-suite/results-messages/generate-message-properties.xslt,v retrieving revision 1.7 retrieving revision 1.8 diff -C 2 -d -r1.7 -r1.8 *** generate-message-properties.xslt 9 Jan 2007 20:04:50 -0000 1.7 --- generate-message-properties.xslt 9 Jan 2007 23:40:38 -0000 1.8 *************** *** 280,284 **** <address><xsl:value-of select='$endpointComponent/cm:address' /></address> </xsl:if> ! <xsl:if test='$bindingComponent/cm:type="http://www.w3.org/2006/01/wsdl/soap"'> <xsl:if test='$bindingComponent/cmsoap:soapBindingExtension/cmhttp:httpCookies'> <httpCookies> --- 280,295 ---- <address><xsl:value-of select='$endpointComponent/cm:address' /></address> </xsl:if> ! <xsl:for-each select='$interfaceOperationComponent/cm:style/cmbase:uri'> ! <style> ! <xsl:value-of select='.'/> ! </style> ! </xsl:for-each> ! <xsl:if test='$interfaceOperationComponent/cmextensions:wsdlInterfaceOperationExtension/cmextensions:safety'> ! <safety> ! <xsl:value-of select='$interfaceOperationComponent/cmextensions:wsdlInterfaceOperationExtension/cmextensions:safety'/> ! </safety> ! </xsl:if> ! <xsl:choose> ! <xsl:when test='$bindingComponent/cm:type="http://www.w3.org/2006/01/wsdl/soap"'> <xsl:if test='$bindingComponent/cmsoap:soapBindingExtension/cmhttp:httpCookies'> <httpCookies> *************** *** 317,321 **** </xsl:if> <soapUnderlyingProtocol> ! <xsl:value-of select='$bindingComponent/cmsoap:soapBindingExtension/cmsoap:soapUnderlyingProtocol' /> </soapUnderlyingProtocol> <soapVersion> --- 328,332 ---- </xsl:if> <soapUnderlyingProtocol> ! <xsl:value-of select='$bindingComponent/cmsoap:soapBindingExtension/cmsoap:soapUnderlyingProtocol' /> </soapUnderlyingProtocol> <soapVersion> *************** *** 393,400 **** </xsl:call-template> </xsl:for-each> ! <fault> ! <xsl:attribute name='localName'> ! <xsl:value-of select='$interfaceFaultComponent/cm:name/cmbase:localName'/> ! </xsl:attribute> <xsl:attribute name='namespace'> <xsl:value-of select='$interfaceFaultComponent/cm:name/cmbase:namespaceName'/> --- 404,411 ---- </xsl:call-template> </xsl:for-each> ! <fault> ! <xsl:attribute name='localName'> ! <xsl:value-of select='$interfaceFaultComponent/cm:name/cmbase:localName'/> ! </xsl:attribute> <xsl:attribute name='namespace'> <xsl:value-of select='$interfaceFaultComponent/cm:name/cmbase:namespaceName'/> *************** *** 453,457 **** </xsl:choose> </xsl:if> ! </xsl:if> </xsl:template> --- 464,599 ---- </xsl:choose> </xsl:if> ! </xsl:when> ! <xsl:when test='$bindingComponent/cm:type="http://www.w3.org/2006/01/wsdl/http"'> ! <httpVersion>1.1</httpVersion> ! <xsl:if test='$bindingComponent/cmhttp:httpBindingExtension/cmhttp:httpCookies'> ! <httpCookies> ! <xsl:value-of select='$bindingComponent/cmhttp:httpBindingExtension/cmhttp:httpCookies'/> ! </httpCookies> ! </xsl:if> ! <xsl:if test='$bindingComponent/cmhttp:httpBindingExtension/cmhttp:httpQueryParameterSeparatorDefault'> ! <httpQueryParameterSeparatorDefault> ! <xsl:value-of select='$bindingComponent/cmhttp:httpBindingExtension/cmhttp:httpQueryParameterSeparatorDefault'/> ! </httpQueryParameterSeparatorDefault> ! </xsl:if> ! <xsl:if test='$bindingOperationComponent/cmhttp:httpBindingOperationExtension/cmhttp:httpLocation'> ! <httpLocation> ! <xsl:call-template name="replaceHttpLocation"> ! <xsl:with-param name="location" select='$bindingOperationComponent/cmhttp:httpBindingOperationExtension/cmhttp:httpLocation' /> ! </xsl:call-template> ! </httpLocation> ! </xsl:if> ! <xsl:if test='$bindingOperationComponent/cmhttp:httpBindingOperationExtension/cmhttp:httpInputSerialization'> ! <httpInputSerialization> ! <xsl:value-of select='$bindingOperationComponent/cmhttp:httpBindingOperationExtension/cmhttp:httpInputSerialization'/> ! </httpInputSerialization> ! </xsl:if> ! <xsl:if test='$bindingOperationComponent/cmhttp:httpBindingOperationExtension/cmhttp:httpOutputSerialization'> ! <httpOutputSerialization> ! <xsl:value-of select='$bindingOperationComponent/cmhttp:httpBindingOperationExtension/cmhttp:httpOutputSerialization'/> ! </httpOutputSerialization> ! </xsl:if> ! <xsl:if test='$bindingOperationComponent/cmhttp:httpBindingOperationExtension/cmhttp:httpFaultSerialization'> ! <httpFaultSerialization> ! <xsl:value-of select='$bindingOperationComponent/cmhttp:httpBindingOperationExtension/cmhttp:httpFaultSerialization'/> ! </httpFaultSerialization> ! </xsl:if> ! <xsl:choose> ! <xsl:when test='$bindingOperationComponent/cmhttp:httpBindingOperationExtension/cmhttp:httpMethod'> ! <httpMethod> ! <xsl:value-of select='$bindingOperationComponent/cmhttp:httpBindingOperationExtension/cmhttp:httpMethod' /> ! </httpMethod> ! </xsl:when> ! <xsl:when test='$bindingComponent/cmhttp:httpBindingExtension/cmhttp:httpMethodDefault'> ! <httpMethod> ! <xsl:value-of select='$bindingComponent/cmhttp:httpBindingExtension/cmhttp:httpMethodDefault'/> ! </httpMethod> ! </xsl:when> ! </xsl:choose> ! <xsl:choose> ! <xsl:when test='$bindingMessageReferenceComponent/cmhttp:httpBindingMessageReferenceExtension/cmhttp:httpTransferCoding'> ! <httpTransferCoding> ! <xsl:value-of select='$bindingMessageReferenceComponent/cmhttp:httpBindingMessageReferenceExtension/cmhttp:httpTransferCoding'/> ! </httpTransferCoding> ! </xsl:when> ! <xsl:when test='$bindingOperationComponent/cmhttp:httpBindingOperationExtension/cmhttp:httpTransferCodingDefault'> ! <httpTransferCoding> ! <xsl:value-of select='$bindingOperationComponent/cmhttp:httpBindingOperationExtension/cmhttp:httpTransferCodingDefault'/> ! </httpTransferCoding> ! </xsl:when> ! <xsl:when test='$bindingComponent/cmhttp:httpBindingExtension/cmhttp:httpTransferCodingDefault'> ! <httpTransferCoding> ! <xsl:value-of select='$bindingComponent/cmhttp:httpBindingExtension/cmhttp:httpTransferCodingDefault'/> ! </httpTransferCoding> ! </xsl:when> ! </xsl:choose> ! <xsl:if test='$endpointComponent/cmhttp:httpEndpointExtension/cmhttp:httpAuthenticationRealm'> ! <httpAuthenticationRealm><xsl:value-of select='$endpointComponent/cmhttp:httpEndpointExtension/cmhttp:httpAuthenticationRealm' /></httpAuthenticationRealm> ! </xsl:if> ! <xsl:if test='$endpointComponent/cmhttp:httpEndpointExtension/cmhttp:httpAuthenticationScheme'> ! <httpAuthenticationScheme><xsl:value-of select='$endpointComponent/cmhttp:httpEndpointExtension/cmhttp:httpAuthenticationScheme' /></httpAuthenticationScheme> ! </xsl:if> ! <xsl:if test='$interfaceMessageReferenceComponent'> ! <xsl:for-each select='$bindingMessageReferenceComponent/cmhttp:httpBindingMessageReferenceExtension/cmhttp:httpHeaders/cmhttp:httpHeaderComponent'> ! <xsl:call-template name='generate-http-header'> ! <xsl:with-param name='httpHeader' select='.' /> ! </xsl:call-template> ! </xsl:for-each> ! </xsl:if> ! ! <xsl:choose> ! <xsl:when test='local-name($interfaceMessageReferenceComponent)="interfaceFaultReferenceComponent"'> ! <xsl:for-each select='$bindingFaultComponent/cmhttp:httpBindingFaultExtension/cmhttp:httpHeaders/cmhttp:httpHeaderComponent'> ! <xsl:call-template name='generate-http-header'> ! <xsl:with-param name='httpHeader' select='.' /> ! </xsl:call-template> ! </xsl:for-each> ! <fault> ! <xsl:attribute name='localName'> ! <xsl:value-of select='$interfaceFaultComponent/cm:name/cmbase:localName'/> ! </xsl:attribute> ! <xsl:attribute name='namespace'> ! <xsl:value-of select='$interfaceFaultComponent/cm:name/cmbase:namespaceName'/> ! </xsl:attribute> ! <xsl:if test='$bindingFaultComponent/cmhttp:httpBindingFaultExtension/cmhttp:httpErrorStatusCode'> ! <xsl:choose> ! <xsl:when test='$bindingFaultComponent/cmhttp:httpBindingFaultExtension/cmhttp:httpErrorStatusCode/cmhttp:code'> ! <xsl:for-each select='$bindingFaultComponent/cmhttp:httpBindingFaultExtension/cmhttp:httpErrorStatusCode/cmhttp:code'> ! <httpErrorStatusCode type='{.}'/> ! </xsl:for-each> ! </xsl:when> ! <xsl:otherwise> ! <httpErrorStatusCode type='#any' /> ! </xsl:otherwise> ! </xsl:choose> ! </xsl:if> ! <contentModel> ! <xsl:variable name='elementDeclarationComponent' select='//cm:elementDeclarationComponent[@xml:id = $interfaceFaultComponent/cm:elementDeclaration/@ref]'/> ! <xsl:attribute name='localName'> ! <xsl:value-of select='$elementDeclarationComponent/cm:name/cmbase:localName'/> ! </xsl:attribute> ! <xsl:attribute name='namespace'> ! <xsl:value-of select='$elementDeclarationComponent/cm:name/cmbase:namespaceName'/> ! </xsl:attribute> ! </contentModel> ! </fault> ! </xsl:when> ! <xsl:otherwise> ! <xsl:variable name='msgCModel' select='$interfaceMessageReferenceComponent/cm:messageContentModel'/> ! <messageContentModel type='{$msgCModel}'> ! <xsl:if test='$msgCModel="#element"'> ! <xsl:variable name='elementDeclarationComponent' select='//cm:elementDeclarationComponent[@xml:id = $interfaceMessageReferenceComponent/cm:elementDeclaration/@ref]'/> ! <xsl:attribute name='localName'> ! <xsl:value-of select='$elementDeclarationComponent/cm:name/cmbase:localName'/> ! </xsl:attribute> ! <xsl:attribute name='namespace'> ! <xsl:value-of select='$elementDeclarationComponent/cm:name/cmbase:namespaceName'/> ! </xsl:attribute> ! </xsl:if> ! </messageContentModel> ! </xsl:otherwise> ! </xsl:choose> ! </xsl:when> ! </xsl:choose> </xsl:template>
Received on Tuesday, 9 January 2007 23:40:48 UTC