Author: amassari
Date: Wed Oct 1 13:45:38 2008
New Revision: 700909
URL: http://svn.apache.org/viewvc?rev=700909&view=rev
Log:
Process namespaces also in xs:extension/xs:restriction nodes under
xs:simpleContent/xs:complexContent (XERCESC-1832)
Added:
xerces/c/trunk/tests/src/XSTSHarness/regression/XERCESC-1832/
xerces/c/trunk/tests/src/XSTSHarness/regression/XERCESC-1832/schema11.xsd
Modified:
xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp
xerces/c/trunk/tests/src/XSTSHarness/regression/Xerces.testSet
Modified: xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp?rev=700909&r1=700908&r2=700909&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp (original)
+++ xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp Wed Oct 1
13:45:38 2008
@@ -3657,6 +3657,7 @@
throw TraverseSchema::InvalidComplexTypeInfo;
}
+ NamespaceScopeManager nsMgr2(simpleContent, fSchemaInfo, this);
// -----------------------------------------------------------------------
// The content should be either "restriction" or "extension"
// -----------------------------------------------------------------------
@@ -4079,6 +4080,7 @@
throw TraverseSchema::InvalidComplexTypeInfo;
}
+ NamespaceScopeManager nsMgr2(complexContent, fSchemaInfo, this);
// -----------------------------------------------------------------------
// The content should be either "restriction" or "extension"
// -----------------------------------------------------------------------
Added: xerces/c/trunk/tests/src/XSTSHarness/regression/XERCESC-1832/schema11.xsd
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/XSTSHarness/regression/XERCESC-1832/schema11.xsd?rev=700909&view=auto
==============================================================================
--- xerces/c/trunk/tests/src/XSTSHarness/regression/XERCESC-1832/schema11.xsd
(added)
+++ xerces/c/trunk/tests/src/XSTSHarness/regression/XERCESC-1832/schema11.xsd
Wed Oct 1 13:45:38 2008
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:tns="x" elementFormDefault="qualified" targetNamespace="x"
xmlns:xs="http://www.w3.org/2001/XMLSchema";>
+
+ <xs:complexType name="derivedC">
+ <xs:complexContent mixed="false"
xmlns:q2="http://www.w3.org/2001/XMLSchema";>
+ <xs:extension xmlns:q1="x" base="q1:baseC">
+ <xs:sequence
xmlns:q3="http://www.w3.org/2001/XMLSchema";>
+ <xs:element minOccurs="0" maxOccurs="1"
name="c" type="q2:boolean"/>
+ <xs:element minOccurs="0" maxOccurs="1"
name="d" type="q3:boolean"/>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ <xs:complexType name="baseC">
+ <xs:sequence>
+ <xs:element minOccurs="0" maxOccurs="1" name="a"
type="xs:string" />
+ <xs:element minOccurs="0" maxOccurs="1" name="b"
type="xs:string" />
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:simpleType name="baseS" xmlns:q6="http://www.w3.org/2001/XMLSchema";>
+ <q6:restriction xmlns:q4="http://www.w3.org/2001/XMLSchema";
base="q4:string">
+ <q5:length xmlns:q5="http://www.w3.org/2001/XMLSchema";
value="3"/>
+ </q6:restriction>
+ </xs:simpleType>
+
+ <xs:complexType name="derivedS">
+ <q7:simpleContent xmlns:q7="http://www.w3.org/2001/XMLSchema";>
+ <xs:extension xmlns:q8="x" base="q8:baseS">
+ <xs:attribute name="p" type="q7:string"/>
+ </xs:extension>
+ </q7:simpleContent>
+ </xs:complexType>
+</xs:schema>
\ No newline at end of file
Modified: xerces/c/trunk/tests/src/XSTSHarness/regression/Xerces.testSet
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/tests/src/XSTSHarness/regression/Xerces.testSet?rev=700909&r1=700908&r2=700909&view=diff
==============================================================================
--- xerces/c/trunk/tests/src/XSTSHarness/regression/Xerces.testSet (original)
+++ xerces/c/trunk/tests/src/XSTSHarness/regression/Xerces.testSet Wed Oct 1
13:45:38 2008
@@ -568,4 +568,15 @@
<current status="accepted" date="2008-07-17"/>
</instanceTest>
</testGroup>
+ <testGroup name="XERCESC-1832">
+ <annotation>
+ <documentation>Namespace definitions attached to
xs:extension/xs:restriction are not processed</documentation>
+ </annotation>
+ <documentationReference
xlink:href="https://issues.apache.org/jira/browse/XERCESC-1832"/>
+ <schemaTest name="XERCESC-1832">
+ <schemaDocument xlink:href="./XERCESC-1832/schema11.xsd"/>
+ <expected validity="valid"/>
+ <current status="accepted" date="2008-10-01"/>
+ </schemaTest>
+ </testGroup>
</testSet>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
