xsddoc/samples/stress stress.xsd,1.23,1.24 redefined.xsd,1.3,1.4 imported2.xsd,1.5,1.6
Kurt Riede <[email protected]> Thu, 09 Dec 2004 13:30:46 +0000
| Newsgroups | gmane.text.xml.xframe.xsddoc.devel |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/xframe/xsddoc/samples/stress
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22373/samples/stress
Modified Files:
stress.xsd redefined.xsd imported2.xsd
Log Message:
minor fixes (now passes XSV schema quality tester), some extensions to redefined components
Index: redefined.xsd
===================================================================
RCS file: /cvsroot/xframe/xsddoc/samples/stress/redefined.xsd,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** redefined.xsd 30 Sep 2004 11:27:47 -0000 1.3
--- redefined.xsd 9 Dec 2004 13:30:43 -0000 1.4
***************
*** 25,27 ****
--- 25,37 ----
</xs:sequence>
</xs:complexType>
+ <xs:group name="selfRedefined">
+ <xs:annotation>
+ <xs:documentation>This group definition will get redefined
+ in the main schema stress.xsd to test redefined groups
+ that refer a base group with the same name.</xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:element name="test" type="xs:string"/>
+ </xs:sequence>
+ </xs:group>
</xs:schema>
Index: imported2.xsd
===================================================================
RCS file: /cvsroot/xframe/xsddoc/samples/stress/imported2.xsd,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** imported2.xsd 7 Oct 2004 22:50:30 -0000 1.5
--- imported2.xsd 9 Dec 2004 13:30:43 -0000 1.6
***************
*** 1,5 ****
<?xml version="1.0" encoding="UTF-8"?>
! <xs:schema targetNamespace="http://xframe.sf.net/sample/stress/imported2" xmlns:i2="http://xframe.sf.net/sample/stress/imported2"
! xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
<xs:annotation>
<xs:documentation>This is another namespace to test imports.</xs:documentation>
--- 1,4 ----
<?xml version="1.0" encoding="UTF-8"?>
! <xs:schema targetNamespace="http://xframe.sf.net/sample/stress/imported2" xmlns:i2="http://xframe.sf.net/sample/stress/imported2" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
<xs:annotation>
<xs:documentation>This is another namespace to test imports.</xs:documentation>
***************
*** 14,18 ****
<xs:restriction base="i2:imported2baseType"></xs:restriction>
</xs:simpleType>
! <xs:element name="testImported2" type="imported2DerivedType"/>
<xs:element name="cameleonTypeUsage1" type="i2:cameleonType">
<xs:annotation>
--- 13,17 ----
<xs:restriction base="i2:imported2baseType"></xs:restriction>
</xs:simpleType>
! <xs:element name="testImported2" type="i2:imported2DerivedType"/>
<xs:element name="cameleonTypeUsage1" type="i2:cameleonType">
<xs:annotation>
Index: stress.xsd
===================================================================
RCS file: /cvsroot/xframe/xsddoc/samples/stress/stress.xsd,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** stress.xsd 7 Dec 2004 14:46:51 -0000 1.23
--- stress.xsd 9 Dec 2004 13:30:42 -0000 1.24
***************
*** 1,4 ****
<?xml version="1.0" encoding="UTF-8"?>
! <xs:schema targetNamespace="http://xframe.sf.net/sample/stress" xmlns="http://xframe.sf.net/sample/stress/imported2" xmlns:i="http://xframe.sf.net/sample/stress/imported" xmlns:ii="http://xframe.sf.net/sample/stress/importedImported" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:st="http://xframe.sf.net/sample/stress" elementFormDefault="qualified" attributeFormDefault="unqualified">
<xs:annotation>
<xs:documentation>This namespace is used as a stress test for xsddoc.</xs:documentation>
--- 1,4 ----
<?xml version="1.0" encoding="UTF-8"?>
! <xs:schema targetNamespace="http://xframe.sf.net/sample/stress" xmlns:i2="http://xframe.sf.net/sample/stress/imported2" xmlns:i="http://xframe.sf.net/sample/stress/imported" xmlns:ii="http://xframe.sf.net/sample/stress/importedImported" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:st="http://xframe.sf.net/sample/stress" elementFormDefault="qualified" attributeFormDefault="unqualified">
<xs:annotation>
<xs:documentation>This namespace is used as a stress test for xsddoc.</xs:documentation>
***************
*** 12,15 ****
--- 12,26 ----
<xs:include schemaLocation="includedIncluded.xsd"/>
<xs:redefine schemaLocation="redefined.xsd">
+ <xs:group name="selfRedefined">
+ <xs:annotation>
+ <xs:documentation>This group definition redefines a
+ group definition from the redefined schema redefined.xsd
+ to test redefined groups that refer a base group with the same name.</xs:documentation>
+ </xs:annotation>
+ <xs:sequence>
+ <xs:group ref="st:selfRedefined"/>
+ <xs:element name="additionalElement" type="xs:string"/>
+ </xs:sequence>
+ </xs:group>
<xs:complexType name="testRedefine">
<xs:annotation>
***************
*** 27,31 ****
</xs:complexType>
</xs:redefine>
! <xs:element name="russianDoll">
<xs:annotation>
<xs:documentation>An example of russian doll element declaration.
--- 38,42 ----
</xs:complexType>
</xs:redefine>
! <xs:element name="russianDoll" block="#all" final="#all">
<xs:annotation>
<xs:documentation>An example of russian doll element declaration.
***************
*** 34,43 ****
<xs:complexType>
<xs:sequence>
! <xs:element name="rdRoot">
<xs:annotation>
<xs:documentation>The root of the russian doll.
This text is part of a documentation tag that is the first child of the <i>rdRoot</i> tag.</xs:documentation>
</xs:annotation>
! <xs:complexType block="#all" final="#all" mixed="true">
<xs:sequence>
<xs:element name="rdChild1" type="xs:string">
--- 45,54 ----
<xs:complexType>
<xs:sequence>
! <xs:element name="rdRoot" block="#all" >
<xs:annotation>
<xs:documentation>The root of the russian doll.
This text is part of a documentation tag that is the first child of the <i>rdRoot</i> tag.</xs:documentation>
</xs:annotation>
! <xs:complexType mixed="true">
<xs:sequence>
<xs:element name="rdChild1" type="xs:string">
***************
*** 47,51 ****
</xs:annotation>
</xs:element>
! <xs:element name="rdChild2" block="#all" final="#all">
<xs:annotation>
<xs:documentation>The second child of the russian doll.
--- 58,62 ----
</xs:annotation>
</xs:element>
! <xs:element name="rdChild2" block="#all">
<xs:annotation>
<xs:documentation>The second child of the russian doll.
***************
*** 178,183 ****
</table>
<br/>
! And here is an image (remind that the image file itself must get copied to the proper location after xsddoc has run):<br/>
! <img src="test.png"/>
<br/>
</xs:documentation>
--- 189,195 ----
</table>
<br/>
! And here is an image (remind that the image file itself must get
! copied to the proper location after xsddoc has run):<br/>
! <img src="http://xframe.sourceforge.net/xsddoc/images/project-logo.png"/>
<br/>
</xs:documentation>
***************
*** 511,515 ****
</xs:complexType>
</xs:element>
! <xs:element name="elementWithAllAttributesTest" abstract="true" block="#all" final="#all" id="1234">
<xs:annotation>
<xs:documentation>This element is a test of an element with all optional attributes.</xs:documentation>
--- 523,527 ----
</xs:complexType>
</xs:element>
! <xs:element name="elementWithAllAttributesTest" abstract="true" block="#all" final="#all" id="a1234">
<xs:annotation>
<xs:documentation>This element is a test of an element with all optional attributes.</xs:documentation>
***************
*** 531,535 ****
</xs:complexType>
</xs:element>
! <xs:complexType name="complexTypeWithAllAttributesTest" abstract="true" block="#all" final="#all" id="2345" mixed="true">
<xs:annotation>
<xs:documentation>This element is a test of a complex type with all optional attributes.</xs:documentation>
--- 543,547 ----
</xs:complexType>
</xs:element>
! <xs:complexType name="complexTypeWithAllAttributesTest" abstract="true" block="#all" final="#all" id="b2345" mixed="true">
<xs:annotation>
<xs:documentation>This element is a test of a complex type with all optional attributes.</xs:documentation>
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://productguide.itmanagersjournal.com/