2002/ws/desc/test-suite/results-messages generate-message-properties.xslt,1.14,1.15

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

2002/ws/desc/test-suite/results-messages generate-message-properties.xslt,1.14,1.15

Philippe Le Hegaret via cvs-syncmail

Update of /sources/public/2002/ws/desc/test-suite/results-messages
In directory hutz:/tmp/cvs-serv16313

Modified Files:
        generate-message-properties.xslt
Log Message:
Added *very* basic WS-Policy 1.5 support for the Addressing assertion. Added WS-Addressing Metadata support

Index: generate-message-properties.xslt
===================================================================
RCS file: /sources/public/2002/ws/desc/test-suite/results-messages/generate-message-properties.xslt,v
retrieving revision 1.14
retrieving revision 1.15
diff -C 2 -d -r1.14 -r1.15
*** generate-message-properties.xslt 23 Mar 2007 05:50:53 -0000 1.14
--- generate-message-properties.xslt 9 Jul 2007 18:51:25 -0000 1.15
***************
*** 16,19 ****
--- 16,23 ----
                  xmlns:cmrpc='http://www.w3.org/2002/ws/desc/wsdl/component-rpc'
                  xmlns:cmsoap='http://www.w3.org/2002/ws/desc/wsdl/component-soap'
+ xmlns:wspcm="http://www.w3.org/2002/ws/desc/wsdl/component-ws-policy"
+ xmlns:wsp="http://www.w3.org/ns/ws-policy"
+ xmlns:wsacm="http://www.w3.org/2002/ws/desc/wsdl/component-ws-addressing"
+ xmlns:wsa="http://www.w3.org/2005/08/addressing"
                  exclude-result-prefixes='cmsoap cmrpc cmhttp cmbase cmextensions cm'>
 
***************
*** 267,271 ****
                    select='$bindingOperationComponent/cm:bindingFaultReferences/cm:bindingFaultReferenceComponent[cm:interfaceFaultReference[@ref=$interfaceFaultComponent/@xml:id]]' />
 
!   <endpoint name='{$endpointComponent/cm:name}' />
      <binding localName='{$bindingComponent/cm:name/cmbase:localName}'
               namespace='{$bindingComponent/cm:name/cmbase:namespaceName}'
--- 271,275 ----
                    select='$bindingOperationComponent/cm:bindingFaultReferences/cm:bindingFaultReferenceComponent[cm:interfaceFaultReference[@ref=$interfaceFaultComponent/@xml:id]]' />
 
!     <endpoint name='{$endpointComponent/cm:name}' />
      <binding localName='{$bindingComponent/cm:name/cmbase:localName}'
               namespace='{$bindingComponent/cm:name/cmbase:namespaceName}'
***************
*** 280,283 ****
--- 284,290 ----
        <address><xsl:value-of select='$endpointComponent/cm:address' /></address>
      </xsl:if>
+     <xsl:if test='$endpointComponent/wsacm:wsaEndpointExtension/wsacm:endpointReference'>
+       <xsl:copy-of select="$endpointComponent/wsacm:wsaEndpointExtension/wsacm:endpointReference/wsa:EndpointReference"/>
+     </xsl:if>
      <xsl:for-each select='$interfaceOperationComponent/cm:style/cmbase:uri'>
        <style>
***************
*** 297,300 ****
--- 304,357 ----
          </httpCookies>
        </xsl:if>
