You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlbeans.apache.org by ce...@apache.org on 2009/05/11 23:22:16 UTC
svn commit: r773699 [2/2] - in /xmlbeans/trunk:
src/tools/org/apache/xmlbeans/impl/inst2xsd/util/
src/xmlpublic/org/apache/xmlbeans/ test/cases/xbean/tools/inst2xsd/schema/
test/cases/xbean/tools/inst2xsd/schema/examples/
test/cases/xbean/tools/inst2xs...
Modified: xmlbeans/trunk/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_rd3.xsd
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_rd3.xsd?rev=773699&r1=773698&r2=773699&view=diff
==============================================================================
--- xmlbeans/trunk/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_rd3.xsd (original)
+++ xmlbeans/trunk/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_rd3.xsd Mon May 11 21:22:13 2009
@@ -1,5 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://xmlbeans.apache.org/b" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:element name="e" type="xs:byte" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
- <xs:element name="c" type="xs:byte" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
+<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://xmlbeans.apache.org/inst2xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:element name="a">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="a:b" xmlns:a="http://xmlbeans.apache.org/a"/>
+ <xs:element ref="b:c" xmlns:b="http://xmlbeans.apache.org/b"/>
+ <xs:element type="xs:string" name="a" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
+ <xs:element ref="a:d" xmlns:a="http://xmlbeans.apache.org/a"/>
+ <xs:element ref="b:e" xmlns:b="http://xmlbeans.apache.org/b"/>
+ <xs:element ref="c:d" xmlns:c="http://xmlbeans.apache.org/c"/>
+ <xs:element type="xs:string" name="e" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
</xs:schema>
\ No newline at end of file
Modified: xmlbeans/trunk/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_ss0.xsd
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_ss0.xsd?rev=773699&r1=773698&r2=773699&view=diff
==============================================================================
--- xmlbeans/trunk/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_ss0.xsd (original)
+++ xmlbeans/trunk/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_ss0.xsd Mon May 11 21:22:13 2009
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://xmlbeans.apache.org/a" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:element name="d" 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:element name="d" type="xs:string" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
</xs:schema>
\ No newline at end of file
Modified: xmlbeans/trunk/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_ss1.xsd
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_ss1.xsd?rev=773699&r1=773698&r2=773699&view=diff
==============================================================================
--- xmlbeans/trunk/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_ss1.xsd (original)
+++ xmlbeans/trunk/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_ss1.xsd Mon May 11 21:22:13 2009
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://xmlbeans.apache.org/c" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:element name="d" type="xs:string" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
+<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://xmlbeans.apache.org/b" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:element name="c" type="xs:byte" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
+ <xs:element name="e" type="xs:byte" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
</xs:schema>
\ No newline at end of file
Modified: xmlbeans/trunk/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_ss3.xsd
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_ss3.xsd?rev=773699&r1=773698&r2=773699&view=diff
==============================================================================
--- xmlbeans/trunk/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_ss3.xsd (original)
+++ xmlbeans/trunk/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_ss3.xsd Mon May 11 21:22:13 2009
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://xmlbeans.apache.org/b" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:element name="e" type="xs:byte" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
- <xs:element name="c" type="xs:byte" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
+<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://xmlbeans.apache.org/c" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:element name="d" type="xs:string" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
</xs:schema>
\ No newline at end of file
Modified: xmlbeans/trunk/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_vb0.xsd
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_vb0.xsd?rev=773699&r1=773698&r2=773699&view=diff
==============================================================================
--- xmlbeans/trunk/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_vb0.xsd (original)
+++ xmlbeans/trunk/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_vb0.xsd Mon May 11 21:22:13 2009
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://xmlbeans.apache.org/a" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:element name="d" 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:element name="d" type="xs:string" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
</xs:schema>
\ No newline at end of file
Modified: xmlbeans/trunk/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_vb1.xsd
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_vb1.xsd?rev=773699&r1=773698&r2=773699&view=diff
==============================================================================
--- xmlbeans/trunk/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_vb1.xsd (original)
+++ xmlbeans/trunk/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_vb1.xsd Mon May 11 21:22:13 2009
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://xmlbeans.apache.org/c" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:element name="d" type="xs:string" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
+<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://xmlbeans.apache.org/b" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:element name="c" type="xs:byte" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
+ <xs:element name="e" type="xs:byte" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
</xs:schema>
\ No newline at end of file
Modified: xmlbeans/trunk/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_vb2.xsd
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_vb2.xsd?rev=773699&r1=773698&r2=773699&view=diff
==============================================================================
--- xmlbeans/trunk/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_vb2.xsd (original)
+++ xmlbeans/trunk/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_vb2.xsd Mon May 11 21:22:13 2009
@@ -1,15 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://xmlbeans.apache.org/inst2xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:element name="a" type="ins:aType" xmlns:ins="http://xmlbeans.apache.org/inst2xsd"/>
- <xs:complexType name="aType">
- <xs:sequence>
- <xs:element ref="a:b" xmlns:a="http://xmlbeans.apache.org/a"/>
- <xs:element ref="b:c" xmlns:b="http://xmlbeans.apache.org/b"/>
- <xs:element type="xs:string" name="a" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
- <xs:element ref="a:d" xmlns:a="http://xmlbeans.apache.org/a"/>
- <xs:element ref="b:e" xmlns:b="http://xmlbeans.apache.org/b"/>
- <xs:element ref="c:d" xmlns:c="http://xmlbeans.apache.org/c"/>
- <xs:element type="xs:string" name="e" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
- </xs:sequence>
- </xs:complexType>
+<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://xmlbeans.apache.org/c" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:element name="d" type="xs:string" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
</xs:schema>
\ No newline at end of file
Modified: xmlbeans/trunk/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_vb3.xsd
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_vb3.xsd?rev=773699&r1=773698&r2=773699&view=diff
==============================================================================
--- xmlbeans/trunk/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_vb3.xsd (original)
+++ xmlbeans/trunk/test/cases/xbean/tools/inst2xsd/schema/namespaces/multipleNestedNS_vb3.xsd Mon May 11 21:22:13 2009
@@ -1,5 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://xmlbeans.apache.org/b" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:element name="e" type="xs:byte" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
- <xs:element name="c" type="xs:byte" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
+<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://xmlbeans.apache.org/inst2xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:element name="a" type="ins:aType" xmlns:ins="http://xmlbeans.apache.org/inst2xsd"/>
+ <xs:complexType name="aType">
+ <xs:sequence>
+ <xs:element ref="a:b" xmlns:a="http://xmlbeans.apache.org/a"/>
+ <xs:element ref="b:c" xmlns:b="http://xmlbeans.apache.org/b"/>
+ <xs:element type="xs:string" name="a" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
+ <xs:element ref="a:d" xmlns:a="http://xmlbeans.apache.org/a"/>
+ <xs:element ref="b:e" xmlns:b="http://xmlbeans.apache.org/b"/>
+ <xs:element ref="c:d" xmlns:c="http://xmlbeans.apache.org/c"/>
+ <xs:element type="xs:string" name="e" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
+ </xs:sequence>
+ </xs:complexType>
</xs:schema>
\ No newline at end of file
Modified: xmlbeans/trunk/test/cases/xbean/tools/inst2xsd/schema/namespaces/simple_ss0.xsd
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/cases/xbean/tools/inst2xsd/schema/namespaces/simple_ss0.xsd?rev=773699&r1=773698&r2=773699&view=diff
==============================================================================
--- xmlbeans/trunk/test/cases/xbean/tools/inst2xsd/schema/namespaces/simple_ss0.xsd (original)
+++ xmlbeans/trunk/test/cases/xbean/tools/inst2xsd/schema/namespaces/simple_ss0.xsd Mon May 11 21:22:13 2009
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://xmlbeans.apache.org/inst2xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:element name="d" 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:element name="c" type="xs:byte" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
+ <xs:element name="d" type="xs:string" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
+ <xs:element name="e" type="xs:string" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
<xs:element name="a">
<xs:complexType>
<xs:sequence>
@@ -13,5 +14,4 @@
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="e" type="xs:string" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
</xs:schema>
\ No newline at end of file
Modified: xmlbeans/trunk/test/cases/xbean/tools/inst2xsd/schema/simpleName_ss0.xsd
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/cases/xbean/tools/inst2xsd/schema/simpleName_ss0.xsd?rev=773699&r1=773698&r2=773699&view=diff
==============================================================================
--- xmlbeans/trunk/test/cases/xbean/tools/inst2xsd/schema/simpleName_ss0.xsd (original)
+++ xmlbeans/trunk/test/cases/xbean/tools/inst2xsd/schema/simpleName_ss0.xsd Mon May 11 21:22:13 2009
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:element name="last" type="xs:string" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
<xs:element name="first" type="xs:string" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
+ <xs:element name="last" type="xs:string" xmlns:xs="http://www.w3.org/2001/XMLSchema"/>
<xs:element name="name">
<xs:complexType>
<xs:sequence>
Modified: xmlbeans/trunk/test/src/tools/inst2xsd/checkin/Inst2XsdCheckinTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/tools/inst2xsd/checkin/Inst2XsdCheckinTest.java?rev=773699&r1=773698&r2=773699&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/tools/inst2xsd/checkin/Inst2XsdCheckinTest.java (original)
+++ xmlbeans/trunk/test/src/tools/inst2xsd/checkin/Inst2XsdCheckinTest.java Mon May 11 21:22:13 2009
@@ -333,6 +333,4 @@
runSchemaBuild(inst, common.getSalamiOptions(),
XmlObject.Factory.parse(new File(SCHEMA_CASES_DIR + "examples" + P + "sampleRss091_ss0.xsd")));
}
-
-
}
Modified: xmlbeans/trunk/test/src/xmlobject/schematypes/checkin/GDateTests.java
URL: http://svn.apache.org/viewvc/xmlbeans/trunk/test/src/xmlobject/schematypes/checkin/GDateTests.java?rev=773699&r1=773698&r2=773699&view=diff
==============================================================================
--- xmlbeans/trunk/test/src/xmlobject/schematypes/checkin/GDateTests.java (original)
+++ xmlbeans/trunk/test/src/xmlobject/schematypes/checkin/GDateTests.java Mon May 11 21:22:13 2009
@@ -143,7 +143,8 @@
"1996-13-28T00:00:00Z", // month
"1996-02-00T00:00:00Z", // day
"2000-02-30T00:00:00Z", // day
- "1996-02-29T24:00:00Z", // hr
+ "1996-02-29T25:00:00Z", // hr
+ "1996-02-29T24:00:01Z", // hr
"1996-02-29T00:60:00Z", // min
"1996-02-29T00:00:60Z", // sec
"1996-02-29T00:00:00+14:01", // tz
@@ -164,7 +165,8 @@
"--11-31", // day
"---00", // day
"---32", // day
- "24:00:00Z", // hr
+ "25:00:00Z", // hr
+ "24:01:00Z", // hr
"00:60:00Z", // min
"00:00:60Z", // sec
"00:00:00+14:01", // tz
@@ -251,6 +253,9 @@
"-0004--31T00:00:00+01:30",
"2002-04-18T23:59:59Z",
"-0423-12-31T00:00:00-05:00",
+ "1996-02-29T24:00:00Z", // 24:00:00 is valid
+ "24:00:00Z", // 24:00:00 is valid
+
};
private boolean hasTime(GDuration gd)
@@ -571,8 +576,13 @@
Assert.fail("Problem with " + str + ": " + e.getMessage());
}
- // must round-trip to string
- Assert.assertEquals(str, gdate.toString());
+ if ( str.contains("24:00:00") && gdate.hasDay() ) // for 24h if hasDay must be normalized, else has the same representation
+ {
+ Assert.assertTrue(str + " " + gdate.toString(), gdate.hasDay() && gdate.toString().contains("00:00:00"));
+ }
+ else
+ // must round-trip to string
+ Assert.assertEquals(str, gdate.toString());
// must round-trip to GregorianCalendar if fractions-of-seconds <=3 digits
if (gdate.getFraction() == null || gdate.getFraction().scale() <= 3)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlbeans.apache.org
For additional commands, e-mail: commits-help@xmlbeans.apache.org