W3C home > Mailing lists > Public > public-ws-desc-eds@w3.org > April 2007

2002/ws/desc/test-suite/results/wsdl-xslt wsdl-component-model.xslt,1.33,1.34

From: Jonathan Marsh via cvs-syncmail <cvsmail@w3.org>
Date: Thu, 19 Apr 2007 06:32:46 +0000
To: public-ws-desc-eds@w3.org
Message-Id: <E1HeQCE-0004yX-B1@lionel-hutz.w3.org>

Update of /sources/public/2002/ws/desc/test-suite/results/wsdl-xslt
In directory hutz:/tmp/cvs-serv18312/test-suite/results/wsdl-xslt

Modified Files:
	wsdl-component-model.xslt 
Log Message:
Added FlickrHTTP-1G, updated interface inheritance in wsdl-xslt, regenerated 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.33
retrieving revision 1.34
diff -C 2 -d -r1.33 -r1.34
*** wsdl-component-model.xslt	23 Mar 2007 05:50:36 -0000	1.33
--- wsdl-component-model.xslt	19 Apr 2007 06:32:44 -0000	1.34
***************
*** 632,636 ****
                      <xsl:with-param name="name" select="@ref"/>
                      <xsl:with-param name="namespace-context" select="."/>
!                     <xsl:with-param name="interface" select="ancestor::wsdl:binding/@interface"/>                    
                  </xsl:call-template>
              </xsl:attribute></interfaceOperation>
--- 632,636 ----
                      <xsl:with-param name="name" select="@ref"/>
                      <xsl:with-param name="namespace-context" select="."/>
!                     <xsl:with-param name="interface" select="ancestor::wsdl:binding/@interface"/>
                  </xsl:call-template>
              </xsl:attribute></interfaceOperation>
***************
*** 1030,1044 ****
          <xsl:variable name="prefix" select="substring-before($name,':')"/>
          <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][ancestor::wsdl:interface/@name=normalize-space($interface-local-name) or ancestor::wsdl:interface/@extends=normalize-space($interface-local-name)]">
              <xsl:value-of select="generate-id(.)"/>
          </xsl:for-each>
-         <xsl:for-each select="$all-interfaces[@name=$interface-local-name][@extends]">
-             <xsl:call-template name="operation-ref">
-                 <xsl:with-param name="name" select="$name"/>
-                 <xsl:with-param name="namespace-context" select="$namespace-context"/>
-                 <xsl:with-param name="interface" select="@extends"/>
-             </xsl:call-template>
-         </xsl:for-each>
      </xsl:template>
      <xsl:template name="message-ref">
          <xsl:param name="label"/>
--- 1030,1078 ----
          <xsl:variable name="prefix" select="substring-before($name,':')"/>
          <xsl:variable name="namespace-name" select="$namespace-context/namespace::*[local-name()=$prefix]"/>
! 		<xsl:variable name="interfaces-extended-by-this-one">
!         	<xsl:call-template name="interface-list">
!         		<xsl:with-param name="interface" select="$all-interfaces[@name=$interface-local-name]"/>
!         	</xsl:call-template>
!         </xsl:variable>
!         <xsl:for-each select="$all-operations[@name=$local-name]
! 	        [ancestor::wsdl:description/@targetNamespace=$namespace-name]
! 			[contains($interfaces-extended-by-this-one, concat('[',ancestor::wsdl:interface/@name,']'))]">
              <xsl:value-of select="generate-id(.)"/>
          </xsl:for-each>
      </xsl:template>
+ 
+ 	<xsl:template name="interface-list">
+ 		<xsl:param name="interface"/>
+ 		<xsl:text>[</xsl:text>
+ 		<xsl:value-of select="$interface/@name"/>
+     	<xsl:text>]</xsl:text>
+ 		<xsl:if test="$interface/@extends">
+ 	    	<xsl:call-template name="extended-interface-list">
+ 	    		<xsl:with-param name="interface-names" select="$interface/@extends"/>
+ 	    	</xsl:call-template>
+ 	    </xsl:if>
+ 	</xsl:template>
+ 
+ 	<xsl:template name="extended-interface-list">
+ 		<xsl:param name="interface-names"/>
+         <xsl:variable name="qnamesplit" select="concat(normalize-space($interface-names),' ')"/>
+         <xsl:variable name="firstqname" select="substring-before($qnamesplit,' ')"/>
+         <xsl:variable name="remainder" select="substring-after($qnamesplit,' ')"/>
+         <xsl:variable name="interface-local-name">
+             <xsl:choose>
+                 <xsl:when test="contains($firstqname, ':')"><xsl:value-of select="substring-after($firstqname, ':')"/></xsl:when>
+                 <xsl:otherwise><xsl:value-of select="$firstqname"/></xsl:otherwise>
+             </xsl:choose>
+         </xsl:variable>
+         <xsl:call-template name="interface-list">
+             <xsl:with-param name="interface" select="$all-interfaces[@name=$interface-local-name]"/>
+         </xsl:call-template>
+ 		<xsl:if test="$remainder != ''">
+ 	    	<xsl:call-template name="extended-interface-list">
+ 	    		<xsl:with-param name="interface-names" select="$remainder"/>
+ 	    	</xsl:call-template>
+ 	    </xsl:if>
+ 	</xsl:template>
+ 
      <xsl:template name="message-ref">
          <xsl:param name="label"/>
***************
*** 1081,1085 ****
          <xsl:param name="namespace-context" />
          <xsl:if test="$qnames != ''">
!             <xsl:variable name="qnamesplit" select="concat($qnames,' ')"/>
              <interface><xsl:attribute name="ref">
                  <xsl:call-template name="interface-ref">
--- 1115,1119 ----
          <xsl:param name="namespace-context" />
          <xsl:if test="$qnames != ''">
!             <xsl:variable name="qnamesplit" select="concat(normalize-space($qnames),' ')"/>
              <interface><xsl:attribute name="ref">
                  <xsl:call-template name="interface-ref">
Received on Thursday, 19 April 2007 06:32:55 UTC

This archive was generated by hypermail 2.4.0 : Friday, 17 January 2020 19:32:37 UTC