Author: dkulp
Date: Fri Feb 19 02:40:53 2010
New Revision: 911677
URL: http://svn.apache.org/viewvc?rev=911677&view=rev
Log:
[CXF-2680] Update version of wsdl schema we use for validation
Modified:
cxf/trunk/common/schemas/src/main/resources/schemas/wsdl/wsdl.xsd
Modified: cxf/trunk/common/schemas/src/main/resources/schemas/wsdl/wsdl.xsd
URL:
http://svn.apache.org/viewvc/cxf/trunk/common/schemas/src/main/resources/schemas/wsdl/wsdl.xsd?rev=911677&r1=911676&r2=911677&view=diff
==============================================================================
--- cxf/trunk/common/schemas/src/main/resources/schemas/wsdl/wsdl.xsd (original)
+++ cxf/trunk/common/schemas/src/main/resources/schemas/wsdl/wsdl.xsd Fri Feb
19 02:40:53 2010
@@ -11,7 +11,7 @@
license are distributed with them. The originals of these files can
be located at:
-http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd
+http://schemas.xmlsoap.org/wsdl/2004-08-24.xsd
THESE SCHEMA FILES ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO
REPRESENTATIONS
OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THESE FILES, INCLUDING, BUT NOT
@@ -50,8 +50,9 @@
<xs:element name="documentation" type="wsdl:tDocumentation"
minOccurs="0" />
</xs:sequence>
</xs:complexType>
-
- <xs:complexType name="tExtensibleAttributesDocumented" abstract="true" >
+
+ <!-- implemented resolution of swa124 -->
+ <xs:complexType name="tExtensibleAttributesDocumented" abstract="true" >
<xs:complexContent>
<xs:extension base="wsdl:tDocumented" >
<xs:annotation>
@@ -59,11 +60,15 @@
This type is extended by component types to allow attributes from
other namespaces to be added.
</xs:documentation>
</xs:annotation>
- <xs:anyAttribute namespace="##other" processContents="lax" />
+ <xs:sequence>
+ <xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded"
processContents="lax" />
+ </xs:sequence>
+ <xs:anyAttribute namespace="##other" processContents="lax" />
</xs:extension>
</xs:complexContent>
</xs:complexType>
+ <!-- implemented resolution of swa124 -->
<xs:complexType name="tExtensibleDocumented" abstract="true" >
<xs:complexContent>
<xs:extension base="wsdl:tDocumented" >
@@ -75,6 +80,7 @@
<xs:sequence>
<xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded"
processContents="lax" />
</xs:sequence>
+ <xs:anyAttribute namespace="##other" processContents="lax" />
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -128,18 +134,24 @@
</xs:choice>
</xs:group>
- <xs:complexType name="tDefinitions" >
+ <!-- implemented resolution of er015 and UPA fix. ASK -->
+ <xs:complexType name="tDefinitions">
<xs:complexContent>
- <xs:extension base="wsdl:tExtensibleDocumented" >
- <xs:sequence>
- <xs:group ref="wsdl:anyTopLevelOptionalElement" minOccurs="0"
maxOccurs="unbounded" />
+ <xs:extension base="wsdl:tExtensibleDocumented">
+ <xs:sequence minOccurs="0">
+ <xs:group ref="wsdl:anyTopLevelOptionalElement"/>
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:group ref="wsdl:anyTopLevelOptionalElement"/>
+ <xs:any namespace="##other" processContents="lax"/>
+ </xs:choice>
</xs:sequence>
- <xs:attribute name="targetNamespace" type="xs:anyURI" use="optional" />
- <xs:attribute name="name" type="xs:NCName" use="optional" />
+ <xs:attribute name="targetNamespace" type="xs:anyURI" use=
+"optional"/>
+ <xs:attribute name="name" type="xs:NCName" use="optional"/>
</xs:extension>
</xs:complexContent>
</xs:complexType>
-
+
<xs:complexType name="tImport" >
<xs:complexContent>
<xs:extension base="wsdl:tExtensibleAttributesDocumented" >
@@ -307,4 +319,4 @@
<xs:attribute ref="wsdl:required" use="optional" />
</xs:complexType>
-</xs:schema>
\ No newline at end of file
+</xs:schema>
