3 commits - schemas/incidence.xsd testfiles/testcontact.xml testfiles/testevent.xml testfiles/testnote.xml
Christian Mollekopf
mollekopf at kolabsys.com
Thu Oct 27 11:34:15 CEST 2011
schemas/incidence.xsd | 23 ++++++++++++++++++++---
testfiles/testcontact.xml | 2 +-
testfiles/testevent.xml | 20 ++++++++++----------
testfiles/testnote.xml | 2 +-
4 files changed, 32 insertions(+), 15 deletions(-)
New commits:
commit 5198b32d4e57b684725228319b24322c47eec65d
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date: Thu Oct 27 11:33:58 2011 +0200
updated testfiles
diff --git a/testfiles/testcontact.xml b/testfiles/testcontact.xml
index 0869190..1db956b 100644
--- a/testfiles/testcontact.xml
+++ b/testfiles/testcontact.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<contact version="1.0" xmlns="kolab.org">
+<contact version="3.0dev1" xmlns="http://kolab.org">
<!-- Common fields -->
<uid>uid</uid>
<body></body>
diff --git a/testfiles/testevent.xml b/testfiles/testevent.xml
index e72559d..57aff69 100644
--- a/testfiles/testevent.xml
+++ b/testfiles/testevent.xml
@@ -34,41 +34,41 @@
<start-date>2001-12-31T12:00:00</start-date>
<end-date>2001-12-31T12:00:00</end-date>
</event-->
-<event version="1.0" xmlns="kolab.org">
+<event version="3.0dev1" xmlns="http://kolab.org">
<!-- Common fields -->
<uid>uid</uid>
- <body></body>
- <categories></categories>
+ <product-id></product-id>
<creation-date>2004-05-04T15:00:00Z</creation-date>
<last-modification-date>2004-05-04T15:00:00Z</last-modification-date>
<sensitivity>public</sensitivity>
+ <body></body>
+ <categories></categories>
<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>
+ <display-name>(string, default empty)</display-name>
</creator>
<organizer>
- <display-name>(string, default empty)</display-name>
<smtp-address>(string, default empty)</smtp-address>
+ <display-name>(string, default empty)</display-name>
</organizer>
<alarm>(number, no default)</alarm>
- <recurrence cycle="cycletype">
+ <dailyrecurrence cycle="daily">
<interval>1</interval>
<day>(string, no default)</day>
<daynumber>0</daynumber>
<date>2</date>
<month>(string, no default></month>
- <range type="rangetype"></range>
+ <range type="daily"></range>
<exclusion>(date, no default)</exclusion>
- </recurrence>
+ </dailyrecurrence>
<attendee>
- <display-name>(string, default empty)</display-name>
<smtp-address>(string, default empty)</smtp-address>
+ <display-name>(string, default empty)</display-name>
<status>(string, default none)</status>
<request-response>(bool, default true)</request-response>
<role>(string, default required)</role>
diff --git a/testfiles/testnote.xml b/testfiles/testnote.xml
index 8c211dd..f7ad5b0 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="kolab.org">
+<note version="3.0dev1" xmlns="http://kolab.org">
<!-- Common fields -->
<uid>uid</uid>
<body></body>
commit d901101112a58fb88050cf70fd0387b892853a56
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date: Thu Oct 27 11:31:53 2011 +0200
attendee is not abstract
diff --git a/schemas/incidence.xsd b/schemas/incidence.xsd
index dfbc62d..3aa082f 100644
--- a/schemas/incidence.xsd
+++ b/schemas/incidence.xsd
@@ -22,7 +22,7 @@
</xs:complexContent>
</xs:complexType>
- <xs:complexType name="Attendee" abstract="true">
+ <xs:complexType name="Attendee">
<xs:complexContent>
<xs:extension base="SMTPContact">
<xs:sequence>
commit 03c0c74a176b1c43ba13b32545e8582f673dd5bd
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date: Thu Oct 27 11:31:28 2011 +0200
specify role/status
diff --git a/schemas/incidence.xsd b/schemas/incidence.xsd
index 86436af..dfbc62d 100644
--- a/schemas/incidence.xsd
+++ b/schemas/incidence.xsd
@@ -26,14 +26,31 @@
<xs:complexContent>
<xs:extension base="SMTPContact">
<xs:sequence>
- <xs:element name="status" type="xs:string" />
+ <xs:element name="status" type="Status" />
<xs:element name="request-response" type="xs:string" />
- <xs:element name="role" type="xs:string" />
+ <xs:element name="role" type="Role" />
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
+ <xs:simpleType name="Status">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="none" />
+ <xs:enumeration value="tentative" />
+ <xs:enumeration value="accepted" />
+ <xs:enumeration value="declined" />
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="Role">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="required" />
+ <xs:enumeration value="optional" />
+ <xs:enumeration value="resource" />
+ </xs:restriction>
+ </xs:simpleType>
+
<xs:simpleType name="Cycle">
<xs:restriction base="xs:string">
<xs:enumeration value="daily" />
More information about the commits
mailing list