[prev in list] [next in list] [prev in thread] [next in thread]
List: xmlbeans-cvs
Subject: svn commit: r372305 - in /xmlbeans/trunk:
From: radup () apache ! org
Date: 2006-01-25 20:15:56
Message-ID: 20060125201557.41556.qmail () minotaur ! apache ! org
[Download RAW message or body]
Author: radup
Date: Wed Jan 25 12:15:47 2006
New Revision: 372305
URL: http://svn.apache.org/viewcvs?rev=372305&view=rev
Log:
Updated to a new, current (as of Jan 25 2006) version of XMLSchema.xsd to fix problem \
with final attribute on simpleType not accepting a list of valid members.
Contributed by Lawrence Jones
Modified:
xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscSimpleTypeResolver.java
xmlbeans/trunk/src/xsdschema/schema/XMLSchema.xsd
xmlbeans/trunk/test/cases/xbean/xmlobject/store/XMLSchema.xsd
Modified: xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscSimpleTypeResolver.java
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscSimpleTypeResolver.java?rev=372305&r1=372304&r2=372305&view=diff
==============================================================================
--- xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscSimpleTypeResolver.java \
(original)
+++ xmlbeans/trunk/src/typeimpl/org/apache/xmlbeans/impl/schema/StscSimpleTypeResolver.java \
Wed Jan 25 12:15:47 2006 @@ -91,48 +91,38 @@
boolean finalList = false;
boolean finalUnion = false;
- String value = null;
- List sValue = null;
+ Object finalValue = null;
if (parseSt.isSetFinal())
{
- value = parseSt.getFinal();
+ finalValue = parseSt.getFinal();
}
- // Inspect the final default attribute on the schema
+ // Inspect the finalDefault attribute on the schema
else if (schema != null && schema.isSetFinalDefault())
{
- Object fd = schema.getFinalDefault();
- if (fd != null)
- {
- if (fd instanceof String)
- value = (String) fd;
- else if (fd instanceof List)
- sValue = (List) fd;
- }
+ finalValue = schema.getFinalDefault();
}
- if (value != null)
+ if (finalValue != null)
{
- if (value.equals("#all"))
- finalRest = finalList = finalUnion = true;
- else if (value.equals("restriction"))
- finalRest = true;
- else if (value.equals("list"))
- finalList = true;
- else if (value.equals("union"))
- finalUnion = true;
- }
- else if (sValue != null)
- {
- // In case of simple types we ignore the "extension" value
-
- if (sValue.contains("restriction"))
- finalRest = true;
+ if (finalValue instanceof String)
+ {
+ if ("#all".equals((String)finalValue))
+ {
+ finalRest = finalList = finalUnion = true;
+ }
+ }
+ else if (finalValue instanceof List)
+ {
+ List lFinalValue = (List) finalValue;
+ if (lFinalValue.contains("restriction"))
+ finalRest = true;
- if (sValue.contains("list"))
- finalList = true;
+ if (lFinalValue.contains("list"))
+ finalList = true;
- if (sValue.contains("union"))
- finalUnion= true;
+ if (lFinalValue.contains("union"))
+ finalUnion= true;
+ }
}
sImpl.setSimpleFinal(finalRest, finalList, finalUnion);
Modified: xmlbeans/trunk/src/xsdschema/schema/XMLSchema.xsd
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/xsdschema/schema/XMLSchema.xsd?rev=372305&r1=372304&r2=372305&view=diff
==============================================================================
--- xmlbeans/trunk/src/xsdschema/schema/XMLSchema.xsd (original)
+++ xmlbeans/trunk/src/xsdschema/schema/XMLSchema.xsd Wed Jan 25 12:15:47 2006
@@ -1,13 +1,9 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- XML Schema schema for XML Schemas: Part 1: Structures -->
<!-- Note this schema is NOT the normative structures schema. -->
-
<!-- The prose copy in the structures REC is the normative -->
-
<!-- version (which shouldn't differ from this one except for -->
-
<!-- this comment and entity expansions, but just in case -->
-
<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "XMLSchema.dtd" [
<!-- provide ID type information even for parsers which only read the
@@ -72,29 +68,24 @@
<xs:schema targetNamespace="http://www.w3.org/2001/XMLSchema" blockDefault="#all" \
elementFormDefault="qualified" version="1.0" \
xmlns:xs="http://www.w3.org/2001/XMLSchema" xml:lang="EN" \
xmlns:hfp="http://www.w3.org/2001/XMLSchema-hasFacetAndProperty"> <xs:annotation>
<xs:documentation>
- Part 1 version: Id: XMLSchema.xsd,v 1.53 2003/02/24 17:40:07 ht Exp
- Part 2 version: Id: datatypes.xsd,v 1.60 2003/04/05 11:02:30 ht Exp
+ Part 1 version: Id: structures.xsd,v 1.2 2004/01/15 11:34:25 ht Exp
+ Part 2 version: Id: datatypes.xsd,v 1.3 2004/01/23 18:11:13 ht Exp
</xs:documentation>
<xs:documentation>
Apache XMLBean changes:
- 2003/05/14: The regular expressions that describe integrity constraint
- xpaths has been modified to permit whitespaces in certain places, as
- discussed in one of the errata.
-
- 2003/05/28: the type of the <element> element in an <all> group has
- been given a name so that it is legal to use the type in both a base type
- and a restriction when using the allModel (otherwise it breaks one of the
- particle-valid (restriction) rules).
-
- 2003/09/15: finalDefault has been changed to permit "list" and "union"
+ 2006/01/25: Updated to be consistent with the schema at
+ http://www.w3.org/2001/XMLSchema.xsd as of this date with the exception that
+ the modifications in the previous version of this file to the regular
+ expressions that describe the integrity constraint xpaths (which permit
+ whitespaces in certain places which would not otherwise be allowed)
+ have been retained in this copy as in the previous version of this file.
</xs:documentation>
</xs:annotation>
-
<xs:annotation>
- <xs:documentation \
source="http://www.w3.org/XML/Group/2002/09/xmlschema-1/structures-with-errata.html"> \
+ <xs:documentation \
source="http://www.w3.org/TR/2004/PER-xmlschema-1-20040318/structures.html"> The \
schema corresponding to this document is normative, with respect to the syntactic \
constraints it expresses in the XML Schema language. The documentation (within \
<documentation> elements) @@ -189,7 +180,7 @@
</xs:restriction>
</xs:simpleType>
- <xs:simpleType name="defaultDerivationControl">
+ <xs:simpleType name="reducedDerivationControl">
<xs:annotation>
<xs:documentation>
A utility type, not for public use</xs:documentation>
@@ -197,17 +188,15 @@
<xs:restriction base="xs:derivationControl">
<xs:enumeration value="extension"/>
<xs:enumeration value="restriction"/>
- <xs:enumeration value="list"/>
- <xs:enumeration value="union"/>
</xs:restriction>
</xs:simpleType>
- <xs:simpleType name="defaultDerivationSet">
+ <xs:simpleType name="derivationSet">
<xs:annotation>
<xs:documentation>
A utility type, not for public use</xs:documentation>
<xs:documentation>
- #all or (possibly empty) subset of {extension, restriction, list, \
union}</xs:documentation> + #all or (possibly empty) subset of {extension, \
restriction}</xs:documentation> </xs:annotation>
<xs:union>
<xs:simpleType>
@@ -216,12 +205,12 @@
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
- <xs:list itemType="xs:defaultDerivationControl"/>
+ <xs:list itemType="xs:reducedDerivationControl"/>
</xs:simpleType>
</xs:union>
</xs:simpleType>
- <xs:simpleType name="reducedDerivationControl">
+ <xs:simpleType name="typeDerivationControl">
<xs:annotation>
<xs:documentation>
A utility type, not for public use</xs:documentation>
@@ -229,15 +218,17 @@
<xs:restriction base="xs:derivationControl">
<xs:enumeration value="extension"/>
<xs:enumeration value="restriction"/>
+ <xs:enumeration value="list"/>
+ <xs:enumeration value="union"/>
</xs:restriction>
</xs:simpleType>
- <xs:simpleType name="derivationSet">
+ <xs:simpleType name="fullDerivationSet">
<xs:annotation>
<xs:documentation>
A utility type, not for public use</xs:documentation>
<xs:documentation>
- #all or (possibly empty) subset of {extension, restriction}</xs:documentation>
+ #all or (possibly empty) subset of {extension, restriction, list, \
union}</xs:documentation> </xs:annotation>
<xs:union>
<xs:simpleType>
@@ -246,7 +237,7 @@
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
- <xs:list itemType="xs:reducedDerivationControl"/>
+ <xs:list itemType="xs:typeDerivationControl"/>
</xs:simpleType>
</xs:union>
</xs:simpleType>
@@ -271,8 +262,8 @@
</xs:sequence>
</xs:sequence>
<xs:attribute name="targetNamespace" type="xs:anyURI"/>
- <xs:attribute name="version" type="xs:normalizedString"/>
- <xs:attribute name="finalDefault" type="xs:defaultDerivationSet" use="optional" \
default=""/> + <xs:attribute name="version" type="xs:token"/>
+ <xs:attribute name="finalDefault" type="xs:fullDerivationSet" use="optional" \
default=""/>
<xs:attribute name="blockDefault" type="xs:blockSet" use="optional" \
default=""/>
<xs:attribute name="attributeFormDefault" type="xs:formChoice" use="optional" \
default="unqualified"/>
<xs:attribute name="elementFormDefault" type="xs:formChoice" use="optional" \
default="unqualified"/> @@ -860,45 +851,46 @@
avoid a pblm with the Elt:All/Choice/Seq
Particle derivation constraint</xs:documentation>
</xs:annotation>
- <xs:element name="element" type="xs:elementInAll"/>
+ <xs:element name="element" type="xs:narrowMaxMin"/>
</xs:choice>
</xs:sequence>
</xs:group>
-
- <xs:complexType name="elementInAll">
- <xs:annotation>
- <xs:documentation>restricted max/min</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:restriction base="xs:localElement">
- <xs:sequence>
- <xs:element ref="xs:annotation" minOccurs="0"/>
- <xs:choice minOccurs="0">
- <xs:element name="simpleType" type="xs:localSimpleType"/>
- <xs:element name="complexType" type="xs:localComplexType"/>
- </xs:choice>
- <xs:group ref="xs:identityConstraint" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- <xs:attribute name="minOccurs" use="optional" default="1">
- <xs:simpleType>
- <xs:restriction base="xs:nonNegativeInteger">
- <xs:enumeration value="0"/>
- <xs:enumeration value="1"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="maxOccurs" use="optional" default="1">
- <xs:simpleType>
- <xs:restriction base="xs:allNNI">
- <xs:enumeration value="0"/>
- <xs:enumeration value="1"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
+
+
+ <xs:complexType name="narrowMaxMin">
+ <xs:annotation>
+ <xs:documentation>restricted max/min</xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:restriction base="xs:localElement">
+ <xs:sequence>
+ <xs:element ref="xs:annotation" minOccurs="0"/>
+ <xs:choice minOccurs="0">
+ <xs:element name="simpleType" type="xs:localSimpleType"/>
+ <xs:element name="complexType" type="xs:localComplexType"/>
+ </xs:choice>
+ <xs:group ref="xs:identityConstraint" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute name="minOccurs" use="optional" default="1">
+ <xs:simpleType>
+ <xs:restriction base="xs:nonNegativeInteger">
+ <xs:enumeration value="0"/>
+ <xs:enumeration value="1"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:attribute name="maxOccurs" use="optional" default="1">
+ <xs:simpleType>
+ <xs:restriction base="xs:allNNI">
+ <xs:enumeration value="0"/>
+ <xs:enumeration value="1"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:restriction>
+ </xs:complexContent>
+ </xs:complexType>
<xs:complexType name="all">
<xs:annotation>
@@ -1883,7 +1875,7 @@
id="language.pattern">
<xs:annotation>
<xs:documentation
- source="http://www.w3.org/TR/REC-xml#NT-LanguageID">
+ source="http://www.ietf.org/rfc/rfc3066.txt">
pattern specifies the content of section 2.12 of XML 1.0e2
and RFC 3066 (Revised version of RFC 1766).
</xs:documentation>
@@ -1900,6 +1892,7 @@
<hfp:hasFacet name="maxLength"/>
<hfp:hasFacet name="enumeration"/>
<hfp:hasFacet name="whiteSpace"/>
+ <hfp:hasFacet name="pattern"/>
<hfp:hasProperty name="ordered" value="false"/>
<hfp:hasProperty name="bounded" value="false"/>
<hfp:hasProperty name="cardinality"
@@ -1925,6 +1918,7 @@
<hfp:hasFacet name="maxLength"/>
<hfp:hasFacet name="enumeration"/>
<hfp:hasFacet name="whiteSpace"/>
+ <hfp:hasFacet name="pattern"/>
<hfp:hasProperty name="ordered" value="false"/>
<hfp:hasProperty name="bounded" value="false"/>
<hfp:hasProperty name="cardinality"
@@ -1967,6 +1961,7 @@
<hfp:hasFacet name="maxLength"/>
<hfp:hasFacet name="enumeration"/>
<hfp:hasFacet name="whiteSpace"/>
+ <hfp:hasFacet name="pattern"/>
<hfp:hasProperty name="ordered" value="false"/>
<hfp:hasProperty name="bounded" value="false"/>
<hfp:hasProperty name="cardinality"
@@ -2225,11 +2220,15 @@
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
- <xs:restriction base="xs:derivationControl">
- <xs:enumeration value="list"/>
- <xs:enumeration value="union"/>
- <xs:enumeration value="restriction"/>
- </xs:restriction>
+ <xs:list>
+ <xs:simpleType>
+ <xs:restriction base="xs:derivationControl">
+ <xs:enumeration value="list"/>
+ <xs:enumeration value="union"/>
+ <xs:enumeration value="restriction"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:list>
</xs:simpleType>
</xs:union>
</xs:simpleType>
Modified: xmlbeans/trunk/test/cases/xbean/xmlobject/store/XMLSchema.xsd
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/test/cases/xbean/xmlobject/store/XMLSchema.xsd?rev=372305&r1=372304&r2=372305&view=diff
==============================================================================
--- xmlbeans/trunk/test/cases/xbean/xmlobject/store/XMLSchema.xsd (original)
+++ xmlbeans/trunk/test/cases/xbean/xmlobject/store/XMLSchema.xsd Wed Jan 25 12:15:47 \
2006 @@ -1,13 +1,9 @@
<?xml version='1.0' encoding='UTF-8'?>
<!-- XML Schema schema for XML Schemas: Part 1: Structures -->
<!-- Note this schema is NOT the normative structures schema. -->
-
<!-- The prose copy in the structures REC is the normative -->
-
<!-- version (which shouldn't differ from this one except for -->
-
<!-- this comment and entity expansions, but just in case -->
-
<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "XMLSchema.dtd" [
<!-- provide ID type information even for parsers which only read the
@@ -72,29 +68,24 @@
<xs:schema targetNamespace="http://www.w3.org/2001/XMLSchema" blockDefault="#all" \
elementFormDefault="qualified" version="1.0" \
xmlns:xs="http://www.w3.org/2001/XMLSchema" xml:lang="EN" \
xmlns:hfp="http://www.w3.org/2001/XMLSchema-hasFacetAndProperty"> <xs:annotation>
<xs:documentation>
- Part 1 version: Id: XMLSchema.xsd,v 1.53 2003/02/24 17:40:07 ht Exp
- Part 2 version: Id: datatypes.xsd,v 1.60 2003/04/05 11:02:30 ht Exp
+ Part 1 version: Id: structures.xsd,v 1.2 2004/01/15 11:34:25 ht Exp
+ Part 2 version: Id: datatypes.xsd,v 1.3 2004/01/23 18:11:13 ht Exp
</xs:documentation>
<xs:documentation>
Apache XMLBean changes:
- 2003/05/14: The regular expressions that describe integrity constraint
- xpaths has been modified to permit whitespaces in certain places, as
- discussed in one of the errata.
-
- 2003/05/28: the type of the <element> element in an <all> group has
- been given a name so that it is legal to use the type in both a base type
- and a restriction when using the allModel (otherwise it breaks one of the
- particle-valid (restriction) rules).
-
- 2003/09/15: finalDefault has been changed to permit "list" and "union"
+ 2006/01/25: Updated to be consistent with the schema at
+ http://www.w3.org/2001/XMLSchema.xsd as of this date with the exception that
+ the modifications in the previous version of this file to the regular
+ expressions that describe the integrity constraint xpaths (which permit
+ whitespaces in certain places which would not otherwise be allowed)
+ have been retained in this copy as in the previous version of this file.
</xs:documentation>
</xs:annotation>
-
<xs:annotation>
- <xs:documentation \
source="http://www.w3.org/XML/Group/2002/09/xmlschema-1/structures-with-errata.html"> \
+ <xs:documentation \
source="http://www.w3.org/TR/2004/PER-xmlschema-1-20040318/structures.html"> The \
schema corresponding to this document is normative, with respect to the syntactic \
constraints it expresses in the XML Schema language. The documentation (within \
<documentation> elements) @@ -189,7 +180,7 @@
</xs:restriction>
</xs:simpleType>
- <xs:simpleType name="defaultDerivationControl">
+ <xs:simpleType name="reducedDerivationControl">
<xs:annotation>
<xs:documentation>
A utility type, not for public use</xs:documentation>
@@ -197,17 +188,15 @@
<xs:restriction base="xs:derivationControl">
<xs:enumeration value="extension"/>
<xs:enumeration value="restriction"/>
- <xs:enumeration value="list"/>
- <xs:enumeration value="union"/>
</xs:restriction>
</xs:simpleType>
- <xs:simpleType name="defaultDerivationSet">
+ <xs:simpleType name="derivationSet">
<xs:annotation>
<xs:documentation>
A utility type, not for public use</xs:documentation>
<xs:documentation>
- #all or (possibly empty) subset of {extension, restriction, list, \
union}</xs:documentation> + #all or (possibly empty) subset of {extension, \
restriction}</xs:documentation> </xs:annotation>
<xs:union>
<xs:simpleType>
@@ -216,12 +205,12 @@
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
- <xs:list itemType="xs:defaultDerivationControl"/>
+ <xs:list itemType="xs:reducedDerivationControl"/>
</xs:simpleType>
</xs:union>
</xs:simpleType>
- <xs:simpleType name="reducedDerivationControl">
+ <xs:simpleType name="typeDerivationControl">
<xs:annotation>
<xs:documentation>
A utility type, not for public use</xs:documentation>
@@ -229,15 +218,17 @@
<xs:restriction base="xs:derivationControl">
<xs:enumeration value="extension"/>
<xs:enumeration value="restriction"/>
+ <xs:enumeration value="list"/>
+ <xs:enumeration value="union"/>
</xs:restriction>
</xs:simpleType>
- <xs:simpleType name="derivationSet">
+ <xs:simpleType name="fullDerivationSet">
<xs:annotation>
<xs:documentation>
A utility type, not for public use</xs:documentation>
<xs:documentation>
- #all or (possibly empty) subset of {extension, restriction}</xs:documentation>
+ #all or (possibly empty) subset of {extension, restriction, list, \
union}</xs:documentation> </xs:annotation>
<xs:union>
<xs:simpleType>
@@ -246,7 +237,7 @@
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
- <xs:list itemType="xs:reducedDerivationControl"/>
+ <xs:list itemType="xs:typeDerivationControl"/>
</xs:simpleType>
</xs:union>
</xs:simpleType>
@@ -271,8 +262,8 @@
</xs:sequence>
</xs:sequence>
<xs:attribute name="targetNamespace" type="xs:anyURI"/>
- <xs:attribute name="version" type="xs:normalizedString"/>
- <xs:attribute name="finalDefault" type="xs:defaultDerivationSet" use="optional" \
default=""/> + <xs:attribute name="version" type="xs:token"/>
+ <xs:attribute name="finalDefault" type="xs:fullDerivationSet" use="optional" \
default=""/>
<xs:attribute name="blockDefault" type="xs:blockSet" use="optional" \
default=""/>
<xs:attribute name="attributeFormDefault" type="xs:formChoice" use="optional" \
default="unqualified"/>
<xs:attribute name="elementFormDefault" type="xs:formChoice" use="optional" \
default="unqualified"/> @@ -860,45 +851,46 @@
avoid a pblm with the Elt:All/Choice/Seq
Particle derivation constraint</xs:documentation>
</xs:annotation>
- <xs:element name="element" type="xs:elementInAll"/>
+ <xs:element name="element" type="xs:narrowMaxMin"/>
</xs:choice>
</xs:sequence>
</xs:group>
-
- <xs:complexType name="elementInAll">
- <xs:annotation>
- <xs:documentation>restricted max/min</xs:documentation>
- </xs:annotation>
- <xs:complexContent>
- <xs:restriction base="xs:localElement">
- <xs:sequence>
- <xs:element ref="xs:annotation" minOccurs="0"/>
- <xs:choice minOccurs="0">
- <xs:element name="simpleType" type="xs:localSimpleType"/>
- <xs:element name="complexType" type="xs:localComplexType"/>
- </xs:choice>
- <xs:group ref="xs:identityConstraint" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- <xs:attribute name="minOccurs" use="optional" default="1">
- <xs:simpleType>
- <xs:restriction base="xs:nonNegativeInteger">
- <xs:enumeration value="0"/>
- <xs:enumeration value="1"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:attribute name="maxOccurs" use="optional" default="1">
- <xs:simpleType>
- <xs:restriction base="xs:allNNI">
- <xs:enumeration value="0"/>
- <xs:enumeration value="1"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- <xs:anyAttribute namespace="##other" processContents="lax"/>
- </xs:restriction>
- </xs:complexContent>
- </xs:complexType>
+
+
+ <xs:complexType name="narrowMaxMin">
+ <xs:annotation>
+ <xs:documentation>restricted max/min</xs:documentation>
+ </xs:annotation>
+ <xs:complexContent>
+ <xs:restriction base="xs:localElement">
+ <xs:sequence>
+ <xs:element ref="xs:annotation" minOccurs="0"/>
+ <xs:choice minOccurs="0">
+ <xs:element name="simpleType" type="xs:localSimpleType"/>
+ <xs:element name="complexType" type="xs:localComplexType"/>
+ </xs:choice>
+ <xs:group ref="xs:identityConstraint" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute name="minOccurs" use="optional" default="1">
+ <xs:simpleType>
+ <xs:restriction base="xs:nonNegativeInteger">
+ <xs:enumeration value="0"/>
+ <xs:enumeration value="1"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:attribute name="maxOccurs" use="optional" default="1">
+ <xs:simpleType>
+ <xs:restriction base="xs:allNNI">
+ <xs:enumeration value="0"/>
+ <xs:enumeration value="1"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:restriction>
+ </xs:complexContent>
+ </xs:complexType>
<xs:complexType name="all">
<xs:annotation>
@@ -1883,7 +1875,7 @@
id="language.pattern">
<xs:annotation>
<xs:documentation
- source="http://www.w3.org/TR/REC-xml#NT-LanguageID">
+ source="http://www.ietf.org/rfc/rfc3066.txt">
pattern specifies the content of section 2.12 of XML 1.0e2
and RFC 3066 (Revised version of RFC 1766).
</xs:documentation>
@@ -1900,6 +1892,7 @@
<hfp:hasFacet name="maxLength"/>
<hfp:hasFacet name="enumeration"/>
<hfp:hasFacet name="whiteSpace"/>
+ <hfp:hasFacet name="pattern"/>
<hfp:hasProperty name="ordered" value="false"/>
<hfp:hasProperty name="bounded" value="false"/>
<hfp:hasProperty name="cardinality"
@@ -1925,6 +1918,7 @@
<hfp:hasFacet name="maxLength"/>
<hfp:hasFacet name="enumeration"/>
<hfp:hasFacet name="whiteSpace"/>
+ <hfp:hasFacet name="pattern"/>
<hfp:hasProperty name="ordered" value="false"/>
<hfp:hasProperty name="bounded" value="false"/>
<hfp:hasProperty name="cardinality"
@@ -1967,6 +1961,7 @@
<hfp:hasFacet name="maxLength"/>
<hfp:hasFacet name="enumeration"/>
<hfp:hasFacet name="whiteSpace"/>
+ <hfp:hasFacet name="pattern"/>
<hfp:hasProperty name="ordered" value="false"/>
<hfp:hasProperty name="bounded" value="false"/>
<hfp:hasProperty name="cardinality"
@@ -2225,11 +2220,15 @@
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
- <xs:restriction base="xs:derivationControl">
- <xs:enumeration value="list"/>
- <xs:enumeration value="union"/>
- <xs:enumeration value="restriction"/>
- </xs:restriction>
+ <xs:list>
+ <xs:simpleType>
+ <xs:restriction base="xs:derivationControl">
+ <xs:enumeration value="list"/>
+ <xs:enumeration value="union"/>
+ <xs:enumeration value="restriction"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:list>
</xs:simpleType>
</xs:union>
</xs:simpleType>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlbeans.apache.org
For additional commands, e-mail: commits-help@xmlbeans.apache.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic