6 commits - schemas/contact.xsd schemas/incidence.xsd testfiles/testcontact.xml testfiles/testevent.xml testfiles/testnote.xml
Christian Mollekopf
mollekopf at kolabsys.com
Thu Oct 20 21:22:21 CEST 2011
schemas/contact.xsd | 4 +-
schemas/incidence.xsd | 12 +++++-
testfiles/testcontact.xml | 61 ++++++++++++++++++++++++++++++++++
testfiles/testevent.xml | 81 ++++++++++++++++++++++++++++++++++++++++++++++
testfiles/testnote.xml | 2 -
5 files changed, 155 insertions(+), 5 deletions(-)
New commits:
commit 7edd132530bc512ec6a475da76ba4eb1f4824e38
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date: Thu Oct 20 21:22:15 2011 +0200
Ignore recurrence to validate testevent
diff --git a/schemas/incidence.xsd b/schemas/incidence.xsd
index 1e52bef..6659e75 100644
--- a/schemas/incidence.xsd
+++ b/schemas/incidence.xsd
@@ -16,8 +16,15 @@
</xs:element>
<xs:element name="organizer" type="SMTPContact"></xs:element>
<xs:element name="alarm" type="xs:string"></xs:element>
- <xs:element name="recurrence" type="Recurrence"></xs:element>
- <xs:element name="attendees">
+ <xs:element name="recurrence">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"></xs:any>
+ </xs:sequence>
+ <xs:attribute name="cycle" type="xs:string">
+ </xs:attribute>
+ </xs:complexType>
+ </xs:element>
<xs:element name="attendee">
<xs:complexType>
<xs:complexContent>
commit 0d04d9659b9f7331ca76f438d2e9334d6862d83e
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date: Thu Oct 20 21:21:59 2011 +0200
testevent
diff --git a/testfiles/testevent.xml b/testfiles/testevent.xml
new file mode 100644
index 0000000..af2425f
--- /dev/null
+++ b/testfiles/testevent.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- event version="1.0" xmlns="http://www.kolab.org/Kolab">
+ <uid>uid</uid>
+ <body>body</body>
+ <categories>categories</categories>
+ <creation-date>2001-12-31T12:00:00</creation-date>
+ <last-modification-date>2001-12-31T12:00:00</last-modification-date>
+ <sensitivity>public</sensitivity>
+ <product-id>product-id</product-id>
+ <summary>summary</summary>
+ <location>location</location>
+ <creator>
+ <display-name>display-name</display-name>
+ <smtp-address>smtp-address</smtp-address>
+ </creator>
+ <organizer>
+ <display-name>display-name</display-name>
+ <smtp-address>smtp-address</smtp-address>
+ </organizer>
+ <alarm>alarm</alarm>
+ <recurrence>
+ <interval>interval</interval>
+ <rangetype/>
+ </recurrence>
+ <attendees>
+ <display-name>display-name</display-name>
+ <smtp-address>smtp-address</smtp-address>
+ <status>status</status>
+ <request-response>request-response</request-response>
+ <role>role</role>
+ </attendees>
+ <show-time-as>show-time-as</show-time-as>
+ <color-label>color-label</color-label>
+ <start-date>2001-12-31T12:00:00</start-date>
+ <end-date>2001-12-31T12:00:00</end-date>
+</event-->
+<event version="1.0" xmlns="http://www.kolab.org/Kolab">
+ <!-- Common fields -->
+ <uid>uid</uid>
+ <body></body>
+ <categories></categories>
+ <creation-date>2004-05-04T15:00:00Z</creation-date>
+ <last-modification-date>2004-05-04T15:00:00Z</last-modification-date>
+ <sensitivity>public</sensitivity>
+ <inline-attachment></inline-attachment>
+ <link-attachment></link-attachment>
+ <product-id></product-id>
+ <!-- Incidence fields -->
+ <summary>(string, default empty)</summary>
+ <location>(string, default empty)</location>
+ <creator>
+ <display-name>(string, default empty)</display-name>
+ <smtp-address>(string, default empty)</smtp-address>
+ </creator>
+ <organizer>
+ <display-name>(string, default empty)</display-name>
+ <smtp-address>(string, default empty)</smtp-address>
+ </organizer>
+ <alarm>(number, no default)</alarm>
+ <recurrence cycle="cycletype">
+ <interval>1</interval>
+ <day>(string, no default)</day>
+ <daynumber>0</daynumber>
+ <date>2</date>
+ <month>(string, no default></month>
+ <range type="rangetype"></range>
+ <exclusion>(date, no default)</exclusion>
+ </recurrence>
+ <attendee>
+ <display-name>(string, default empty)</display-name>
+ <smtp-address>(string, default empty)</smtp-address>
+ <status>(string, default none)</status>
+ <request-response>(bool, default true)</request-response>
+ <role>(string, default required)</role>
+ </attendee>
+ <!-- Event specific fields -->
+ <show-time-as>(string, default busy)</show-time-as>
+ <color-label>(string, default none)</color-label>
+ <start-date>2004-05-04T15:00:00Z</start-date>
+ <end-date>2004-05-04T15:00:00Z</end-date>
+</event>
\ No newline at end of file
commit b9b84c3822ff090c7b81a6387380088c876292cf
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date: Thu Oct 20 21:21:45 2011 +0200
typo
diff --git a/schemas/incidence.xsd b/schemas/incidence.xsd
index 2563521..1e52bef 100644
--- a/schemas/incidence.xsd
+++ b/schemas/incidence.xsd
@@ -18,6 +18,7 @@
<xs:element name="alarm" type="xs:string"></xs:element>
<xs:element name="recurrence" type="Recurrence"></xs:element>
<xs:element name="attendees">
+ <xs:element name="attendee">
<xs:complexType>
<xs:complexContent>
<xs:extension base="SMTPContact">
commit aaad78663e934db41451a6b8d04b9fdf7ee45516
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date: Thu Oct 20 20:39:22 2011 +0200
a test contact file
diff --git a/testfiles/testcontact.xml b/testfiles/testcontact.xml
new file mode 100644
index 0000000..f0e0f1b
--- /dev/null
+++ b/testfiles/testcontact.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<contact version="1.0" xmlns="http://www.kolab.org/Kolab">
+ <!-- Common fields -->
+ <uid>uid</uid>
+ <body></body>
+ <categories></categories>
+ <creation-date>2004-05-04T15:00:00Z</creation-date>
+ <last-modification-date>2004-05-04T15:00:00Z</last-modification-date>
+ <sensitivity>public</sensitivity>
+ <inline-attachment></inline-attachment>
+ <link-attachment></link-attachment>
+ <product-id></product-id>
+ <!-- Contact specific fields -->
+ <name>
+ <given-name>(string, default empty)</given-name>
+ <middle-names>(string, default empty)</middle-names>
+ <last-name>(string, default empty)</last-name>
+ <full-name>(string, default empty)</full-name>
+ <initials>(string, default empty)</initials>
+ <prefix>(string, default empty)</prefix>
+ <suffix>(string, default empty)</suffix>
+ </name>
+ <free-busy-url>(string, default empty)</free-busy-url>
+ <organization>(string, default empty)</organization>
+ <web-page>(string, default empty)</web-page>
+ <im-address>(string, default empty)</im-address>
+ <department>(string, default empty)</department>
+ <office-location>(string, default empty)</office-location>
+ <profession>(string, default empty)</profession>
+ <job-title>(string, default empty)</job-title>
+ <manager-name>(string, default empty)</manager-name>
+ <assistant>(string, default empty)</assistant>
+ <nick-name>(string, default empty)</nick-name>
+ <spouse-name>(string, default empty)</spouse-name>
+ <birthday>(date, no default)</birthday>
+ <anniversary>(date, no default)</anniversary>
+ <picture>(string(attachment filename), default empty)</picture>
+ <children>(string, default empty)</children>
+ <gender>(string, default empty)</gender>
+ <language>(string, default empty)</language>
+ <phone>
+ <type>(string, no default)</type>
+ <number>(string, default empty)</number>
+ </phone>
+ <email>
+ <display-name>(string, default empty)</display-name>
+ <smtp-address>(string, default empty)</smtp-address>
+ </email>
+ <address>
+ <type>(string, default home)</type>
+ <street>(string, default empty)</street>
+ <locality>(string, default empty)</locality>
+ <region>(string, default empty)</region>
+ <postal-code>(string, default empty)</postal-code>
+ <country>(string, default empty)</country>
+ </address>
+ <preferred-address>(string, default none)</preferred-address>
+ <latitude>3.23</latitude>
+ <longitude>5.222</longitude>
+</contact>
+
commit 09390420a4380c2cdb4ac1c92084de2b0610f31b
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date: Thu Oct 20 20:39:05 2011 +0200
remove from the testfile what we don't need
diff --git a/testfiles/testnote.xml b/testfiles/testnote.xml
index b6dcd0c..33e5d46 100644
--- a/testfiles/testnote.xml
+++ b/testfiles/testnote.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<note version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.kolab.org/Kolab" xsi:schemaLocation="http://www.kolab.org/Kolab note.xsd">
+<note version="1.0" xmlns="http://www.kolab.org/Kolab">
<!-- Common fields -->
<uid>uid</uid>
<body></body>
commit 860f4ad30e886d465fe1820d1dd8c18353261fcb
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date: Thu Oct 20 20:38:39 2011 +0200
use floats for latitue/longitude
diff --git a/schemas/contact.xsd b/schemas/contact.xsd
index aaa3c25..09a8443 100644
--- a/schemas/contact.xsd
+++ b/schemas/contact.xsd
@@ -113,8 +113,8 @@
<xs:element name="preferred-address"
type="xs:string">
</xs:element>
- <xs:element name="latitude" type="xs:string"></xs:element>
- <xs:element name="longitude" type="xs:string"></xs:element>
+ <xs:element name="latitude" type="xs:float"></xs:element>
+ <xs:element name="longitude" type="xs:float"></xs:element>
</xs:sequence>
</xs:extension>
</xs:complexContent>
More information about the commits
mailing list