+       <!-- @@in the list below, we're missing the policy attached to the service! -->
+       <xsl:if test='$endpointComponent/wspcm:wspEndpointExtension/wsacm:policy
+    or $bindingComponent/wspcm:wspBindingExtension/wsacm:policy
+    or $bindingOperationComponent/wspcm:wspBindingOperationExtension/wsacm:policy
+    or $interfaceOperationComponent/wspcm:wspInterfaceOperationExtension/wsacm:policy
+    or $interfaceMessageReferenceComponent/wspcm:wspInterfaceMessageReferenceExtension/wsacm:policy
+    or $interfaceFaultComponent/wspcm:wspInterfaceFaultExtension/wsacm:policy
+    or $interfaceMessageReferenceComponent/wspcm:wspInterfaceFaultReferenceExtension/wsacm:policy
+    or $bindingFaultComponent/wspcm:wspBindingFaultExtension/wsacm:policy
+    or $bindingFaultReferenceComponent/wspcm:wspInterfaceFaultReferenceExtension/wsacm:policy'>
+ <!-- We merge the policies -->
+ <wsp:Policy>
+  <xsl:call-template name='transformPolicy'>
+    <xsl:with-param name='policy'
+    select='$endpointComponent/wspcm:wspEndpointExtension/wsacm:policy'/>
+  </xsl:call-template>
+  <xsl:call-template name='transformPolicy'>
+    <xsl:with-param name='policy'
+    select='$bindingComponent/wspcm:wspBindingExtension/wsacm:policy'/>
+  </xsl:call-template>
+  <xsl:call-template name='transformPolicy'>
+    <xsl:with-param name='policy'
+    select='$bindingOperationComponent/wspcm:wspBindingOperationExtension/wsacm:policy/wsp:Policy/*'/>
+  </xsl:call-template>
+  <xsl:call-template name='transformPolicy'>
+    <xsl:with-param name='policy'
+    select='$interfaceOperationComponent/wspcm:wspInterfaceOperationExtension/wsacm:policy/wsp:Policy/*'/>
+  </xsl:call-template>
+  <xsl:call-template name='transformPolicy'>
+    <xsl:with-param name='policy'
+    select='$interfaceMessageReferenceComponent/wspcm:wspInterfaceMessageReferenceExtension/wsacm:policy/wsp:Policy/*'/>
+  </xsl:call-template>
+  <xsl:call-template name='transformPolicy'>
+    <xsl:with-param name='policy'
+    select='$interfaceFaultComponent/wspcm:wspInterfaceFaultExtension/wsacm:policy/wsp:Policy/*'/>
+  </xsl:call-template>
+  <xsl:call-template name='transformPolicy'>
+    <xsl:with-param name='policy'
+    select='$interfaceMessageReferenceComponent/wspcm:wspInterfaceFaultReferenceExtension/wsacm:policy/wsp:Policy/*'/>
+  </xsl:call-template>
+  <xsl:call-template name='transformPolicy'>
+    <xsl:with-param name='policy'
+    select='$bindingFaultComponent/wspcm:wspBindingFaultExtension/wsacm:policy/wsp:Policy/*'/>
+  </xsl:call-template>
+  <xsl:call-template name='transformPolicy'>
+    <xsl:with-param name='policy'
+    select='$bindingFaultReferenceComponent/wspcm:wspInterfaceFaultReferenceExtension/wsacm:policy/wsp:Policy/*'/>
+  </xsl:call-template>
+ </wsp:Policy>
+       </xsl:if>
        <xsl:if test='$bindingOperationComponent/cmsoap:soapBindingOperationExtension/cmhttp:httpLocation'>
          <httpLocation>
***************
*** 346,350 ****
              </xsl:when>
              <xsl:when test='$bindingComponent/cmsoap:soapBindingExtension/cmsoap:soapVersion="1.2"'>
!               <xsl:text>http://www.w3.org/2003/05/soap/mep/request-response/</xsl:text>            
              </xsl:when>
            </xsl:choose>
--- 403,407 ----
              </xsl:when>
              <xsl:when test='$bindingComponent/cmsoap:soapBindingExtension/cmsoap:soapVersion="1.2"'>
!               <xsl:text>http://www.w3.org/2003/05/soap/mep/request-response/</xsl:text>
              </xsl:when>
            </xsl:choose>
***************
*** 358,361 ****
--- 415,428 ----
            </soapAction>
          </xsl:if>
+ <xsl:if test='$interfaceMessageReferenceComponent/wsacm:wsaInterfaceMessageReferenceExtension/wsacm:action'>
+  <wsa:Action>
+    <xsl:value-of select='$interfaceMessageReferenceComponent/wsacm:wsaInterfaceMessageReferenceExtension/wsacm:action'/>
+  </wsa:Action>
+ </xsl:if>
+ <xsl:if test='$interfaceMessageReferenceComponent/wsacm:wsaInterfaceFaultReferenceExtension/wsacm:action'>
+  <wsa:Action>
+    <xsl:value-of select='$interfaceMessageReferenceComponent/wsacm:wsaInterfaceMessageReferenceExtension/wsacm:action'/>
+  </wsa:Action>
+ </xsl:if>
          <xsl:for-each select='$bindingMessageReferenceComponent/cmsoap:soapBindingMessageReferenceExtension/cmsoap:soapHeaders/cmsoap:soapHeaderBlockComponent'>
            <xsl:call-template name='generate-soap-header'>
***************
*** 705,707 ****
--- 772,783 ----
      </xsl:choose>
    </xsl:template>
+
+   <xsl:template name='transformPolicy'>
+     <xsl:param name='policy' />
+     <xsl:for-each select='$policy/wsp:Policy'>
+       <wsp:All>
+ <xsl:copy-of select='*'/>
+       </wsp:All>
+     </xsl:for-each>
+   </xsl:template>
  </xsl:stylesheet>