2002/ws/desc/test-suite/interchange ws-policy.xsd,NONE,1.1 oasis-200401-wss-wssecurity-utility-1.0.xsd,NONE,1.1 oasis-200401-wss-wssecurity-secext-1.0.xsd,NONE,1.1 xmldsig-core-schema.xsd,NONE,1.1 wsdlcm-ws-policy.xsd,NONE,1.1 wsdlcm-ws-addressing.xsd,1.1

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/interchange ws-policy.xsd,NONE,1.1 oasis-200401-wss-wssecurity-utility-1.0.xsd,NONE,1.1 oasis-200401-wss-wssecurity-secext-1.0.xsd,NONE,1.1 xmldsig-core-schema.xsd,NONE,1.1 wsdlcm-ws-policy.xsd,NONE,1.1 wsdlcm-ws-addressing.xsd,1.1

Philippe Le Hegaret via cvs-syncmail

Update of /sources/public/2002/ws/desc/test-suite/interchange
In directory hutz:/tmp/cvs-serv2328/test-suite/interchange

Modified Files:
        wsdlcm-ws-addressing.xsd wsdlcm.xsd
Added Files:
        ws-policy.xsd oasis-200401-wss-wssecurity-utility-1.0.xsd
        oasis-200401-wss-wssecurity-secext-1.0.xsd
        xmldsig-core-schema.xsd wsdlcm-ws-policy.xsd
Log Message:
Updated WSAddressing-1G to 2007/05 WS-A Metadata draft.
Updated interchange schemas to support WS-A Metadata.
Added interchange schemas to support WS-Policy extensions.
Added WS-A Metadata support and minimal WS-Policy support to wsdl-xslt.
Updated baseline and regenerated results and zips.

--- NEW FILE: xmldsig-core-schema.xsd ---
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE schema
  PUBLIC "-//W3C//DTD XMLSchema 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd"
 [
   <!ATTLIST schema
     xmlns:ds CDATA #FIXED "http://www.w3.org/2000/09/xmldsig#">
   <!ENTITY dsig 'http://www.w3.org/2000/09/xmldsig#'>
   <!ENTITY % p ''>
   <!ENTITY % s ''>
  ]>

