- From: Jonathan Marsh via cvs-syncmail <cvsmail@w3.org>
- Date: Thu, 04 May 2006 19:24:42 +0000
- To: public-ws-desc-eds@w3.org
Update of /sources/public/2002/ws/desc/test-suite/results
In directory hutz:/tmp/cvs-serv25758/test-suite/results
Modified Files:
canonicalize-wsdlcm.xslt
Log Message:
Completed functionality canonically sorting of all repeated children.
Index: canonicalize-wsdlcm.xslt
===================================================================
RCS file: /sources/public/2002/ws/desc/test-suite/results/canonicalize-wsdlcm.xslt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** canonicalize-wsdlcm.xslt 4 May 2006 03:19:38 -0000 1.1
--- canonicalize-wsdlcm.xslt 4 May 2006 19:24:40 -0000 1.2
***************
*** 4,9 ****
<!--
! Stylesheet to canonicalize the WSDL Component Model serialization format (wsdlxml)
! - canonicalizes xml:id and @ref attributes
Created: March 27, 2006, Jonathan Marsh, Microsoft. jmarsh@microsoft.com
-->
--- 4,10 ----
<!--
! Stylesheet to canonicalize the WSDL Component Model serialization format (wsdlcm)
! - sorts repeated elements in a canonical way, as deliniated at
! http://lists.w3.org/Archives/Public/www-ws-desc/2006Apr/0016.html
Created: March 27, 2006, Jonathan Marsh, Microsoft. jmarsh@microsoft.com
-->
***************
*** 32,46 ****
<!--
! 1. Description.{interfaces} - sort by Interface.{name}
! 2. Description.{bindings} - sort by Binding.{name}
! 3. Description.{services} - sort by Service.{name}
! 4. Description.{elementDeclarations} - sort by ElementDeclaration.{name}
! 5. Description.{typeDefinitions} - sort by TypeDefinition.{name}
! 6. Interface.{extendedInterfaces} - sort by Interface.{name}
! 7. Interface.{interfaceFaults} - sort by InterfaceFault.{name}
! 8. Interface.{operations} - sort by InterfaceOperation.{name}
! 15. Service.{endpoints} - sort by Endpoint.{name}
-->
! <xsl:template match="wsdlcm:interfaces | wsdlcm:bindings | wsdlcm:services | wsdlcm:elementDeclarations | wsdlcm:typeDefinitions | wsdlcm:extendedInterfaces | wsdlcm:interfaceFaults | wsdlcm:operations | wsdlcm:endpoints">
<xsl:copy>
<xsl:apply-templates select="@*"/>
--- 33,45 ----
<!--
! 1. Description.{interfaces} - sort by Interface.{name}
! 2. Description.{bindings} - sort by Binding.{name}
! 3. Description.{services} - sort by Service.{name}
! 4. Description.{elementDeclarations} - sort by ElementDeclaration.{name}
! 5. Description.{typeDefinitions} - sort by TypeDefinition.{name}
! 7. Interface.{interfaceFaults} - sort by InterfaceFault.{name}
! 8. Interface.{interfaceOperations} - sort by InterfaceOperation.{name}
-->
! <xsl:template match="wsdlcm:interfaces | wsdlcm:bindings | wsdlcm:services | wsdlcm:elementDeclarations | wsdlcm:typeDefinitions | wsdlcm:interfaceFaults | wsdlcm:interfaceOperations">
<xsl:copy>
<xsl:apply-templates select="@*"/>
***************
*** 53,65 ****
<!--
9. InterfaceOperation.{interfaceMessageReferences} - sort by InterfaceMessageReference.{message label}
10. InterfaceOperation.{interfaceFaultReferences} - sort by InterfaceFaultReference.{interface fault}.{name}, then by InterfaceFaultReference.{message label}
11. Binding.{bindingFaults} - sorty by BindingFault.{interfaceFault}.{name}
12. Binding.{operations} - sort by BindingOperation.{interfaceOperation}.{name}
13. BindingOperation.{bindingMessageReferences} - sort by BindingMessageReference.{interface message reference}.{name}
14. BindingOperation.{bindingFaultReferences} - sort by BindingFaultReference.{interface fault reference}.{interface fault}.{name}, then by BindingFaultReference.{interface fault reference}.{message label}
! 16. *.{features} - sort by Feature.{ref}
! 17. *.{properties} - sort by Property.{ref}
-->
</xsl:stylesheet>
--- 52,184 ----
<!--
+ 6. Interface.{extendedInterfaces} - sort by Interface.{name}
+ -->
+ <xsl:template match="wsdlcm:extendedInterfaces">
+ <xsl:copy>
+ <xsl:apply-templates select="@*"/>
+ <xsl:apply-templates select="*">
+ <xsl:sort select="//*[@xml:id=current()/@ref]/wsdlcm:name/wsdlcm:namespaceName"/>
+ <xsl:sort select="//*[@xml:id=current()/@ref]/wsdlcm:name/wsdlcm:localName"/>
+ </xsl:apply-templates>
+ </xsl:copy>
+ </xsl:template>
+
+ <!--
9. InterfaceOperation.{interfaceMessageReferences} - sort by InterfaceMessageReference.{message label}
+ -->
+ <xsl:template match="wsdlcm:interfaceMessageReferences">
+ <xsl:copy>
+ <xsl:apply-templates select="@*"/>
+ <xsl:apply-templates select="*">
+ <xsl:sort select="wsdlcm:messageLabel"/>
+ </xsl:apply-templates>
+ </xsl:copy>
+ </xsl:template>
+
+ <!--
10. InterfaceOperation.{interfaceFaultReferences} - sort by InterfaceFaultReference.{interface fault}.{name}, then by InterfaceFaultReference.{message label}
+ -->
+
+ <xsl:template match="wsdlcm:interfaceFaultReferences">
+ <xsl:copy>
+ <xsl:apply-templates select="@*"/>
+ <xsl:apply-templates select="*">
+ <xsl:sort select="//*[@xml:id=current()/@ref]/wsdlcm:name/wsdlcm:namespaceName"/>
+ <xsl:sort select="//*[@xml:id=current()/@ref]/wsdlcm:name/wsdlcm:localName"/>
+ <xsl:sort select="wsdlcm:messageLabel"/>
+ </xsl:apply-templates>
+ </xsl:copy>
+ </xsl:template>
+
+ <!--
11. Binding.{bindingFaults} - sorty by BindingFault.{interfaceFault}.{name}
+ -->
+
+ <xsl:template match="wsdlcm:bindingFaults">
+ <xsl:copy>
+ <xsl:apply-templates select="@*"/>
+ <xsl:apply-templates select="*">
+ <xsl:sort select="//*[@xml:id=current()/wsdlcm:interfaceFault/@ref]/wsdlcm:name/wsdlcm:namespaceName"/>
+ <xsl:sort select="//*[@xml:id=current()/wsdlcm:interfaceFault/@ref]/wsdlcm:name/wsdlcm:localName"/>
+ </xsl:apply-templates>
+ </xsl:copy>
+ </xsl:template>
+
+ <!--
12. Binding.{operations} - sort by BindingOperation.{interfaceOperation}.{name}
+ -->
+
+ <xsl:template match="wsdlcm:bindingOperations">
+ <xsl:copy>
+ <xsl:apply-templates select="@*"/>
+ <xsl:apply-templates select="*">
+ <xsl:sort select="//*[@xml:id=current()/wsdlcm:interfaceOperation/@ref]/wsdlcm:name/wsdlcm:namespaceName"/>
+ <xsl:sort select="//*[@xml:id=current()/wsdlcm:interfaceOperation/@ref]/wsdlcm:name/wsdlcm:localName"/>
+ </xsl:apply-templates>
+ </xsl:copy>
+ </xsl:template>
+
+ <!--
13. BindingOperation.{bindingMessageReferences} - sort by BindingMessageReference.{interface message reference}.{name}
+ -->
+
+ <xsl:template match="wsdlcm:bindingMessageReferences">
+ <xsl:copy>
+ <xsl:apply-templates select="@*"/>
+ <xsl:apply-templates select="*">
+ <xsl:sort select="//*[@xml:id=current()/wsdlcm:interfaceMessageReference/@ref]/wsdlcm:name/wsdlcm:namespaceName"/>
+ <xsl:sort select="//*[@xml:id=current()/wsdlcm:interfaceMessageReference/@ref]/wsdlcm:name/wsdlcm:localName"/>
+ </xsl:apply-templates>
+ </xsl:copy>
+ </xsl:template>
+
+ <!--
14. BindingOperation.{bindingFaultReferences} - sort by BindingFaultReference.{interface fault reference}.{interface fault}.{name}, then by BindingFaultReference.{interface fault reference}.{message label}
! -->
+ <xsl:template match="wsdlcm:bindingFaultReferences">
+ <xsl:copy>
+ <xsl:apply-templates select="@*"/>
+ <xsl:apply-templates select="*">
+ <xsl:sort select="//*[@xml:id=current()/wsdlcm:interfaceFaultReference/@ref]/wsdlcm:name/wsdlcm:namespaceName"/>
+ <xsl:sort select="//*[@xml:id=current()/wsdlcm:interfaceFaultReference/@ref]/wsdlcm:name/wsdlcm:localName"/>
+ </xsl:apply-templates>
+ </xsl:copy>
+ </xsl:template>
+
+ <!--
+ 15. Service.{endpoints} - sort by Endpoint.{name}
+ -->
+ <xsl:template match="wsdlcm:endpoints">
+ <xsl:copy>
+ <xsl:apply-templates select="@*"/>
+ <xsl:apply-templates select="*">
+ <xsl:sort select="wsdlcm:name"/>
+ </xsl:apply-templates>
+ </xsl:copy>
+ </xsl:template>
+
+ <!--
+ 16. *.{features} - sort by Feature.{ref}
+ 17. *.{properties} - sort by Property.{ref}
-->
+ <xsl:template match="wsdlcm:features | wsdlcm:properties">
+ <xsl:copy>
+ <xsl:apply-templates select="@*"/>
+ <xsl:apply-templates select="*">
+ <xsl:sort select="ref"/>
+ </xsl:apply-templates>
+ </xsl:copy>
+ </xsl:template>
+
+ <!-- Style URIs -->
+ <xsl:template match="wsdlcm:style">
+ <xsl:copy>
+ <xsl:apply-templates select="@*"/>
+ <xsl:apply-templates select="*">
+ <xsl:sort select="uri"/>
+ </xsl:apply-templates>
+ </xsl:copy>
+ </xsl:template>
+
</xsl:stylesheet>
Received on Thursday, 4 May 2006 19:25:18 UTC