[jboss-svn-commits] JBossWS SVN: r613 - in branches/jbossws-1.0/src: main/resources/schema test/resources/eventing/WEB-INF/wsdl test/resources/wsdl11/inherit
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Jul 14 12:57:03 EDT 2006
Author: thomas.diesler at jboss.com
Date: 2006-07-14 12:56:59 -0400 (Fri, 14 Jul 2006)
New Revision: 613
Modified:
branches/jbossws-1.0/src/main/resources/schema/ws-addr.xsd
branches/jbossws-1.0/src/test/resources/eventing/WEB-INF/wsdl/eventing.xsd
branches/jbossws-1.0/src/test/resources/wsdl11/inherit/eventing.xsd
Log:
Update to registerd version
http://www.w3.org/2005/08/addressing/ws-addr.xsd
Modified: branches/jbossws-1.0/src/main/resources/schema/ws-addr.xsd
===================================================================
--- branches/jbossws-1.0/src/main/resources/schema/ws-addr.xsd 2006-07-14 16:47:30 UTC (rev 612)
+++ branches/jbossws-1.0/src/main/resources/schema/ws-addr.xsd 2006-07-14 16:56:59 UTC (rev 613)
@@ -15,6 +15,10 @@
[1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
$Id$
+
+ This is the dated version:
+
+ http://www.w3.org/2005/08/addressing/ws-addr.xsd
-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://www.w3.org/2005/08/addressing" targetNamespace="http://www.w3.org/2005/08/addressing" blockDefault="#all" elementFormDefault="qualified" finalDefault="" attributeFormDefault="unqualified">
@@ -24,18 +28,19 @@
<xs:complexType name="EndpointReferenceType" mixed="false">
<xs:sequence>
<xs:element name="Address" type="tns:AttributedURIType"/>
- <xs:element ref="tns:ReferenceParameters" minOccurs="0"/>
+ <xs:element name="ReferenceParameters" type="tns:ReferenceParametersType" minOccurs="0"/>
+
<xs:element ref="tns:Metadata" minOccurs="0"/>
<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
<xs:anyAttribute namespace="##other" processContents="lax"/>
</xs:complexType>
- <xs:element name="ReferenceParameters" type="tns:ReferenceParametersType"/>
<xs:complexType name="ReferenceParametersType" mixed="false">
<xs:sequence>
<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
+
<xs:anyAttribute namespace="##other" processContents="lax"/>
</xs:complexType>
@@ -46,6 +51,7 @@
</xs:sequence>
<xs:anyAttribute namespace="##other" processContents="lax"/>
</xs:complexType>
+
<xs:element name="MessageID" type="tns:AttributedURIType"/>
<xs:element name="RelatesTo" type="tns:RelatesToType"/>
@@ -56,6 +62,7 @@
<xs:anyAttribute namespace="##other" processContents="lax"/>
</xs:extension>
</xs:simpleContent>
+
</xs:complexType>
<xs:simpleType name="RelationshipTypeOpenEnum">
@@ -67,6 +74,7 @@
<xs:enumeration value="http://www.w3.org/2005/08/addressing/reply"/>
</xs:restriction>
</xs:simpleType>
+
<xs:element name="ReplyTo" type="tns:EndpointReferenceType"/>
<xs:element name="From" type="tns:EndpointReferenceType"/>
@@ -77,6 +85,7 @@
<xs:complexType name="AttributedURIType" mixed="false">
<xs:simpleContent>
<xs:extension base="xs:anyURI">
+
<xs:anyAttribute namespace="##other" processContents="lax"/>
</xs:extension>
</xs:simpleContent>
@@ -88,6 +97,7 @@
<xs:simpleType name="FaultCodesOpenEnumType">
<xs:union memberTypes="tns:FaultCodesType xs:QName"/>
+
</xs:simpleType>
<xs:simpleType name="FaultCodesType">
@@ -98,6 +108,7 @@
<xs:enumeration value="tns:InvalidCardinality"/>
<xs:enumeration value="tns:MissingAddressInEPR"/>
<xs:enumeration value="tns:DuplicateMessageID"/>
+
<xs:enumeration value="tns:ActionMismatch"/>
<xs:enumeration value="tns:MessageAddressingHeaderRequired"/>
<xs:enumeration value="tns:DestinationUnreachable"/>
@@ -108,6 +119,7 @@
<xs:element name="RetryAfter" type="tns:AttributedUnsignedLongType"/>
<xs:complexType name="AttributedUnsignedLongType" mixed="false">
+
<xs:simpleContent>
<xs:extension base="xs:unsignedLong">
<xs:anyAttribute namespace="##other" processContents="lax"/>
@@ -118,12 +130,22 @@
<xs:element name="ProblemHeaderQName" type="tns:AttributedQNameType"/>
<xs:complexType name="AttributedQNameType" mixed="false">
<xs:simpleContent>
+
<xs:extension base="xs:QName">
<xs:anyAttribute namespace="##other" processContents="lax"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
+ <xs:element name="ProblemHeader" type="tns:AttributedAnyType"/>
+ <xs:complexType name="AttributedAnyType" mixed="false">
+ <xs:sequence>
+ <xs:any namespace="##any" processContents="lax" minOccurs="1" maxOccurs="1"/>
+
+ </xs:sequence>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+
<xs:element name="ProblemIRI" type="tns:AttributedURIType"/>
<xs:element name="ProblemAction" type="tns:ProblemActionType"/>
@@ -131,8 +153,9 @@
<xs:sequence>
<xs:element ref="tns:Action" minOccurs="0"/>
<xs:element name="SoapAction" minOccurs="0" type="xs:anyURI"/>
+
</xs:sequence>
<xs:anyAttribute namespace="##other" processContents="lax"/>
</xs:complexType>
-</xs:schema>
+</xs:schema>
\ No newline at end of file
Modified: branches/jbossws-1.0/src/test/resources/eventing/WEB-INF/wsdl/eventing.xsd
===================================================================
--- branches/jbossws-1.0/src/test/resources/eventing/WEB-INF/wsdl/eventing.xsd 2006-07-14 16:47:30 UTC (rev 612)
+++ branches/jbossws-1.0/src/test/resources/eventing/WEB-INF/wsdl/eventing.xsd 2006-07-14 16:56:59 UTC (rev 613)
@@ -11,7 +11,7 @@
<xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
- <xs:import namespace="http://www.w3.org/2005/08/addressing" schemaLocation="ws-addr.xsd"/>
+ <xs:import namespace="http://www.w3.org/2005/08/addressing" schemaLocation="http://www.w3.org/2005/08/addressing/ws-addr.xsd"/>
<!-- Types and global elements -->
<xs:complexType name="DeliveryType" mixed="true">
Modified: branches/jbossws-1.0/src/test/resources/wsdl11/inherit/eventing.xsd
===================================================================
--- branches/jbossws-1.0/src/test/resources/wsdl11/inherit/eventing.xsd 2006-07-14 16:47:30 UTC (rev 612)
+++ branches/jbossws-1.0/src/test/resources/wsdl11/inherit/eventing.xsd 2006-07-14 16:56:59 UTC (rev 613)
@@ -11,7 +11,7 @@
<xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
- <xs:import namespace="http://www.w3.org/2005/08/addressing" schemaLocation="ws-addr.xsd"/>
+ <xs:import namespace="http://www.w3.org/2005/08/addressing" schemaLocation="http://www.w3.org/2005/08/addressing/ws-addr.xsd"/>
<!-- Types and global elements -->
<xs:complexType name="DeliveryType" mixed="true">
More information about the jboss-svn-commits
mailing list