diff options
| author | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2010-03-18 01:33:59 +0000 |
|---|---|---|
| committer | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2010-03-18 01:33:59 +0000 |
| commit | f2e5a288fee44a1af4d72d8f8bf4fac64b35f01f (patch) | |
| tree | 3901a2accda1898c908bcaf29a8d9e1348b67726 /sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd03.xsd | |
| parent | 01824bb00f1ca8659b96157f574122cf68d67619 (diff) | |
TUSCANY-3451 - Updating to latest drafts of OASIS 1.1 XSDs
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@924579 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
| -rw-r--r-- | sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd03.xsd (renamed from sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd04.xsd) | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd04.xsd b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd03.xsd index 372e8c24b3..61693046c1 100644 --- a/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd04.xsd +++ b/sca-java-2.x/trunk/modules/assembly-xsd/src/main/resources/sca-policy-1.1-cd03.xsd @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. +<!-- Copyright(C) OASIS(R) 2005,2010. All Rights Reserved. OASIS trademark, IPR and other policies apply. --> <schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" @@ -7,7 +7,7 @@ xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" elementFormDefault="qualified"> - <include schemaLocation="sca-core-1.1-cd04.xsd"/> + <include schemaLocation="sca-core-1.1-cd05.xsd"/> <import namespace="http://www.w3.org/ns/ws-policy" schemaLocation="http://www.w3.org/2007/02/ws-policy.xsd"/> @@ -40,12 +40,24 @@ <sequence> <element name="description" type="string" minOccurs="0" maxOccurs="1" /> + <any namespace="##other" processContents="lax" minOccurs="0" + maxOccurs="unbounded"/> </sequence> <attribute name="name" type="NCName" use="required"/> <attribute name="default" type="boolean" use="optional" default="false"/> </complexType> + <element name="requires"> + <complexType> + <sequence minOccurs="0" maxOccurs="unbounded"> + <any namespace="##other" processContents="lax"/> + </sequence> + <attribute name="intents" type="sca:listOfQNames" use="required"/> + <anyAttribute namespace="##other" processContents="lax"/> + </complexType> + </element> + <element name="policySet" type="sca:PolicySet"/> <complexType name="PolicySet"> <choice minOccurs="0" maxOccurs="unbounded"> @@ -61,12 +73,15 @@ <anyAttribute namespace="##other" processContents="lax"/> </complexType> - <element name="policySetAttachment" - type="sca:PolicySetAttachment"/> - <complexType name="PolicySetAttachment"> - <attribute name="name" type="QName" use="required"/> - <anyAttribute namespace="##other" processContents="lax"/> - </complexType> + <element name="policySetAttachment"> + <complexType> + <sequence minOccurs="0" maxOccurs="unbounded"> + <any namespace="##other" processContents="lax"/> + </sequence> + <attribute name="name" type="QName" use="required"/> + <anyAttribute namespace="##other" processContents="lax"/> + </complexType> + </element> <complexType name="PolicySetReference"> <attribute name="name" type="QName" use="required"/> |