<!-- Schema for XML Signatures
    http://www.w3.org/2000/09/xmldsig#
    $Revision$ on $Date$ by $Author$

    Copyright 2001 The Internet Society and W3C (Massachusetts Institute
    of Technology, Institut National de Recherche en Informatique et en
    Automatique, Keio University). All Rights Reserved.
    http://www.w3.org/Consortium/Legal/

    This document is governed by the W3C Software License [1] as described
    in the FAQ [2].

    [1] http://www.w3.org/Consortium/Legal/copyright-software-19980720
    [2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD
-->


<schema xmlns="http://www.w3.org/2001/XMLSchema"
        xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
        targetNamespace="http://www.w3.org/2000/09/xmldsig#"
        version="0.1" elementFormDefault="qualified">

<!-- Basic Types Defined for Signatures -->

<simpleType name="CryptoBinary">
  <restriction base="base64Binary">
  </restriction>
</simpleType>

<!-- Start Signature -->

<element name="Signature" type="ds:SignatureType"/>
<complexType name="SignatureType">
  <sequence>
    <element ref="ds:SignedInfo"/>
    <element ref="ds:SignatureValue"/>
    <element ref="ds:KeyInfo" minOccurs="0"/>
    <element ref="ds:Object" minOccurs="0" maxOccurs="unbounded"/>
  </sequence>  
  <attribute name="Id" type="ID" use="optional"/>
</complexType>

  <element name="SignatureValue" type="ds:SignatureValueType"/>
  <complexType name="SignatureValueType">
    <simpleContent>
      <extension base="base64Binary">
        <attribute name="Id" type="ID" use="optional"/>
      </extension>
    </simpleContent>
  </complexType>

<!-- Start SignedInfo -->

<element name="SignedInfo" type="ds:SignedInfoType"/>
<complexType name="SignedInfoType">
  <sequence>
    <element ref="ds:CanonicalizationMethod"/>
    <element ref="ds:SignatureMethod"/>
    <element ref="ds:Reference" maxOccurs="unbounded"/>
  </sequence>  
  <attribute name="Id" type="ID" use="optional"/>
</complexType>

  <element name="CanonicalizationMethod" type="ds:CanonicalizationMethodType"/>
  <complexType name="CanonicalizationMethodType" mixed="true">
    <sequence>
      <any namespace="##any" minOccurs="0" maxOccurs="unbounded"/>
      <!-- (0,unbounded) elements from (1,1) namespace -->
    </sequence>
    <attribute name="Algorithm" type="anyURI" use="required"/>
  </complexType>

  <element name="SignatureMethod" type="ds:SignatureMethodType"/>
  <complexType name="SignatureMethodType" mixed="true">
    <sequence>
      <element name="HMACOutputLength" minOccurs="0" type="ds:HMACOutputLengthType"/>
      <any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
      <!-- (0,unbounded) elements from (1,1) external namespace -->
    </sequence>
    <attribute name="Algorithm" type="anyURI" use="required"/>
  </complexType>

<!-- Start Reference -->

<element name="Reference" type="ds:ReferenceType"/>
<complexType name="ReferenceType">
  <sequence>
    <element ref="ds:Transforms" minOccurs="0"/>
    <element ref="ds:DigestMethod"/>
    <element ref="ds:DigestValue"/>
  </sequence>
  <attribute name="Id" type="ID" use="optional"/>
  <attribute name="URI" type="anyURI" use="optional"/>
  <attribute name="Type" type="anyURI" use="optional"/>
</complexType>

  <element name="Transforms" type="ds:TransformsType"/>
  <complexType name="TransformsType">
    <sequence>
      <element ref="ds:Transform" maxOccurs="unbounded"/>  
    </sequence>
  </complexType>

  <element name="Transform" type="ds:TransformType"/>
  <complexType name="TransformType" mixed="true">
    <choice minOccurs="0" maxOccurs="unbounded">
      <any namespace="##other" processContents="lax"/>
      <!-- (1,1) elements from (0,unbounded) namespaces -->
      <element name="XPath" type="string"/>
    </choice>
    <attribute name="Algorithm" type="anyURI" use="required"/>
  </complexType>

<!-- End Reference -->

<element name="DigestMethod" type="ds:DigestMethodType"/>
<complexType name="DigestMethodType" mixed="true">
  <sequence>
    <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
  </sequence>    
  <attribute name="Algorithm" type="anyURI" use="required"/>
</complexType>

<element name="DigestValue" type="ds:DigestValueType"/>
<simpleType name="DigestValueType">
  <restriction base="base64Binary"/>
</simpleType>

<!-- End SignedInfo -->

<!-- Start KeyInfo -->

<element name="KeyInfo" type="ds:KeyInfoType"/>
<complexType name="KeyInfoType" mixed="true">
  <choice maxOccurs="unbounded">    
    <element ref="ds:KeyName"/>
    <element ref="ds:KeyValue"/>
    <element ref="ds:RetrievalMethod"/>
    <element ref="ds:X509Data"/>
    <element ref="ds:PGPData"/>
    <element ref="ds:SPKIData"/>
    <element ref="ds:MgmtData"/>
    <any processContents="lax" namespace="##other"/>
    <!-- (1,1) elements from (0,unbounded) namespaces -->
  </choice>
  <attribute name="Id" type="ID" use="optional"/>
</complexType>

  <element name="KeyName" type="string"/>
  <element name="MgmtData" type="string"/>

  <element name="KeyValue" type="ds:KeyValueType"/>
  <complexType name="KeyValueType" mixed="true">
   <choice>
     <element ref="ds:DSAKeyValue"/>
     <element ref="ds:RSAKeyValue"/>
     <any namespace="##other" processContents="lax"/>
   </choice>
  </complexType>

  <element name="RetrievalMethod" type="ds:RetrievalMethodType"/>
  <complexType name="RetrievalMethodType">
    <sequence>
      <element ref="ds:Transforms" minOccurs="0"/>
    </sequence>  
    <attribute name="URI" type="anyURI"/>
    <attribute name="Type" type="anyURI" use="optional"/>
  </complexType>

<!-- Start X509Data -->

<element name="X509Data" type="ds:X509DataType"/>
<complexType name="X509DataType">
  <sequence maxOccurs="unbounded">
    <choice>
      <element name="X509IssuerSerial" type="ds:X509IssuerSerialType"/>
      <element name="X509SKI" type="base64Binary"/>
      <element name="X509SubjectName" type="string"/>
      <element name="X509Certificate" type="base64Binary"/>
      <element name="X509CRL" type="base64Binary"/>
      <any namespace="##other" processContents="lax"/>
    </choice>
  </sequence>
</complexType>

<complexType name="X509IssuerSerialType">
  <sequence>
    <element name="X509IssuerName" type="string"/>
    <element name="X509SerialNumber" type="integer"/>
  </sequence>
</complexType>

<!-- End X509Data -->

<!-- Begin PGPData -->

<element name="PGPData" type="ds:PGPDataType"/>
<complexType name="PGPDataType">
  <choice>
    <sequence>
      <element name="PGPKeyID" type="base64Binary"/>
      <element name="PGPKeyPacket" type="base64Binary" minOccurs="0"/>
      <any namespace="##other" processContents="lax" minOccurs="0"
       maxOccurs="unbounded"/>
    </sequence>
    <sequence>
      <element name="PGPKeyPacket" type="base64Binary"/>
      <any namespace="##other" processContents="lax" minOccurs="0"
       maxOccurs="unbounded"/>
    </sequence>
  </choice>
</complexType>

<!-- End PGPData -->

<!-- Begin SPKIData -->

<element name="SPKIData" type="ds:SPKIDataType"/>
<complexType name="SPKIDataType">
  <sequence maxOccurs="unbounded">
    <element name="SPKISexp" type="base64Binary"/>
    <any namespace="##other" processContents="lax" minOccurs="0"/>
  </sequence>
</complexType>

<!-- End SPKIData -->

<!-- End KeyInfo -->

<!-- Start Object (Manifest, SignatureProperty) -->

<element name="Object" type="ds:ObjectType"/>
<complexType name="ObjectType" mixed="true">
  <sequence minOccurs="0" maxOccurs="unbounded">
    <any namespace="##any" processContents="lax"/>
  </sequence>
  <attribute name="Id" type="ID" use="optional"/>
  <attribute name="MimeType" type="string" use="optional"/> <!-- add a grep facet -->
  <attribute name="Encoding" type="anyURI" use="optional"/>
</complexType>

<element name="Manifest" type="ds:ManifestType"/>
<complexType name="ManifestType">
  <sequence>
    <element ref="ds:Reference" maxOccurs="unbounded"/>
  </sequence>
  <attribute name="Id" type="ID" use="optional"/>
</complexType>

<element name="SignatureProperties" type="ds:SignaturePropertiesType"/>
<complexType name="SignaturePropertiesType">
  <sequence>
    <element ref="ds:SignatureProperty" maxOccurs="unbounded"/>
  </sequence>
  <attribute name="Id" type="ID" use="optional"/>
</complexType>

   <element name="SignatureProperty" type="ds:SignaturePropertyType"/>
   <complexType name="SignaturePropertyType" mixed="true">
     <choice maxOccurs="unbounded">
       <any namespace="##other" processContents="lax"/>
       <!-- (1,1) elements from (1,unbounded) namespaces -->
     </choice>
     <attribute name="Target" type="anyURI" use="required"/>
     <attribute name="Id" type="ID" use="optional"/>
   </complexType>

<!-- End Object (Manifest, SignatureProperty) -->

<!-- Start Algorithm Parameters -->

<simpleType name="HMACOutputLengthType">
  <restriction base="integer"/>
</simpleType>

<!-- Start KeyValue Element-types -->

<element name="DSAKeyValue" type="ds:DSAKeyValueType"/>
<complexType name="DSAKeyValueType">
  <sequence>
    <sequence minOccurs="0">
      <element name="P" type="ds:CryptoBinary"/>
      <element name="Q" type="ds:CryptoBinary"/>
    </sequence>
    <element name="G" type="ds:CryptoBinary" minOccurs="0"/>
    <element name="Y" type="ds:CryptoBinary"/>
    <element name="J" type="ds:CryptoBinary" minOccurs="0"/>
    <sequence minOccurs="0">
      <element name="Seed" type="ds:CryptoBinary"/>
      <element name="PgenCounter" type="ds:CryptoBinary"/>
    </sequence>
  </sequence>
</complexType>

<element name="RSAKeyValue" type="ds:RSAKeyValueType"/>
<complexType name="RSAKeyValueType">
  <sequence>
    <element name="Modulus" type="ds:CryptoBinary"/>
    <element name="Exponent" type="ds:CryptoBinary"/>
  </sequence>
</complexType>

<!-- End KeyValue Element-types -->

<!-- End Signature -->

</schema>

Index: wsdlcm.xsd
===================================================================
RCS file: /sources/public/2002/ws/desc/test-suite/interchange/wsdlcm.xsd,v
retrieving revision 1.18
retrieving revision 1.19
diff -C 2 -d -r1.18 -r1.19
*** wsdlcm.xsd 23 Mar 2007 05:51:17 -0000 1.18
--- wsdlcm.xsd 7 Jul 2007 01:12:32 -0000 1.19
***************
*** 34,37 ****
--- 34,38 ----
  xmlns:cmwsa="http://www.w3.org/2002/ws/desc/wsdl/component-ws-addressing"
  xmlns:cmsawsdl="http://www.w3.org/2002/ws/desc/wsdl/component-sawsdl"
+ xmlns:cmwsp="http://www.w3.org/2002/ws/desc/wsdl/component-ws-policy"
  targetNamespace="http://www.w3.org/2002/ws/desc/wsdl/component"
  elementFormDefault="qualified">
***************
*** 62,65 ****
--- 63,70 ----
 
  <xs:import
+ namespace="http://www.w3.org/2002/ws/desc/wsdl/component-ws-policy"
+ schemaLocation="wsdlcm-ws-policy.xsd" />
+
+ <xs:import
  namespace="http://www.w3.org/2002/ws/desc/wsdl/component-sawsdl"
  schemaLocation="wsdlcm-sawsdl.xsd" />
***************
*** 193,196 ****
--- 198,209 ----
  <xs:element name="interfaceOperations"
  type="InterfaceOperationComponents" minOccurs="0" />
+ <xs:element ref="cmwsp:wspInterfaceExtension" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>
+ MUST occur if the ws-policy extension is
+ supported.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
  <xs:element ref="cmsawsdl:sawsdlInterfaceExtension"
  minOccurs="0">
***************
*** 246,260 ****
  type="cmbase:Ref" minOccurs="0" />
  <xs:element ref="cmbase:parent" />
! <xs:element ref="cmwsa:wsaInterfaceFaultExtension"
! minOccurs="0">
  <xs:annotation>
  <xs:documentation>
! MUST occur if the WS-Addressing 1.0 extension is
  supported.
  </xs:documentation>
  </xs:annotation>
  </xs:element>
! <xs:element ref="cmsawsdl:sawsdlInterfaceFaultExtension"
! minOccurs="0">
  <xs:annotation>
  <xs:documentation>
--- 259,271 ----
  type="cmbase:Ref" minOccurs="0" />
  <xs:element ref="cmbase:parent" />
! <xs:element ref="cmwsp:wspInterfaceFaultExtension" minOccurs="0">
  <xs:annotation>
  <xs:documentation>
! MUST occur if the ws-policy extension is
  supported.
  </xs:documentation>
  </xs:annotation>
  </xs:element>
! <xs:element ref="cmsawsdl:sawsdlInterfaceFaultExtension" minOccurs="0">
  <xs:annotation>
  <xs:documentation>
***************
*** 324,327 ****
--- 335,346 ----
  </xs:annotation>
  </xs:element>
+ <xs:element ref="cmwsp:wspInterfaceOperationExtension" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>
+ MUST occur if the ws-policy extension is
+ supported.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
  <xs:element
  ref="cmsawsdl:sawsdlInterfaceOperationExtension"
***************
*** 370,373 ****
--- 389,400 ----
  type="cmbase:Ref" minOccurs="0" />
  <xs:element ref="cmbase:parent" />
+ <xs:element ref="cmwsp:wspInterfaceMessageReferenceExtension" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>
+ MUST occur if the ws-policy extension is
+ supported.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
  <xs:element ref="cmwsa:wsaInterfaceMessageReferenceExtension"
  minOccurs="0">
***************
*** 412,415 ****
--- 439,458 ----
  type="cmbase:Direction" />
  <xs:element ref="cmbase:parent" />
+ <xs:element ref="cmwsp:wspInterfaceFaultReferenceExtension" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>
+ MUST occur if the ws-policy extension is
+ supported.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element ref="cmwsa:wsaInterfaceFaultReferenceExtension" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>
+ MUST occur if the WS-Addressing 1.0 extension is
+ supported.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
  </xs:sequence>
  </xs:restriction>
***************
*** 446,451 ****
  <xs:element name="bindingOperations"
  type="BindingOperationComponents" minOccurs="0" />
! <xs:element ref="cmhttp:httpBindingExtension"
! minOccurs="0">
  <xs:annotation>
  <xs:documentation>
--- 489,493 ----
  <xs:element name="bindingOperations"
  type="BindingOperationComponents" minOccurs="0" />
! <xs:element ref="cmhttp:httpBindingExtension" minOccurs="0">
  <xs:annotation>
  <xs:documentation>
***************
*** 457,462 ****
  </xs:annotation>
  </xs:element>
! <xs:element ref="cmsoap:soapBindingExtension"
! minOccurs="0">
  <xs:annotation>
  <xs:documentation>
--- 499,503 ----
  </xs:annotation>
  </xs:element>
! <xs:element ref="cmsoap:soapBindingExtension" minOccurs="0">
  <xs:annotation>
  <xs:documentation>
***************
*** 468,476 ****
  </xs:annotation>
  </xs:element>
! <xs:element ref="cmwsa:wsaBindingExtension"
! minOccurs="0">
  <xs:annotation>
  <xs:documentation>
! MUST occur if the WS-Addressing 1.0 extension is
  supported.
  </xs:documentation>
--- 509,516 ----
  </xs:annotation>
  </xs:element>
! <xs:element ref="cmwsp:wspBindingExtension" minOccurs="0">
  <xs:annotation>
  <xs:documentation>
! MUST occur if the ws-policy extension is
  supported.
  </xs:documentation>
***************
*** 505,510 ****
  <xs:element name="interfaceFault" type="cmbase:Ref" />
  <xs:element ref="cmbase:parent" />
! <xs:element ref="cmhttp:httpBindingFaultExtension"
! minOccurs="0">
  <xs:annotation>
  <xs:documentation>
--- 545,549 ----
  <xs:element name="interfaceFault" type="cmbase:Ref" />
  <xs:element ref="cmbase:parent" />
! <xs:element ref="cmhttp:httpBindingFaultExtension" minOccurs="0">
  <xs:annotation>
  <xs:documentation>
***************
*** 516,521 ****
  </xs:annotation>
  </xs:element>
! <xs:element ref="cmsoap:soapBindingFaultExtension"
! minOccurs="0">
  <xs:annotation>
  <xs:documentation>
--- 555,559 ----
  </xs:annotation>
  </xs:element>
! <xs:element ref="cmsoap:soapBindingFaultExtension" minOccurs="0">
  <xs:annotation>
  <xs:documentation>
***************
*** 527,530 ****
--- 565,576 ----
  </xs:annotation>
  </xs:element>
+ <xs:element ref="cmwsp:wspBindingFaultExtension" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>
+ MUST occur if the ws-policy extension is
+ supported.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
  </xs:sequence>
  </xs:restriction>
***************
*** 561,566 ****
  type="BindingFaultReferenceComponents" minOccurs="0" />
  <xs:element ref="cmbase:parent" />
! <xs:element
! ref="cmhttp:httpBindingOperationExtension" minOccurs="0">
  <xs:annotation>
  <xs:documentation>
--- 607,611 ----
  type="BindingFaultReferenceComponents" minOccurs="0" />
  <xs:element ref="cmbase:parent" />
! <xs:element ref="cmhttp:httpBindingOperationExtension" minOccurs="0">
  <xs:annotation>
  <xs:documentation>
***************
*** 583,591 ****
  </xs:annotation>
  </xs:element>
! <xs:element ref="cmwsa:wsaBindingOperationExtension"
! minOccurs="0">
  <xs:annotation>
  <xs:documentation>
! MUST occur if the WS-Addressing 1.0 extension is
  supported.
  </xs:documentation>
--- 628,635 ----
  </xs:annotation>
  </xs:element>
! <xs:element ref="cmwsp:wspBindingOperationExtension" minOccurs="0">
  <xs:annotation>
  <xs:documentation>
! MUST occur if the ws-policy extension is
  supported.
  </xs:documentation>
***************
*** 623,628 ****
  type="cmbase:Ref" />
  <xs:element ref="cmbase:parent" />
! <xs:element
! ref="cmhttp:httpBindingMessageReferenceExtension" minOccurs="0">
  <xs:annotation>
  <xs:documentation>
--- 667,671 ----
  type="cmbase:Ref" />
  <xs:element ref="cmbase:parent" />
! <xs:element ref="cmhttp:httpBindingMessageReferenceExtension" minOccurs="0">
  <xs:annotation>
  <xs:documentation>
***************
*** 634,639 ****
  </xs:annotation>
  </xs:element>
! <xs:element
! ref="cmsoap:soapBindingMessageReferenceExtension" minOccurs="0">
  <xs:annotation>
  <xs:documentation>
--- 677,681 ----
  </xs:annotation>
  </xs:element>
! <xs:element ref="cmsoap:soapBindingMessageReferenceExtension" minOccurs="0">
  <xs:annotation>
  <xs:documentation>
***************
*** 645,648 ****
--- 687,698 ----
  </xs:annotation>
  </xs:element>
+ <xs:element ref="cmwsp:wspBindingMessageReferenceExtension" minOccurs="0">
+ <xs:annotation>
+ <xs:documentation>
+ MUST occur if the ws-policy extension is
+ supported.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
  </xs:sequence>
  </xs:restriction>
***************
*** 677,684 ****
  type="cmbase:Ref" />
  <xs:element ref="cmbase:parent" />
! <xs:element
! ref="cmsoap:soapBindingFaultReferenceExtension" minOccurs="0"/>
  </xs:sequence>
-
  </xs:restriction>
  </xs:complexContent>
--- 727,740 ----
  type="cmbase:Ref" />
  <xs:element ref="cmbase:parent" />
! <xs:element ref="cmsoap:soapBindingFaultReferenceExtension" minOccurs="0"/>
! <xs:element ref="cmwsp:wspBindingFaultReferenceExtension" minOccurs="0">
! <xs:annotation>
! <xs:documentation>
! MUST occur if the ws-policy extension is
! supported.
! </xs:documentation>
! </xs:annotation>
! </xs:element>
  </xs:sequence>
  </xs:restriction>
  </xs:complexContent>
***************
*** 708,713 ****
  <xs:element name="name" type="cmbase:QName" />
  <xs:element name="interface" type="cmbase:Ref" />
! <xs:element name="endpoints"
! type="EndpointComponents" />
  </xs:sequence>
  </xs:restriction>
--- 764,776 ----
  <xs:element name="name" type="cmbase:QName" />
  <xs:element name="interface" type="cmbase:Ref" />
! <xs:element name="endpoints" type="EndpointComponents" />
! <xs:element ref="cmwsp:wspServiceExtension" minOccurs="0">
! <xs:annotation>
! <xs:documentation>
! MUST occur if the ws-policy extension is
! supported.
! </xs:documentation>
! </xs:annotation>
! </xs:element>
  </xs:sequence>
  </xs:restriction>
***************
*** 741,746 ****
  minOccurs="0" />
  <xs:element ref="cmbase:parent" />
! <xs:element ref="cmhttp:httpEndpointExtension"
! minOccurs="0">
  <xs:annotation>
  <xs:documentation>
--- 804,808 ----
  minOccurs="0" />
  <xs:element ref="cmbase:parent" />
! <xs:element ref="cmhttp:httpEndpointExtension" minOccurs="0">
  <xs:annotation>
  <xs:documentation>
***************
*** 752,757 ****
  </xs:annotation>
  </xs:element>
! <xs:element ref="cmsoap:soapEndpointExtension"
! minOccurs="0">
  <xs:annotation>
  <xs:documentation>
--- 814,818 ----
  </xs:annotation>
  </xs:element>
! <xs:element ref="cmsoap:soapEndpointExtension" minOccurs="0">
  <xs:annotation>
  <xs:documentation>
***************
*** 763,768 ****
  </xs:annotation>
  </xs:element>
! <xs:element ref="cmwsa:wsaEndpointExtension"
! minOccurs="0">
  <xs:annotation>
  <xs:documentation>
--- 824,836 ----
  </xs:annotation>
  </xs:element>
! <xs:element ref="cmwsp:wspEndpointExtension" minOccurs="0">
! <xs:annotation>
! <xs:documentation>
! MUST occur if the ws-policy extension is
! supported.
! </xs:documentation>
! </xs:annotation>
! </xs:element>
! <xs:element ref="cmwsa:wsaEndpointExtension" minOccurs="0">
  <xs:annotation>
  <xs:documentation>

--- NEW FILE: wsdlcm-ws-policy.xsd ---
<?xml version="1.0" encoding="UTF-8"?>
<!--
       
        Schema for WSDL 2.0 WS-Policy 1.5 Component Model Interchange Format
       
        This format is used to compare component model instances computed by different implementation.
       
        ChangeLog:
       
        2007-07-06 Jonathan Marsh ([hidden email])
        - created
       
-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
        xmlns="http://www.w3.org/2002/ws/desc/wsdl/component-ws-policy"
        targetNamespace="http://www.w3.org/2002/ws/desc/wsdl/component-ws-policy"
        xmlns:wsp="http://www.w3.org/ns/ws-policy"
        elementFormDefault="qualified">

        <xs:import
                namespace="http://www.w3.org/ns/ws-policy"
                schemaLocation="http://www.w3.org/2007/02/ws-policy.xsd" />

        <xs:element name="policy">
                <xs:complexType>
                        <xs:sequence>
                                <xs:element ref="wsp:Policy" minOccurs="0"/>
                        </xs:sequence>
                </xs:complexType>
        </xs:element>
       
        <xs:element name="wspServiceExtension" type="WspServiceExtension" />
        <xs:element name="wspEndpointExtension" type="WspEndpointExtension" />
        <xs:element name="wspBindingExtension" type="WspBindingExtension" />
        <xs:element name="wspBindingOperationExtension" type="WspBindingOperationExtension" />
        <xs:element name="wspBindingFaultExtension" type="WspBindingFaultExtension" />
        <xs:element name="wspBindingMessageReferenceExtension" type="WspBindingMessageReferenceExtension" />
        <xs:element name="wspBindingFaultReferenceExtension" type="WspBindingFaultReferenceExtension" />
        <xs:element name="wspInterfaceExtension" type="WspInterfaceExtension" />
        <xs:element name="wspInterfaceOperationExtension" type="WspInterfaceOperationExtension" />
        <xs:element name="wspInterfaceFaultExtension" type="WspInterfaceFaultExtension" />
        <xs:element name="wspInterfaceMessageReferenceExtension" type="WspInterfaceMessageReferenceExtension" />
        <xs:element name="wspInterfaceFaultReferenceExtension" type="WspInterfaceFaultReferenceExtension" />

        <xs:complexType name="WspServiceExtension">
                <xs:sequence>
                        <xs:element ref="policy" minOccurs="0"/>
                </xs:sequence>
        </xs:complexType>

        <xs:complexType name="WspEndpointExtension">
                <xs:sequence>
                        <xs:element ref="policy" minOccurs="0"/>
                </xs:sequence>
        </xs:complexType>

        <xs:complexType name="WspBindingExtension">
                <xs:sequence>
                        <xs:element ref="policy" minOccurs="0"/>
                </xs:sequence>
        </xs:complexType>

        <xs:complexType name="WspBindingOperationExtension">
                <xs:sequence>
                        <xs:element ref="policy" minOccurs="0"/>
                </xs:sequence>
        </xs:complexType>

        <xs:complexType name="WspBindingFaultExtension">
                <xs:sequence>
                        <xs:element ref="policy" minOccurs="0"/>
                </xs:sequence>
        </xs:complexType>

        <xs:complexType name="WspBindingMessageReferenceExtension">
                <xs:sequence>
                        <xs:element ref="policy" minOccurs="0"/>
                </xs:sequence>
        </xs:complexType>

        <xs:complexType name="WspBindingFaultReferenceExtension">
                <xs:sequence>
                        <xs:element ref="policy" minOccurs="0"/>
                </xs:sequence>
        </xs:complexType>

        <xs:complexType name="WspInterfaceExtension">
                <xs:sequence>
                        <xs:element ref="policy" minOccurs="0"/>
                </xs:sequence>
        </xs:complexType>

        <xs:complexType name="WspInterfaceOperationExtension">
                <xs:sequence>
                        <xs:element ref="policy" minOccurs="0"/>
                </xs:sequence>
        </xs:complexType>

        <xs:complexType name="WspInterfaceFaultExtension">
                <xs:sequence>
                        <xs:element ref="policy" minOccurs="0"/>
                </xs:sequence>
        </xs:complexType>

        <xs:complexType name="WspInterfaceMessageReferenceExtension">
                <xs:sequence>
                        <xs:element ref="policy" minOccurs="0"/>
                </xs:sequence>
        </xs:complexType>

        <xs:complexType name="WspInterfaceFaultReferenceExtension">
                <xs:sequence>
                        <xs:element ref="policy" minOccurs="0"/>
                </xs:sequence>
        </xs:complexType>

</xs:schema>
Index: wsdlcm-ws-addressing.xsd
===================================================================
RCS file: /sources/public/2002/ws/desc/test-suite/interchange/wsdlcm-ws-addressing.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** wsdlcm-ws-addressing.xsd 1 Dec 2006 23:44:12 -0000 1.1
--- wsdlcm-ws-addressing.xsd 7 Jul 2007 01:12:32 -0000 1.2
***************
*** 22,34 ****
  schemaLocation="ws-addr.xsd" />
 
! <xs:element name="wsaInterfaceFaultExtension"
! type="WsaInterfaceFaultExtension" />
!
! <xs:complexType name="WsaInterfaceFaultExtension">
! <xs:sequence>
! <xs:element ref="action" />
! </xs:sequence>
! </xs:complexType>
!
  <xs:element name="wsaInterfaceMessageReferenceExtension"
  type="WsaInterfaceMessageReferenceExtension" />
--- 22,28 ----
  schemaLocation="ws-addr.xsd" />
 
! <xs:element name="action" type="xs:anyURI" />
! <xs:element name="endpointAddress" type="wsa:EndpointReferenceType" />
!
  <xs:element name="wsaInterfaceMessageReferenceExtension"
  type="WsaInterfaceMessageReferenceExtension" />
***************
*** 40,61 ****
  </xs:complexType>
 
! <xs:element name="wsaBindingExtension"
! type="WsaBindingExtension" />
!
! <xs:complexType name="WsaBindingExtension">
! <xs:sequence>
! <xs:element ref="addressing" minOccurs="0"/>
! </xs:sequence>
! </xs:complexType>
!
! <xs:element name="wsaBindingOperationExtension"
! type="WsaBindingOperationExtension" />
!
! <xs:complexType name="WsaBindingOperationExtension">
  <xs:sequence>
! <xs:element ref="anonymousAddresses" minOccurs="0"/>
  </xs:sequence>
  </xs:complexType>
!
  <xs:element name="wsaEndpointExtension"
  type="WsaEndpointExtension" />
--- 34,46 ----
  </xs:complexType>
 
! <xs:element name="wsaInterfaceFaultReferenceExtension"
! type="WsaInterfaceFaultReferenceExtension" />
!
! <xs:complexType name="WsaInterfaceFaultReferenceExtension">
  <xs:sequence>
! <xs:element ref="action" />
  </xs:sequence>
  </xs:complexType>
!
  <xs:element name="wsaEndpointExtension"
  type="WsaEndpointExtension" />
***************
*** 63,82 ****
  <xs:complexType name="WsaEndpointExtension">
  <xs:sequence>
! <xs:element ref="addressing" minOccurs="0"/>
! <xs:element ref="wsa:EndpointReference" minOccurs="0"/>
  </xs:sequence>
  </xs:complexType>
 
- <xs:element name="addressing" type="xs:boolean" />
- <xs:element name="action" type="xs:anyURI" />
- <xs:element name="anonymousAddresses">
- <xs:simpleType>
- <xs:restriction base="xs:token">
- <xs:enumeration value="required"/>
- <xs:enumeration value="prohibited"/>
- <xs:enumeration value="optional"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
-
  </xs:schema>
\ No newline at end of file
--- 48,54 ----
  <xs:complexType name="WsaEndpointExtension">
  <xs:sequence>
! <xs:element ref="endpointAddress" minOccurs="0"/>
  </xs:sequence>
  </xs:complexType>
 
  </xs:schema>
\ No newline at end of file

--- NEW FILE: ws-policy.xsd ---
<?xml version='1.0' encoding='utf-8' ?>
<!--

    W3C XML Schema defined in the Web Services Policy 1.5
    Framework specification

    http://www.w3.org/TR/ws-policy-framework

   Copyright © 2006 World Wide Web Consortium,

   (Massachusetts Institute of Technology, European Research Consortium for
   Informatics and Mathematics, Keio University). All Rights Reserved. This
   work is distributed under the W3C® Software License [1] in the hope that
   it will be useful, but WITHOUT ANY WARRANTY; without even the implied
   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

   [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231

   $Id$
-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
        xmlns:tns="http://www.w3.org/ns/ws-policy"
        xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"
        xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
        targetNamespace="http://www.w3.org/ns/ws-policy" blockDefault="#all"
        elementFormDefault="qualified">
       
  <xs:import
      namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"
      schemaLocation="oasis-200401-wss-wssecurity-secext-1.0.xsd" />

  <xs:import
      namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
      schemaLocation="oasis-200401-wss-wssecurity-utility-1.0.xsd" />
 
  <xs:import
      namespace="http://www.w3.org/XML/1998/namespace"
      schemaLocation="xml.xsd" />
 
        <!-- Constructs from the Web Services Policy 1.5 Framework -->

  <xs:element name="Policy" >
    <xs:complexType>

      <xs:complexContent>
        <xs:extension base="tns:OperatorContentType" >
          <xs:attribute name="Name" type="xs:anyURI" />
          <xs:anyAttribute namespace="##any" processContents="lax" />
        </xs:extension>
      </xs:complexContent>
    </xs:complexType>
  </xs:element>

  <xs:element name="All" type="tns:OperatorContentType" />
  <xs:element name="ExactlyOne" type="tns:OperatorContentType" />

  <xs:complexType name="OperatorContentType" >
    <xs:sequence>
      <xs:choice minOccurs="0" maxOccurs="unbounded" >
        <xs:element ref="tns:Policy" />
        <xs:element ref="tns:All" />
        <xs:element ref="tns:ExactlyOne" />

        <xs:element ref="tns:PolicyReference" />
        <xs:any namespace="##other" processContents="lax" />
      </xs:choice>
    </xs:sequence>
  </xs:complexType>

  <xs:element name="PolicyReference" >
    <xs:complexType>
      <xs:sequence>
        <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
      </xs:sequence>
      <xs:attribute name="URI" type="xs:anyURI" use="required" />

      <xs:attribute name="Digest" type="xs:base64Binary" />
      <xs:attribute name="DigestAlgorithm"
                    type="xs:anyURI"
                    default="http://www.w3.org/ns/ws-policy/Sha1Exc"
                    />
      <xs:anyAttribute namespace="##any" processContents="lax" />
    </xs:complexType>
  </xs:element>

  <xs:attribute name="Optional" type="xs:boolean" default="false" />
  <xs:attribute name="Ignorable" type="xs:boolean" default="false" />
 
        <!-- Constructs from the Web Services Policy 1.5 Attachment -->

  <xs:attribute name="PolicyURIs" >
    <xs:simpleType>
      <xs:list itemType="xs:anyURI" />
    </xs:simpleType>
  </xs:attribute>

  <xs:element name="PolicyAttachment" >
    <xs:complexType>
      <xs:sequence>

        <xs:element ref="tns:AppliesTo" />
        <xs:choice maxOccurs="unbounded" >
          <xs:element ref="tns:Policy" />
          <xs:element ref="tns:PolicyReference" />
        </xs:choice>
        <!-- omitted only because it causes the content model to be non-determistic
        <xs:element ref="wsse:Security" minOccurs="0" />
-->
        <xs:any namespace="##other"
                processContents="lax"
                minOccurs="0"
                maxOccurs="unbounded" />
      </xs:sequence>
      <xs:anyAttribute namespace="##any" processContents="lax" />

    </xs:complexType>
  </xs:element>

  <xs:element name="AppliesTo" >
    <xs:complexType>
      <xs:sequence>
        <xs:any namespace="##any"
                processContents="lax"
                maxOccurs="unbounded" />
      </xs:sequence>
      <xs:anyAttribute namespace="##any" processContents="lax" />

    </xs:complexType>
  </xs:element>

  <xs:element name="URI">
    <xs:complexType>
      <xs:simpleContent>
        <xs:extension base="xs:anyURI">
          <xs:anyAttribute namespace="##any" processContents="lax" />
        </xs:extension>
      </xs:simpleContent>
    </xs:complexType>
  </xs:element>
 
</xs:schema>

--- NEW FILE: oasis-200401-wss-wssecurity-utility-1.0.xsd ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: oasis-200401-wss-wssecurity-secext-1.0.xsd ---
(This appears to be a binary file; contents omitted.)