You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlbeans.apache.org by da...@apache.org on 2004/10/12 00:38:08 UTC
cvs commit: xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/types comments.xml commentschoice.xml commentschoice_eNrd0.xsd commentschoice_eNss0.xsd commentschoice_eNvb0.xsd commentschoice_vb0.xsd innercomment.xml innercomment_vb0.xsd xsinil_rd0.xsd xsinil_rd1.xsd xsinil_ss0.xsd xsinil_ss1.xsd xsinil_vb0.xsd xsinil_vb1.xsd
daveremy 2004/10/11 15:38:08
Modified: v2/test/cases/xbean/tools/inst2xsd/schema/complex/enum
enum2_ss0.xsd enumQName_vb_eN0.xsd
v2/test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr
attrenum_rd1.xsd attrenum_rd2.xsd
attrenum_rd_enum1.xsd attrenum_rd_enum2.xsd
attrenum_ss1.xsd attrenum_ss2.xsd attrenum_vb1.xsd
attrenum_vb2.xsd attrenum_vb_enum1.xsd
attrenum_vb_enum2.xsd
v2/test/cases/xbean/tools/inst2xsd/schema/examples
sampleRss092_rd0.xsd sampleRss092_ss0.xsd
sampleRss092_vb0.xsd slashdotrdf_rd1.xsd
xsl_vb1.xsd
v2/test/cases/xbean/tools/inst2xsd/schema/examples/po
po_rd_eN0.xsd po_ss0.xsd po_ss_eN0.xsd po_vb0.xsd
po_vb_eN0.xsd po_vb_scs0.xsd po_vb_scs_enum0.xsd
v2/test/cases/xbean/tools/inst2xsd/schema/namespaces
duplicatedNS_ss0.xsd duplicatedNS_vb0.xsd
v2/test/cases/xbean/tools/inst2xsd/schema/types
xsinil_vb0.xsd xsinil_vb1.xsd
Added: v2/test/cases/xbean/tools/inst2xsd/schema/types comments.xml
commentschoice.xml commentschoice_eNrd0.xsd
commentschoice_eNss0.xsd commentschoice_eNvb0.xsd
commentschoice_vb0.xsd innercomment.xml
innercomment_vb0.xsd xsinil_rd0.xsd xsinil_rd1.xsd
xsinil_ss0.xsd xsinil_ss1.xsd
Log:
Contributed by: Jacob Danner
Test case updates for recent bug fixes and case additions
to cover comments and xsi:nillable values
Revision Changes Path
1.2 +2 -2 xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/complex/enum/enum2_ss0.xsd
Index: enum2_ss0.xsd
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/complex/enum/enum2_ss0.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- enum2_ss0.xsd 21 Sep 2004 22:17:37 -0000 1.1
+++ enum2_ss0.xsd 11 Oct 2004 22:38:07 -0000 1.2
@@ -18,8 +18,8 @@
<xs:element name="c">
<xs:simpleType>
<xs:restriction base="xs:QName" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:enumeration value="foo:baz"/>
- <xs:enumeration value="baz:foo"/>
+ <xs:enumeration value="foo:baz" xmlns:foo="http://foo"/>
+ <xs:enumeration value="baz:foo" xmlns:baz="http://baz"/>
</xs:restriction>
</xs:simpleType>
</xs:element>
1.2 +1 -1 xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/complex/enum/enumQName_vb_eN0.xsd
Index: enumQName_vb_eN0.xsd
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/complex/enum/enumQName_vb_eN0.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- enumQName_vb_eN0.xsd 21 Sep 2004 22:17:37 -0000 1.1
+++ enumQName_vb_eN0.xsd 11 Oct 2004 22:38:07 -0000 1.2
@@ -8,7 +8,7 @@
</xs:complexType>
<xs:complexType name="dType">
<xs:sequence>
- <xs:element type="xs:QName" name="c" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
+ <xs:element type="xs:string" name="c" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="aType">
1.2 +1 -0 xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_rd1.xsd
Index: attrenum_rd1.xsd
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_rd1.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- attrenum_rd1.xsd 21 Sep 2004 22:17:37 -0000 1.1
+++ attrenum_rd1.xsd 11 Oct 2004 22:38:07 -0000 1.2
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://baz" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:attribute name="a" type="xs:byte" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
+ <xs:attribute name="b" type="xs:byte" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
</xs:schema>
1.2 +2 -1 xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_rd2.xsd
Index: attrenum_rd2.xsd
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_rd2.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- attrenum_rd2.xsd 21 Sep 2004 22:17:37 -0000 1.1
+++ attrenum_rd2.xsd 11 Oct 2004 22:38:07 -0000 1.2
@@ -27,8 +27,9 @@
<xs:simpleContent>
<xs:extension base="xs:QName" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:attribute ref="foo:r" xmlns:foo="http://foo"/>
- <xs:attribute ref="baz:a" xmlns:baz="http://baz"/>
+ <xs:attribute ref="baz:b" xmlns:baz="http://baz"/>
<xs:attribute ref="foo:n" xmlns:foo="http://foo"/>
+ <xs:attribute ref="baz:a" xmlns:baz="http://baz"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
1.2 +1 -0 xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_rd_enum1.xsd
Index: attrenum_rd_enum1.xsd
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_rd_enum1.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- attrenum_rd_enum1.xsd 21 Sep 2004 22:17:37 -0000 1.1
+++ attrenum_rd_enum1.xsd 11 Oct 2004 22:38:07 -0000 1.2
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://baz" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:attribute name="a" type="xs:byte" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
+ <xs:attribute name="b" type="xs:byte" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
</xs:schema>
1.2 +2 -1 xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_rd_enum2.xsd
Index: attrenum_rd_enum2.xsd
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_rd_enum2.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- attrenum_rd_enum2.xsd 21 Sep 2004 22:17:37 -0000 1.1
+++ attrenum_rd_enum2.xsd 11 Oct 2004 22:38:07 -0000 1.2
@@ -27,8 +27,9 @@
<xs:simpleContent>
<xs:extension base="xs:QName" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:attribute ref="foo:r" xmlns:foo="http://foo"/>
- <xs:attribute ref="baz:a" xmlns:baz="http://baz"/>
+ <xs:attribute ref="baz:b" xmlns:baz="http://baz"/>
<xs:attribute ref="foo:n" xmlns:foo="http://foo"/>
+ <xs:attribute ref="baz:a" xmlns:baz="http://baz"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
1.2 +1 -0 xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_ss1.xsd
Index: attrenum_ss1.xsd
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_ss1.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- attrenum_ss1.xsd 21 Sep 2004 22:17:37 -0000 1.1
+++ attrenum_ss1.xsd 11 Oct 2004 22:38:07 -0000 1.2
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://baz" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:attribute name="a" type="xs:byte" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
+ <xs:attribute name="b" type="xs:byte" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
</xs:schema>
1.2 +1 -0 xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_ss2.xsd
Index: attrenum_ss2.xsd
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_ss2.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- attrenum_ss2.xsd 21 Sep 2004 22:17:37 -0000 1.1
+++ attrenum_ss2.xsd 11 Oct 2004 22:38:07 -0000 1.2
@@ -23,6 +23,7 @@
<xs:attribute ref="foo:n" xmlns:foo="http://foo"/>
<xs:attribute ref="baz:a" xmlns:baz="http://baz"/>
<xs:attribute ref="foo:r" xmlns:foo="http://foo"/>
+ <xs:attribute ref="baz:b" xmlns:baz="http://baz"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
1.2 +1 -0 xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_vb1.xsd
Index: attrenum_vb1.xsd
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_vb1.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- attrenum_vb1.xsd 21 Sep 2004 22:17:37 -0000 1.1
+++ attrenum_vb1.xsd 11 Oct 2004 22:38:07 -0000 1.2
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://baz" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:attribute name="a" type="xs:byte" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
+ <xs:attribute name="b" type="xs:byte" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
</xs:schema>
1.2 +1 -0 xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_vb2.xsd
Index: attrenum_vb2.xsd
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_vb2.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- attrenum_vb2.xsd 21 Sep 2004 22:17:37 -0000 1.1
+++ attrenum_vb2.xsd 11 Oct 2004 22:38:07 -0000 1.2
@@ -18,6 +18,7 @@
<xs:attribute ref="foo:n" xmlns:foo="http://foo"/>
<xs:attribute ref="baz:a" xmlns:baz="http://baz"/>
<xs:attribute ref="foo:r" xmlns:foo="http://foo"/>
+ <xs:attribute ref="baz:b" xmlns:baz="http://baz"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
1.2 +1 -0 xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_vb_enum1.xsd
Index: attrenum_vb_enum1.xsd
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_vb_enum1.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- attrenum_vb_enum1.xsd 21 Sep 2004 22:17:37 -0000 1.1
+++ attrenum_vb_enum1.xsd 11 Oct 2004 22:38:07 -0000 1.2
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://baz" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:attribute name="a" type="xs:byte" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
+ <xs:attribute name="b" type="xs:byte" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
</xs:schema>
1.2 +1 -0 xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_vb_enum2.xsd
Index: attrenum_vb_enum2.xsd
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/complex/enum/attr/attrenum_vb_enum2.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- attrenum_vb_enum2.xsd 21 Sep 2004 22:17:37 -0000 1.1
+++ attrenum_vb_enum2.xsd 11 Oct 2004 22:38:07 -0000 1.2
@@ -18,6 +18,7 @@
<xs:attribute ref="foo:n" xmlns:foo="http://foo"/>
<xs:attribute ref="baz:a" xmlns:baz="http://baz"/>
<xs:attribute ref="foo:r" xmlns:foo="http://foo"/>
+ <xs:attribute ref="baz:b" xmlns:baz="http://baz"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
1.2 +1 -1 xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/examples/sampleRss092_rd0.xsd
Index: sampleRss092_rd0.xsd
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/examples/sampleRss092_rd0.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sampleRss092_rd0.xsd 23 Aug 2004 22:02:47 -0000 1.1
+++ sampleRss092_rd0.xsd 11 Oct 2004 22:38:07 -0000 1.2
@@ -44,7 +44,7 @@
</xs:simpleContent>
</xs:complexType>
</xs:element>
- <xs:element name="source" maxOccurs="unbounded" minOccurs="0">
+ <xs:element name="source" minOccurs="0">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:string" xmlns:xs="http://www.w3.org/2001/XMLSchema">
1.2 +1 -1 xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/examples/sampleRss092_ss0.xsd
Index: sampleRss092_ss0.xsd
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/examples/sampleRss092_ss0.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sampleRss092_ss0.xsd 23 Aug 2004 22:02:47 -0000 1.1
+++ sampleRss092_ss0.xsd 11 Oct 2004 22:38:07 -0000 1.2
@@ -5,7 +5,7 @@
<xs:sequence>
<xs:element ref="description"/>
<xs:element ref="enclosure" minOccurs="0"/>
- <xs:element ref="source" maxOccurs="unbounded" minOccurs="0"/>
+ <xs:element ref="source" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
</xs:element>
1.2 +1 -1 xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/examples/sampleRss092_vb0.xsd
Index: sampleRss092_vb0.xsd
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/examples/sampleRss092_vb0.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sampleRss092_vb0.xsd 23 Aug 2004 22:02:47 -0000 1.1
+++ sampleRss092_vb0.xsd 11 Oct 2004 22:38:07 -0000 1.2
@@ -37,7 +37,7 @@
<xs:sequence>
<xs:element type="xs:string" name="description" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
<xs:element type="enclosureType" name="enclosure" minOccurs="0"/>
- <xs:element type="sourceType" name="source" maxOccurs="unbounded" minOccurs="0"/>
+ <xs:element type="sourceType" name="source" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="sourceType">
1.2 +1 -1 xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/examples/slashdotrdf_rd1.xsd
Index: slashdotrdf_rd1.xsd
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/examples/slashdotrdf_rd1.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- slashdotrdf_rd1.xsd 23 Aug 2004 22:02:47 -0000 1.1
+++ slashdotrdf_rd1.xsd 11 Oct 2004 22:38:07 -0000 1.2
@@ -60,7 +60,7 @@
<xs:element name="image">
<xs:complexType>
<xs:sequence>
- <xs:element type="xs:QName" name="title" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
+ <xs:element type="xs:string" name="title" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
<xs:element type="xs:anyURI" name="url" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
<xs:element type="xs:anyURI" name="link" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
</xs:sequence>
1.2 +8 -1 xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/examples/xsl_vb1.xsd
Index: xsl_vb1.xsd
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/examples/xsl_vb1.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xsl_vb1.xsd 23 Aug 2004 22:02:47 -0000 1.1
+++ xsl_vb1.xsd 11 Oct 2004 22:38:07 -0000 1.2
@@ -9,7 +9,14 @@
</xs:complexType>
<xs:complexType name="trType">
<xs:sequence>
- <xs:element type="xs:string" name="th" maxOccurs="unbounded" minOccurs="0" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
+ <xs:element name="th" maxOccurs="unbounded" minOccurs="0">
+ <xs:simpleType>
+ <xs:restriction base="xs:string" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:enumeration value="Title"/>
+ <xs:enumeration value="Artist"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
<xs:element type="tdType" name="td" maxOccurs="unbounded" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
1.2 +1 -1 xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/examples/po/po_rd_eN0.xsd
Index: po_rd_eN0.xsd
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/examples/po/po_rd_eN0.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- po_rd_eN0.xsd 21 Sep 2004 22:17:39 -0000 1.1
+++ po_rd_eN0.xsd 11 Oct 2004 22:38:08 -0000 1.2
@@ -38,7 +38,7 @@
<xs:element type="xs:byte" name="quantity" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
<xs:element type="xs:float" name="USPrice" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
<xs:element type="xs:string" name="comment" minOccurs="0" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
- <xs:element type="xs:date" name="shipDate" maxOccurs="unbounded" minOccurs="0" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
+ <xs:element type="xs:date" name="shipDate" minOccurs="0" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
</xs:sequence>
<xs:attribute type="xs:string" name="partNum" use="optional" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
</xs:complexType>
1.2 +1 -1 xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/examples/po/po_ss0.xsd
Index: po_ss0.xsd
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/examples/po/po_ss0.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- po_ss0.xsd 21 Sep 2004 22:17:39 -0000 1.1
+++ po_ss0.xsd 11 Oct 2004 22:38:08 -0000 1.2
@@ -7,7 +7,7 @@
<xs:element ref="quantity"/>
<xs:element ref="USPrice"/>
<xs:element ref="comment" minOccurs="0"/>
- <xs:element ref="shipDate" maxOccurs="unbounded" minOccurs="0"/>
+ <xs:element ref="shipDate" minOccurs="0"/>
</xs:sequence>
<xs:attribute type="xs:string" name="partNum" use="optional" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
</xs:complexType>
1.2 +1 -1 xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/examples/po/po_ss_eN0.xsd
Index: po_ss_eN0.xsd
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/examples/po/po_ss_eN0.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- po_ss_eN0.xsd 21 Sep 2004 22:17:39 -0000 1.1
+++ po_ss_eN0.xsd 11 Oct 2004 22:38:08 -0000 1.2
@@ -7,7 +7,7 @@
<xs:element ref="quantity"/>
<xs:element ref="USPrice"/>
<xs:element ref="comment" minOccurs="0"/>
- <xs:element ref="shipDate" maxOccurs="unbounded" minOccurs="0"/>
+ <xs:element ref="shipDate" minOccurs="0"/>
</xs:sequence>
<xs:attribute type="xs:string" name="partNum" use="optional" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
</xs:complexType>
1.2 +1 -1 xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/examples/po/po_vb0.xsd
Index: po_vb0.xsd
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/examples/po/po_vb0.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- po_vb0.xsd 21 Sep 2004 22:17:39 -0000 1.1
+++ po_vb0.xsd 11 Oct 2004 22:38:08 -0000 1.2
@@ -55,7 +55,7 @@
</xs:simpleType>
</xs:element>
<xs:element type="xs:string" name="comment" minOccurs="0" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
- <xs:element type="xs:date" name="shipDate" maxOccurs="unbounded" minOccurs="0" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
+ <xs:element type="xs:date" name="shipDate" minOccurs="0" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
</xs:sequence>
<xs:attribute type="xs:string" name="partNum" use="optional" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
</xs:complexType>
1.2 +1 -1 xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/examples/po/po_vb_eN0.xsd
Index: po_vb_eN0.xsd
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/examples/po/po_vb_eN0.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- po_vb_eN0.xsd 21 Sep 2004 22:17:39 -0000 1.1
+++ po_vb_eN0.xsd 11 Oct 2004 22:38:08 -0000 1.2
@@ -41,7 +41,7 @@
<xs:element type="xs:byte" name="quantity" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
<xs:element type="xs:float" name="USPrice" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
<xs:element type="xs:string" name="comment" minOccurs="0" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
- <xs:element type="xs:date" name="shipDate" maxOccurs="unbounded" minOccurs="0" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
+ <xs:element type="xs:date" name="shipDate" minOccurs="0" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
</xs:sequence>
<xs:attribute type="xs:string" name="partNum" use="optional" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
</xs:complexType>
1.2 +1 -1 xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/examples/po/po_vb_scs0.xsd
Index: po_vb_scs0.xsd
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/examples/po/po_vb_scs0.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- po_vb_scs0.xsd 21 Sep 2004 22:17:39 -0000 1.1
+++ po_vb_scs0.xsd 11 Oct 2004 22:38:08 -0000 1.2
@@ -41,7 +41,7 @@
<xs:element type="xs:string" name="quantity" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
<xs:element type="xs:string" name="USPrice" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
<xs:element type="xs:string" name="comment" minOccurs="0" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
- <xs:element type="xs:string" name="shipDate" maxOccurs="unbounded" minOccurs="0" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
+ <xs:element type="xs:string" name="shipDate" minOccurs="0" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
</xs:sequence>
<xs:attribute type="xs:string" name="partNum" use="optional" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
</xs:complexType>
1.2 +1 -1 xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/examples/po/po_vb_scs_enum0.xsd
Index: po_vb_scs_enum0.xsd
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/examples/po/po_vb_scs_enum0.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- po_vb_scs_enum0.xsd 21 Sep 2004 22:17:39 -0000 1.1
+++ po_vb_scs_enum0.xsd 11 Oct 2004 22:38:08 -0000 1.2
@@ -55,7 +55,7 @@
</xs:simpleType>
</xs:element>
<xs:element type="xs:string" name="comment" minOccurs="0" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
- <xs:element type="xs:string" name="shipDate" maxOccurs="unbounded" minOccurs="0" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
+ <xs:element type="xs:string" name="shipDate" minOccurs="0" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
</xs:sequence>
<xs:attribute type="xs:string" name="partNum" use="optional" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
</xs:complexType>
1.2 +1 -1 xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/namespaces/duplicatedNS_ss0.xsd
Index: duplicatedNS_ss0.xsd
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/namespaces/duplicatedNS_ss0.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- duplicatedNS_ss0.xsd 25 Aug 2004 17:33:05 -0000 1.1
+++ duplicatedNS_ss0.xsd 11 Oct 2004 22:38:08 -0000 1.2
@@ -8,9 +8,9 @@
<xs:sequence>
<xs:element ref="ins:b" xmlns:ins="http://xmlbeans.apache.org/inst2xsd"/>
<xs:element ref="ins:c" xmlns:ins="http://xmlbeans.apache.org/inst2xsd"/>
+ <xs:element ref="ins:a" minOccurs="0" xmlns:ins="http://xmlbeans.apache.org/inst2xsd"/>
<xs:element ref="ins:d" xmlns:ins="http://xmlbeans.apache.org/inst2xsd"/>
<xs:element ref="ins:e" maxOccurs="unbounded" minOccurs="0" xmlns:ins="http://xmlbeans.apache.org/inst2xsd"/>
- <xs:element ref="ins:a" maxOccurs="unbounded" minOccurs="0" xmlns:ins="http://xmlbeans.apache.org/inst2xsd"/>
</xs:sequence>
</xs:complexType>
</xs:element>
1.2 +1 -1 xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/namespaces/duplicatedNS_vb0.xsd
Index: duplicatedNS_vb0.xsd
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/namespaces/duplicatedNS_vb0.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- duplicatedNS_vb0.xsd 25 Aug 2004 17:33:05 -0000 1.1
+++ duplicatedNS_vb0.xsd 11 Oct 2004 22:38:08 -0000 1.2
@@ -5,9 +5,9 @@
<xs:sequence>
<xs:element type="xs:string" name="b" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
<xs:element type="xs:byte" name="c" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
+ <xs:element type="ins:aType" name="a" minOccurs="0" xmlns:ins="http://xmlbeans.apache.org/inst2xsd"/>
<xs:element type="xs:string" name="d" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
<xs:element type="xs:string" name="e" maxOccurs="unbounded" minOccurs="0" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
- <xs:element type="ins:aType" name="a" maxOccurs="unbounded" minOccurs="0" xmlns:ins="http://xmlbeans.apache.org/inst2xsd"/>
</xs:sequence>
</xs:complexType>
</xs:schema>
1.2 +2 -2 xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/types/xsinil_vb0.xsd
Index: xsinil_vb0.xsd
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/types/xsinil_vb0.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xsinil_vb0.xsd 23 Aug 2004 22:02:50 -0000 1.1
+++ xsinil_vb0.xsd 11 Oct 2004 22:38:08 -0000 1.2
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="urn:contoso-com:People" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:element name="person" type="urn:personType" xmlns:urn="urn:contoso-com:People"/>
+<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="a:b:c" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:element name="person" type="a:personType" xmlns:a="a:b:c"/>
<xs:complexType name="personType">
<xs:sequence>
<xs:element ref="name"/>
1.2 +1 -1 xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/types/xsinil_vb1.xsd
Index: xsinil_vb1.xsd
===================================================================
RCS file: /home/cvs/xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/types/xsinil_vb1.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xsinil_vb1.xsd 23 Aug 2004 22:02:50 -0000 1.1
+++ xsinil_vb1.xsd 11 Oct 2004 22:38:08 -0000 1.2
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:element name="height" type="xs:string" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
+ <xs:element name="height" nillable="true" type="xs:string" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
<xs:element name="name" type="xs:string" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
</xs:schema>
1.1 xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/types/comments.xml
Index: comments.xml
===================================================================
<a xmlns="comments" xmlns:this="comments" xmlns:foo="http://fooz"><!-- this is a comment 1 -->
<b /><!-- this is a comment 2 -->
<c>123456</c>
<!-- this is a comment 4 -->
<d><!-- this is a comment 5 -->asdsa</d>
<e >12323<!-- this is a comment 6 --></e>
<!-- this is a comment 7 -->
<f> <!-- this is a comment 8 --> </f>
<!-- final comment -->
</a>
1.1 xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/types/commentschoice.xml
Index: commentschoice.xml
===================================================================
<a xmlns="comments" xmlns:this="comments" xmlns:foo="http://fooz"><!-- this is a comment 1 -->
<b /><!-- this is a comment 2 -->
<c>123456</c>
<!-- this is a comment 4 -->
<b><!-- this is a comment 5 -->asdsa</b>
<c >12323<!-- this is a comment 6 --></c>
<!-- this is a comment 7 -->
<d> <!-- this is a comment 8 --> </d>
<!-- final comment -->
</a>
1.1 xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/types/commentschoice_eNrd0.xsd
Index: commentschoice_eNrd0.xsd
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="comments" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:element name="a">
<xs:annotation>
<xs:documentation>final comment</xs:documentation>
</xs:annotation>
<xs:complexType>
<xs:choice maxOccurs="unbounded" minOccurs="0">
<xs:element type="xs:string" name="b" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:annotation>
<xs:documentation>this is a comment 1</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element type="xs:string" name="c" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:annotation>
<xs:documentation>this is a comment 4 this is a comment 5</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element type="xs:string" name="d" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:annotation>
<xs:documentation>this is a comment 7 this is a comment 8</xs:documentation>
</xs:annotation>
</xs:element>
</xs:choice>
</xs:complexType>
</xs:element>
</xs:schema>
1.1 xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/types/commentschoice_eNss0.xsd
Index: commentschoice_eNss0.xsd
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="comments" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:element name="a">
<xs:annotation>
<xs:documentation>final comment</xs:documentation>
</xs:annotation>
<xs:complexType>
<xs:choice maxOccurs="unbounded" minOccurs="0">
<xs:element ref="com:b" xmlns:com="comments">
<xs:annotation>
<xs:documentation>this is a comment 1</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element ref="com:c" xmlns:com="comments">
<xs:annotation>
<xs:documentation>this is a comment 4 this is a comment 5</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element ref="com:d" xmlns:com="comments">
<xs:annotation>
<xs:documentation>this is a comment 7 this is a comment 8</xs:documentation>
</xs:annotation>
</xs:element>
</xs:choice>
</xs:complexType>
</xs:element>
<xs:element name="d" type="xs:string" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
<xs:element name="c" type="xs:string" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
<xs:element name="b" type="xs:string" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
</xs:schema>
1.1 xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/types/commentschoice_eNvb0.xsd
Index: commentschoice_eNvb0.xsd
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="comments" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:element name="a" type="com:aType" xmlns:com="comments">
<xs:annotation>
<xs:documentation>final comment</xs:documentation>
</xs:annotation>
</xs:element>
<xs:complexType name="aType">
<xs:choice maxOccurs="unbounded" minOccurs="0">
<xs:element type="xs:string" name="b" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:annotation>
<xs:documentation>this is a comment 1</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element type="xs:string" name="c" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:annotation>
<xs:documentation>this is a comment 4 this is a comment 5</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element type="xs:string" name="d" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:annotation>
<xs:documentation>this is a comment 7 this is a comment 8</xs:documentation>
</xs:annotation>
</xs:element>
</xs:choice>
</xs:complexType>
</xs:schema>
1.1 xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/types/commentschoice_vb0.xsd
Index: commentschoice_vb0.xsd
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="comments" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:element name="a" type="com:aType" xmlns:com="comments">
<xs:annotation>
<xs:documentation>final comment</xs:documentation>
</xs:annotation>
</xs:element>
<xs:complexType name="aType">
<xs:choice maxOccurs="unbounded" minOccurs="0">
<xs:element type="xs:string" name="b" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:annotation>
<xs:documentation>this is a comment 1</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="c">
<xs:annotation>
<xs:documentation>this is a comment 4 this is a comment 5</xs:documentation>
</xs:annotation>
<xs:simpleType>
<xs:restriction base="xs:string" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:enumeration value="123456"/>
<xs:enumeration value="asdsa"/>
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element type="xs:string" name="d" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:annotation>
<xs:documentation>this is a comment 7 this is a comment 8</xs:documentation>
</xs:annotation>
</xs:element>
</xs:choice>
</xs:complexType>
</xs:schema>
1.1 xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/types/innercomment.xml
Index: innercomment.xml
===================================================================
<a>
<c>12323<!-- this is a comment 6 -->23</c>
</a>
1.1 xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/types/innercomment_vb0.xsd
Index: innercomment_vb0.xsd
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:element name="a" type="aType"/>
<xs:complexType name="aType">
<xs:sequence>
<xs:element type="xs:int" name="c" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:annotation>
<xs:documentation>this is a comment 6</xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:schema>
1.1 xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/types/xsinil_rd0.xsd
Index: xsinil_rd0.xsd
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="a:b:c" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:element name="person">
<xs:complexType>
<xs:sequence>
<xs:element ref="name"/>
<xs:element ref="height"/>
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:schema>
1.1 xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/types/xsinil_rd1.xsd
Index: xsinil_rd1.xsd
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:element name="height" nillable="true" type="xs:string" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
<xs:element name="name" type="xs:string" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
</xs:schema>
1.1 xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/types/xsinil_ss0.xsd
Index: xsinil_ss0.xsd
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="a:b:c" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:element name="person">
<xs:complexType>
<xs:sequence>
<xs:element ref="name"/>
<xs:element ref="height"/>
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:schema>
1.1 xml-xmlbeans/v2/test/cases/xbean/tools/inst2xsd/schema/types/xsinil_ss1.xsd
Index: xsinil_ss1.xsd
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:element name="height" nillable="true" type="xs:string" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
<xs:element name="name" type="xs:string" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
</xs:schema>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlbeans.apache.org
For additional commands, e-mail: commits-help@xmlbeans.apache.org