Author: richard.opalka(a)jboss.com Date: 2010-03-08 15:25:50 -0500 (Mon, 08 Mar 2010) New Revision: 11732 Added: stack/native/trunk/modules/core/src/main/resources/schema/ws-addr-2005-08.xsd stack/native/trunk/modules/core/src/main/resources/schema/ws-addr-2006-03.xsd Removed: stack/native/trunk/modules/core/src/main/resources/schema/ws-addr.xsd Modified: stack/native/trunk/modules/core/src/main/resources/META-INF/jbossws-entities.properties Log: adding WS-Addressing 2006-03 schema Modified: stack/native/trunk/modules/core/src/main/resources/META-INF/jbossws-entities.properties =================================================================== --- stack/native/trunk/modules/core/src/main/resources/META-INF/jbossws-entities.properties 2010-03-08 18:46:23 UTC (rev 11731) +++ stack/native/trunk/modules/core/src/main/resources/META-INF/jbossws-entities.properties 2010-03-08 20:25:50 UTC (rev 11732) @@ -3,7 +3,8 @@ http\://www.jboss.com/ws-security/config=schema/jboss-ws-security_1_0.xsd http\://www.jboss.org/jbossws-tools=schema/jbossws-tool_1_0.xsd http\://java.sun.com/xml/ns/javaee=schema/javaee_web_services_1_2.xsd -http\://www.w3.org/2005/08/addressing=schema/ws-addr.xsd +http\://www.w3.org/2005/08/addressing=schema/ws-addr-2005-08.xsd +http\://www.w3.org/2006/03/addressing=schema/ws-addr-2006-03.xsd http\://schemas.xmlsoap.org/ws/2004/08/eventing=schema/eventing_200408.xsd http\://www.w3.org/2002/06/soap-encoding=schema/soap-encoding_200206.xsd http\://schemas.xmlsoap.org/soap/encoding/=schema/soap-encoding_1_1.xsd @@ -19,4 +20,3 @@ http\://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd=schema/oasis-200401-wss-wssecurity-secext-1.0.xsd http\://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd=schema/oasis-200401-wss-wssecurity-utility-1.0.xsd http\://www.w3.org/2000/09/xmldsig#=schema/xmldsig-core-schema.xsd - Added: stack/native/trunk/modules/core/src/main/resources/schema/ws-addr-2005-08.xsd =================================================================== --- stack/native/trunk/modules/core/src/main/resources/schema/ws-addr-2005-08.xsd (rev 0) +++ stack/native/trunk/modules/core/src/main/resources/schema/ws-addr-2005-08.xsd 2010-03-08 20:25:50 UTC (rev 11732) @@ -0,0 +1,149 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd"> +<!-- + W3C XML Schema defined in the Web Services Addressing 1.0 specification + http://www.w3.org/TR/ws-addr-core + + Copyright © 2005 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 +--> +<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"> + + <!-- Constructs from the WS-Addressing Core --> + + <xs:element name="EndpointReference" type="tns:EndpointReferenceType"/> + <xs:complexType name="EndpointReferenceType" mixed="false"> + <xs:sequence> + <xs:element name="Address" type="tns:AttributedURIType"/> + <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: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> + + <xs:element name="Metadata" type="tns:MetadataType"/> + <xs:complexType name="MetadataType" mixed="false"> + <xs:sequence> + <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:complexType> + + <xs:element name="MessageID" type="tns:AttributedURIType"/> + <xs:element name="RelatesTo" type="tns:RelatesToType"/> + <xs:complexType name="RelatesToType" mixed="false"> + <xs:simpleContent> + <xs:extension base="xs:anyURI"> + <xs:attribute name="RelationshipType" type="tns:RelationshipTypeOpenEnum" use="optional" default="http://www.w3.org/2005/08/addressing/reply"/> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:extension> + </xs:simpleContent> + </xs:complexType> + + <xs:simpleType name="RelationshipTypeOpenEnum"> + <xs:union memberTypes="tns:RelationshipType xs:anyURI"/> + </xs:simpleType> + + <xs:simpleType name="RelationshipType"> + <xs:restriction base="xs:anyURI"> + <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"/> + <xs:element name="FaultTo" type="tns:EndpointReferenceType"/> + <xs:element name="To" type="tns:AttributedURIType"/> + <xs:element name="Action" type="tns:AttributedURIType"/> + + <xs:complexType name="AttributedURIType" mixed="false"> + <xs:simpleContent> + <xs:extension base="xs:anyURI"> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:extension> + </xs:simpleContent> + </xs:complexType> + + <!-- Constructs from the WS-Addressing SOAP binding --> + + <xs:attribute name="IsReferenceParameter" type="xs:boolean"/> + + <xs:simpleType name="FaultCodesOpenEnumType"> + <xs:union memberTypes="tns:FaultCodesType xs:QName"/> + </xs:simpleType> + + <xs:simpleType name="FaultCodesType"> + <xs:restriction base="xs:QName"> + <xs:enumeration value="tns:InvalidAddressingHeader"/> + <xs:enumeration value="tns:InvalidAddress"/> + <xs:enumeration value="tns:InvalidEPR"/> + <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"/> + <xs:enumeration value="tns:ActionNotSupported"/> + <xs:enumeration value="tns:EndpointUnavailable"/> + </xs:restriction> + </xs:simpleType> + + <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"/> + </xs:extension> + </xs:simpleContent> + </xs:complexType> + + <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"/> + <xs:complexType name="ProblemActionType" mixed="false"> + <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> \ No newline at end of file Added: stack/native/trunk/modules/core/src/main/resources/schema/ws-addr-2006-03.xsd =================================================================== --- stack/native/trunk/modules/core/src/main/resources/schema/ws-addr-2006-03.xsd (rev 0) +++ stack/native/trunk/modules/core/src/main/resources/schema/ws-addr-2006-03.xsd 2010-03-08 20:25:50 UTC (rev 11732) @@ -0,0 +1,137 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + W3C XML Schema defined in the Web Services Addressing 1.0 specification + http://www.w3.org/TR/ws-addr-core + + Copyright © 2005 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: ws-addr.xsd,v 1.2 2008/07/23 13:38:16 plehegar Exp $ +--> +<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"> + + <!-- Constructs from the WS-Addressing Core --> + + <xs:element name="EndpointReference" type="tns:EndpointReferenceType"/> + <xs:complexType name="EndpointReferenceType" mixed="false"> + <xs:sequence> + <xs:element name="Address" type="tns:AttributedURIType"/> + <xs:element ref="tns:ReferenceParameters" 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> + + <xs:element name="Metadata" type="tns:MetadataType"/> + <xs:complexType name="MetadataType" mixed="false"> + <xs:sequence> + <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:complexType> + + <xs:element name="MessageID" type="tns:AttributedURIType"/> + <xs:element name="RelatesTo" type="tns:RelatesToType"/> + <xs:complexType name="RelatesToType" mixed="false"> + <xs:simpleContent> + <xs:extension base="xs:anyURI"> + <xs:attribute name="RelationshipType" type="tns:RelationshipTypeOpenEnum" use="optional" default="http://www.w3.org/2005/08/addressing/reply"/> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:extension> + </xs:simpleContent> + </xs:complexType> + + <xs:simpleType name="RelationshipTypeOpenEnum"> + <xs:union memberTypes="tns:RelationshipType xs:anyURI"/> + </xs:simpleType> + + <xs:simpleType name="RelationshipType"> + <xs:restriction base="xs:anyURI"> + <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"/> + <xs:element name="FaultTo" type="tns:EndpointReferenceType"/> + <xs:element name="To" type="tns:AttributedURIType"/> + <xs:element name="Action" type="tns:AttributedURIType"/> + + <xs:complexType name="AttributedURIType" mixed="false"> + <xs:simpleContent> + <xs:extension base="xs:anyURI"> + <xs:anyAttribute namespace="##other" processContents="lax"/> + </xs:extension> + </xs:simpleContent> + </xs:complexType> + + <!-- Constructs from the WS-Addressing SOAP binding --> + + <xs:attribute name="IsReferenceParameter" type="xs:boolean"/> + + <xs:simpleType name="FaultCodesOpenEnumType"> + <xs:union memberTypes="tns:FaultCodesType xs:QName"/> + </xs:simpleType> + + <xs:simpleType name="FaultCodesType"> + <xs:restriction base="xs:QName"> + <xs:enumeration value="tns:InvalidAddressingHeader"/> + <xs:enumeration value="tns:InvalidAddress"/> + <xs:enumeration value="tns:InvalidEPR"/> + <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"/> + <xs:enumeration value="tns:ActionNotSupported"/> + <xs:enumeration value="tns:EndpointUnavailable"/> + </xs:restriction> + </xs:simpleType> + + <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"/> + </xs:extension> + </xs:simpleContent> + </xs:complexType> + + <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="ProblemIRI" type="tns:AttributedURIType"/> + + <xs:element name="ProblemAction" type="tns:ProblemActionType"/> + <xs:complexType name="ProblemActionType" mixed="false"> + <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> \ No newline at end of file Deleted: stack/native/trunk/modules/core/src/main/resources/schema/ws-addr.xsd =================================================================== --- stack/native/trunk/modules/core/src/main/resources/schema/ws-addr.xsd 2010-03-08 18:46:23 UTC (rev 11731) +++ stack/native/trunk/modules/core/src/main/resources/schema/ws-addr.xsd 2010-03-08 20:25:50 UTC (rev 11732) @@ -1,149 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd"> -<!-- - W3C XML Schema defined in the Web Services Addressing 1.0 specification - http://www.w3.org/TR/ws-addr-core - - Copyright © 2005 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 ---> -<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"> - - <!-- Constructs from the WS-Addressing Core --> - - <xs:element name="EndpointReference" type="tns:EndpointReferenceType"/> - <xs:complexType name="EndpointReferenceType" mixed="false"> - <xs:sequence> - <xs:element name="Address" type="tns:AttributedURIType"/> - <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: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> - - <xs:element name="Metadata" type="tns:MetadataType"/> - <xs:complexType name="MetadataType" mixed="false"> - <xs:sequence> - <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:complexType> - - <xs:element name="MessageID" type="tns:AttributedURIType"/> - <xs:element name="RelatesTo" type="tns:RelatesToType"/> - <xs:complexType name="RelatesToType" mixed="false"> - <xs:simpleContent> - <xs:extension base="xs:anyURI"> - <xs:attribute name="RelationshipType" type="tns:RelationshipTypeOpenEnum" use="optional" default="http://www.w3.org/2005/08/addressing/reply"/> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:extension> - </xs:simpleContent> - </xs:complexType> - - <xs:simpleType name="RelationshipTypeOpenEnum"> - <xs:union memberTypes="tns:RelationshipType xs:anyURI"/> - </xs:simpleType> - - <xs:simpleType name="RelationshipType"> - <xs:restriction base="xs:anyURI"> - <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"/> - <xs:element name="FaultTo" type="tns:EndpointReferenceType"/> - <xs:element name="To" type="tns:AttributedURIType"/> - <xs:element name="Action" type="tns:AttributedURIType"/> - - <xs:complexType name="AttributedURIType" mixed="false"> - <xs:simpleContent> - <xs:extension base="xs:anyURI"> - <xs:anyAttribute namespace="##other" processContents="lax"/> - </xs:extension> - </xs:simpleContent> - </xs:complexType> - - <!-- Constructs from the WS-Addressing SOAP binding --> - - <xs:attribute name="IsReferenceParameter" type="xs:boolean"/> - - <xs:simpleType name="FaultCodesOpenEnumType"> - <xs:union memberTypes="tns:FaultCodesType xs:QName"/> - </xs:simpleType> - - <xs:simpleType name="FaultCodesType"> - <xs:restriction base="xs:QName"> - <xs:enumeration value="tns:InvalidAddressingHeader"/> - <xs:enumeration value="tns:InvalidAddress"/> - <xs:enumeration value="tns:InvalidEPR"/> - <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"/> - <xs:enumeration value="tns:ActionNotSupported"/> - <xs:enumeration value="tns:EndpointUnavailable"/> - </xs:restriction> - </xs:simpleType> - - <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"/> - </xs:extension> - </xs:simpleContent> - </xs:complexType> - - <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"/> - <xs:complexType name="ProblemActionType" mixed="false"> - <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> \ No newline at end of file