The old code cause incorrect duplicate ID errors when XmlSchemas is involved
(global components were not resolved correctly and it's not simple to make
minor fix).
This is part of bugfix #670945.
Namespaces in nested external schemas have to be validated against
immediately-containing schema. If there is a schema A with urn:x
targetNamespace imports a schema B with urn:y targetNamespace which
in turn includes another schema C, then C must be validated its namespace
against B, not A.
* XmlSchema.cs, XmlSchemaSet.cs : move substitutionGroup processing
from validation phase to post-subset-collection phase. It caused
inconsistent substitutionGroup processing among import and
schemaSet.Schemas(). Fixed possible XBRL schema processing.
* XmlSchemaSetTests.cs : added test for Compile() after "duplicating"
call to Add() for such schemas that also have xs:import of the
same schema that causes errors on processing substitutionGroup.
svn path=/trunk/mcs/; revision=121509
* XmlSchema.cs : fixed bug #397612, patch by James Fitzsimons.
in ProcessExternal(), Make xs:import without schemaLocation work
fine as if it were with schemaLocation.
2008-06-06 James Fitzsimons <[email protected]>
* XmlSchemaTests.cs: added test for bug #397612.
* XmlSchemaAssertion.cs : make sure to close schema XmlReader.
2008-06-06 Atsushi Enomoto <[email protected]>
* importNamespaceTest.xsd, xsdimporttest.xml, importedNamespace.xsd:
new test files.
svn path=/trunk/mcs/; revision=105144
* XmlSchema.cs : Changed GetResolvedUri to return Uri in correct case
to make compatible with the Microsoft.NET framework.
* XmlSchemaTests.cs: added test to support change to
GetResolvedUri to return Uri in correct case
to make compatible with the Microsoft.NET framework.
2008-06-06 Atsushi Enomoto <[email protected]>
* resolveUriSchema.xsd : (actually I've incorrectly added it before
the actual test checkin) Fixed schemaLocation.
svn path=/trunk/mcs/; revision=105141
* XmlSchema.cs : Do recursively process xs:include inside included
schemas. Fixed bug #361818.
* XmlSchemaTests.cs: added test for bug #361818.
* 361818.xsd, 361818-2.xsd, 361818-3.xsd : new test files.
* Makefile : extra distfiles (361818*.xsd).
svn path=/trunk/mcs/; revision=96159
* XmlSchema.cs XmlSchemaGroup.cs XmlSchemaAny.cs XmlSchemaElement.cs
XmlSchemaNotation.cs XmlSchemaComplexType.cs
XmlSchemaAttributeGroup.cs XmlSchemaSimpleType.cs
XmlSchemaIdentityConstraint.cs XmlSchemaAnyAttribute.cs
XmlSchemaRedefine.cs XmlSchemaAttribute.cs :
avoid incorrect compilation of included schemas, fixed bug #81360.
more fix for wrong targetNamespace propagation within current
processing model. Replaced ParentIsSchema field with a property.
* XsdValidatingReaderTests.cs : added test for bug #81360.
* 81360.xsd, 81360inc1.xsd, 81360inc2.xsd : new test files.
* Makefile : added distfiles.
svn path=/trunk/mcs/; revision=76184
* XmlSchemaIdentityConstraint.cs : give conflicting component in
the error message.
* XmlSchemaElement.cs : When resolving "ref" and "substitutionGroup",
It should use XmlSchema.FindElement() instead of XmlSchema.Elements
so that it does not miss external components.
* XmlSchemaSet.cs, XmlSchema.cs : now in one XmlSchemaSet
compilation, make sure to not handle the same schema twice even
at the schema level.
svn path=/trunk/mcs/; revision=69293
* XmlSchema.cs : set ValidationEventHandler to XmlSchemaSet only
when the argument event handler is not null.
Validate() is internal to open it to XmlSchemaSet.
* XmlSchemaSet.cs : removed extraneous "handler" field and method
"OnValidationError". Now ValidationEventHandler just works since
we don't have to care about XmlSchemaCollection's event (it just
reuses XmlSchemaSet's event now).
Split Compile() process to collect components first, and to
validate next.
svn path=/trunk/mcs/; revision=63041
* XmlSchema.cs : compiling and validating external components in
prior to direct components in a schema does block my refactoring.
Removed extraneous call to XmlSchemaSet.Add().
svn path=/trunk/mcs/; revision=63032
* XmlSchema.cs, XmlSchemaSet.cs : some minor refactoring to make
Compile() simple two phase (i.e. CompileSubset() and Validate()).
svn path=/trunk/mcs/; revision=63028
Refactoring compilation to make Compile() portable to
XmlSchemaSet.Compile() and fix multi-schema bugs (not done yet)
* XmlSchema.cs :
Removed "root schema" concept from Compile().
Since nested inclusion does not result in an error, the role of
schemaLocationStack is identical to handledUris, thus removed it.
The handledUris does not have to be a field.
Moved NamedIdentities and IDCollections to XmlSchemaSet.
Renamed a Compile() which is called from XmlSchemaCollection and
XmlSchemaSet as CompileSubset(). Renamed private Compile() as
DoCompile().
public Compile() now internally creates a new XmlSchemaSet and
compiles the set.
* XmlSchemaCollection.cs : now it hooks its schemaSet's validation
event handler and thus XmlSchemaSet does not need to check this
collection's event handler by itself.
XmlSchema.Compile() -> XmlSchema.CompileSubset().
* XmlSchemaSet.cs :
Removed SchemaCollection which became unneccessary.
Added NamedIdentities and IDCollection.
XmlSchema.Compile() -> XmlSchema.CompileSubset().
* XmlSchemaAttributeGroupRef.cs, XmlSchemaXPath.cs
XmlSchemaSimpleTypeList.cs, XmlSchemaComplexContentRestriction.cs,
XmlSchemaGroup.cs, XmlSchemaComplexContentExtension.cs,
XmlSchemaSequence.cs, XmlSchemaSimpleContentRestriction.cs,
XmlSchemaSimpleContentExtension.cs, XmlSchemaAny.cs,
XmlSchemaElement.cs, XmlSchemaNotation.cs, XmlSchemaAll.cs,
XmlSchemaComplexType.cs, XmlSchemaAnnotation.cs,
XmlSchemaAttributeGroup.cs, XmlSchemaSimpleTypeRestriction.cs,
XmlSchemaSimpleContent.cs, XmlSchemaGroupRef.cs,
XmlSchemaChoice.cs, XmlSchemaSimpleType.cs,
XmlSchemaIdentityConstraint.cs, XmlSchemaSimpleTypeUnion.cs,
XmlSchemaAnyAttribute.cs, XmlSchemaComplexContent.cs,
XmlSchemaAttribute.cs, XmlSchemaObject.cs :
removed XmlSchemaObject.IsCompiled(). Check compilation state by
comparing compilation ID directly.
* XmlReader.cs :
For DTD validator, call to SetSchemas() makes no sense.
* XmlValidatingReader.cs : now it internally holds old
XmlSchemaCollection instead of new XmlSchemaSet, to make
XmlSchemaSet.SchemaCollection unneccessary.
Removed SetSchemas() since it is now extraneous because of the
XmlReaderChange above.
svn path=/trunk/mcs/; revision=62988
* XmlSchema.cs : mutual schema import was failing because the
compiling schema's SourceUri was not enlisted for nest check.
* XmlSchemaTests.cs : added TestSimpleMutualImport().
* inter-inc-1.xsd, inter-inc-2.xsd :
new test files for TestSimpleMutualImport().
svn path=/trunk/mcs/; revision=62941
* XmlSchema.cs : seems like there is XmlSchemaExternal.Schema property
that is filled after Compile(). Fixed bug #77687.
* XmlSchemaTests.cs : added test for bug #77687.
* 77687.xsd, 77687inc.xsd : test for bug #77687.
svn path=/trunk/mcs/; revision=57495
and report XmlSchemaException when compiling XmlSchema with
zero-length TargetNamespace. Fixes bug #77391.
* XmlSchemaTests.cs: Added test for writing XmlSchema with
zero-length TargetNamespace. Added test for compiling XmlSchema
with zero-length TargetNamespace. Replaced Console.WriteLine with
AssertEquals.
svn path=/trunk/mcs/; revision=57415
* XmlSchema.cs : XmlReader position after Read() is the end of the
schema element.
* XmlSchemaTests.cs : test for reader position after Read().
svn path=/trunk/mcs/; revision=51030
* XmlSchema.cs : XmlSchema.Write() should not write duplicating
top-level entry in XmlSerializerNamespaces and XmlNamespaceManager.
This fixes some DataSet bugs.
svn path=/trunk/mcs/; revision=39024
* XmlSchema.cs : XmlResolver.ResolveUri() may return null.
* XmlParserContext.cs : all the string properties must not be set as
null. Thanks to Joshua.
* XmlTextReader.cs,
DTDObjectModel.cs,
DTDReader.cs : XmlResolver.ResolveUri() may return null.
* XsdValidatingReader.cs : XmlResolver.ResolveUri() may return null.
* XslFunction.cs,
Compiler.cs : XmlResolver.ResolveUri() may return null.
svn path=/trunk/mcs/; revision=38084
* XmlSchemaElement.cs,
XmlSchemaComplexType.cs,
XmlSchema.cs,
XmlSchemaChoice.cs,
XmlSchemaSimpleType.cs,
XmlSchemaObjectTable.cs,
XmlSchemaObjectCollection.cs,
XmlSchemaCollection.cs,
: All changes are just for warning removal.
svn path=/trunk/mcs/; revision=36586
* XmlSchema.cs : When schema inclusion results in a recursion, just
skip recursed schema.
* BUGS-MS.txt : added another entry. Reflected response from Microsoft.
svn path=/trunk/mcs/; revision=33258
* XmlSchema.cs : Replace XmlSchemaCollection with XmlSchemaSet that
used to maintain compiled schema state.
Simplified code a bit (Include processing).
Set IsCompiled = true only when successfully compiled.
* XmlSchemaCollection.cs : Now it totally delegates its processing
to XmlSchemaSet. Removed unused methods.
* XmlSchemaElement.cs : Added post-compiled information initializer
method, and call it before (re)Compile().
* XmlSchemaSet.cs :
- Replaced internal store from Dictionary to List, since schema
resources for one target namespace can be more than one (that's why
- Schemas(string targetNamespace) returns ICollection).
- Now global schemaset members are added per schema addition (it is
more MS compatible than before).
- Use GetSafeNs() to do targetNamespace comparison correctly.
XmlSchemaSet looks still unstable, so it will be changed again.
* XmlSchemaSimpleTypeRestriction.cs,
XmlSchemaSimpleTypeUnion.cs,
* XmlSchemaUtil.cs : Consider xdt namespace.
svn path=/trunk/mcs/; revision=32143
* CustomSerializer.cs : Added custom serializer for XmlSchema, that is
generated by SerializationCodeGenerator and edited a bit.
* XmlSchema.cs : Use XmlSchemaSerializationWriter.
svn path=/trunk/mcs/; revision=27680
* XmlSchema.cs : Removed FIXME. No PSVI required.
* XmlSchemaAll.cs : Removed FIXME. It was not done.
* XmlSchemaAttributeGroupRef.cs : Removed FIXME. It can be annotated.
* XmlSchemaChoice.cs : not FIXME but LAMESPEC.
* XmlSchemaSimpleTypeRestriction.cs : Added check for non
XmlSchemaFacet items on Compile(). Thus removed FIXME.
* XmlSchemaUtil.cs : Fixed SplitList to handle sequential spaces.
Thus removed FIXME.
* XmlSchemaObjectTable. cs: modified to use HybridDictionary (mostly
for avoiding iterator order difference).
svn path=/trunk/mcs/; revision=27232
* XmlSchema.cs : Write() handles schema namespace for xmlserializer
(it does not look to be handled inside xmlserializer).
svn path=/trunk/mcs/; revision=26735
* XmlSchema.cs,
XmlSchemaAttribute.cs
XmlSchemaAttributeGroup.cs,
XmlSchemaComplexContent.cs,
XmlSchemaComplexType.cs,
XmlSchemaContent.cs,
XmlSchemaDatatype.cs,
XmlSchemaNotation.cs,
XmlSchemaObject.cs,
XmlSchemaParticle.cs : extra TODO removal. foreach elimination.
Moved attribute group recursion check field from XmlSchemaObject
to XmlSchemaAttributeGroup.
Fixed XmlSchemaParticle.EmptyParticle class access modifier.
* XmlSchemaSimpleType.cs,
XmlSchemaSimpleTypeContent.cs,
XmlSchemaSimpleTypeList.cs,
XmlSchemaSimpleTypeRestriction.cs,
XmlSchemaSimpleTypeUnion.cs : Removed "actualBaseSchemaType" field
and the owner simpleType should hold the corresponding type info.
Collect base type info in prior to validation.
svn path=/trunk/mcs/; revision=23143
* XmlSchema.cs : Raise warning event when external schema could not
be resolved.
* XmlSchemaAll.cs : Fixed incorrect IsEmptiable computation.
* XmlSchemaAny.cs : Fixed incorrect occurence computation.
* XmlSchemaChoice.cs : compiledItems were incorrectly appended.
* XmlSchemaComplexType.cs : Now validatableParticle became extraneous.
* XmlSchemaGroupBase.cs : Here we should not get optimized particle
because it might cause infinite loop.
* XmlSchemaGroupRef.cs : Fixed Validate() to avoid null reference
exception (only occur with ValidationEventHandler). Fixed Occurence
embedding logic that was useless because of particle optimization.
svn path=/trunk/mcs/; revision=22507
* XmlSchema.cs : When we have schema A which includes schema B which
includes schema C (i.e. A->B->C), C components should be compiled.
Here, same URL inclusions are ignored.
* XmlSchemaElement.cs : Hack for missing substitution-group fix.
* XmlSchemaSimpleTypeContent.cs : make actualBaseSchemaType private
and initialize. This fixes bug #53178.
* XmlSchemaSimpleTypeUnion.cs : Forgot to commit ;)
svn path=/trunk/mcs/; revision=22389
* XmlSchema.cs :
- Removed extra property Language. Fill substitution-group info
before ContentTypeParticle is computed.
* XmlSchemaComplexType.cs : ContentType and ContentTypeParticle are
now computer before Validate() (to exclude 3.4.2 from 3.4.6
component constraint check).
* XmlSchemaObject.cs, XmlSchemaParticle.cs :
Added CopyInfo() for cloning objects.
* XmlSchemaObjectTable.cs :
Add() doesn't have to reject same named items.
* XmlSchemaParticle.cs :
- Renamed internal class XmlSchemaParticleEmpty to EmptyParticle
(for ease of post compilation infoset comparison).
- GetMinEffectiveTotalRange() should return max occurs for element and
any.
* XmlSchemaParticle.cs,
XmlSchemaAll.cs,
XmlSchemaAny.cs,
XmlSchemaChoice.cs,
XmlSchemaElement.cs,
XmlSchemaGroupBase.cs,
XmlSchemaGroupRef.cs,
XmlSchemaSequence.cs :
- Removed ActualParticle property.
- Added GetOptimizedParticle() to get ContentTypeParticle.
- ContentTypeParticle is now created as different object from
user-specified "Particle" property.
- Return Empty particle when model groups contains no Items.
- When Items contains exactly 1 item, return the item (unless it is
top level choice model group - it causes DBR problem).
- ValidateDerivationValidRestriction() and related WXS 3.9.6 DBR
check methods such as ValidateNSRecurseCheckCardinality() now
returns a bool value and avoids exceptions on each failure time.
- ValidateRecurse() now doesn't progress base particle incorrectly.
(it caused incorrect order-preserving-mapping error.)
- 3.9.6 Recurse, RecurseLax, MapAndSum are now treated as different.
* XmlSchemaAll.cs : occurence validation shoud be done against values
after computation (ValidatedMaxOccurs).
* XmlSchemaChoice.cs : When Items is empty, then invoke warning event.
* XmlSchemaElement.cs :
- Consider referencedElement also for SubstitutionGroupElement.
- Removed SubstitutingChoice which is not in use.
- when it was targeted as substitution group by other elements, its
ContentTypeParticle should be substitution choice (see 3.9.6
Particle Valid (Restriction) term 2.1).
- Added FillsubstitutionElementInfo() (see XmlSchema.cs above).
* XmlSchemaGroup.cs : Removed extra check on model group (because it
is impossible to specify non-model-group particle).
* XmlSchemaIdentityConstraint.cs,
XmlSchemaKey.cs,
XmlSchemaKeyRef.cs,
XmlSchemaUnique.cs : Removed extraneous MonoTODO.
* XmlSchemaSimpleContent.cs : Made actualSchemaType as internal.
* XmlSchemaSimpleType.cs : Removed extraneous new Datatype property.
* XmlSchemaSimpleTypeRestriction.cs : Renamed actualBaseSchemaType to
ActualBaseSchemaType.
* XmlSchemaSimpleTypeList.cs, XmlSchemaSimpleTypeUnion.cs :
Removed unused actualBaseSchemaType code.
* XmlSchemaType.cs : use recently introduced BaseXmlSchemaType.
* XmlSchemaUtil.cs : Removed unused CheckLanguage().
svn path=/trunk/mcs/; revision=22323
* XmlSchema.cs, XmlSchemaComplexType.cs, XmlSchemaElement.cs :
Invalid attribute should raise an error, not a warning.
svn path=/trunk/mcs/; revision=22014
* XmlSchemaSet.cs : implemented some members.
* XmlSchemaCollection.cs : modified to use internal schema set (This
class provides more precise schema validation feature and will be
commonly used for XPathNavigator2).
Added .NET 1.1 .ctor() which takes XmlResolver.
* XmlSchema.cs : fix related to above changes.
Use validation event handler on Read() at all required places.
Added .NET 1.1 .ctor() which takes XmlResolver.
* XmlSchemaComplexType.cs : content type comparison was incorrect.
Renamed confusing method.
* XmlSchemaElement.cs : don't use ContentTypeParticle in
CheckRecursion(), where that property might not be determined yet.
* XmlSchemaGroupBase.cs : Modified ValidateRecurse() a bit (currently
no effect)
* XmlSchemaGroupBase.cs,
XmlSchemaChoice.cs,
XmlSchemaAll.cs,
XmlSchemaSequence.cs : moved CheckRecursion to XmlSchemaGroupBase.
* XmlSchemaObjectTable.cs : Fixed missing error info.
* BUGS-MS.txt : Added info a bit.
svn path=/trunk/mcs/; revision=21880
* XmlSchema.cs,
XmlSchemaUtil.cs : Reduced warning message.
* XmlSchemaAttribute.cs : NotImplementedException should no more exist.
(All things are going to be implemented.)
* BuiltInDatatype.cs : XsdInteger should not allow non-integer decimal.
* XmlSchemaSimpleType.cs : Added internal Datatype property. Implemented
list type derivation validation. Added Normalize().
* XmlSchemaSimpleTypeContent.cs : Added Normalize(). Replaced anyType
with anySimpleType.
* XmlSchemaSimpleTypeRestriction.cs : Implemented some facet validation,
such as pattern, enumeration, and length etc.
svn path=/trunk/mcs/; revision=19276