From commits-return-11157-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org Fri Feb 19 02:41:24 2010
Return-Path: <commits-return-11157-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org>
Delivered-To: apmail-cxf-commits-archive@www.apache.org
Received: (qmail 67415 invoked from network); 19 Feb 2010 02:41:24 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 19 Feb 2010 02:41:24 -0000
Received: (qmail 19604 invoked by uid 500); 19 Feb 2010 02:41:24 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 19500 invoked by uid 500); 19 Feb 2010 02:41:24 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 19491 invoked by uid 99); 19 Feb 2010 02:41:23 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Feb 2010 02:41:23 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Feb 2010 02:41:14 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 02B0123889BF; Fri, 19 Feb 2010 02:40:54 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r911677 -
 /cxf/trunk/common/schemas/src/main/resources/schemas/wsdl/wsdl.xsd
Date: Fri, 19 Feb 2010 02:40:53 -0000
To: commits@cxf.apache.org
From: dkulp@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100219024054.02B0123889BF@eris.apache.org>

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>