schemas/base.xsd schemas/contact.xsd schemas/event.xsd schemas/incidence.xsd schemas/note.xsd schemas/task.xsd
Jeroen van Meeuwen
vanmeeuwen at kolabsys.com
Sun Oct 23 13:09:27 CEST 2011
schemas/base.xsd | 12 +-
schemas/contact.xsd | 110 ++++++++++----------
schemas/event.xsd | 4
schemas/incidence.xsd | 268 +++++++++++++++++++++++++-------------------------
schemas/note.xsd | 2
schemas/task.xsd | 12 +-
6 files changed, 204 insertions(+), 204 deletions(-)
New commits:
commit c326eec23c0eb6bac81f03b2944382ea02ddff4a
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Sun Oct 23 12:09:09 2011 +0100
Resolve mixed spaces and tabs for indentation. 4 spaces to a tab
diff --git a/schemas/base.xsd b/schemas/base.xsd
index a6e140c..b41cfe8 100644
--- a/schemas/base.xsd
+++ b/schemas/base.xsd
@@ -49,12 +49,12 @@
</xs:restriction>
</xs:simpleType>
- <xs:complexType name="SMTPContact">
- <xs:sequence>
- <xs:element name="display-name" type="xs:string" default=""></xs:element>
- <xs:element name="smtp-address" type="xs:string" default=""></xs:element>
- </xs:sequence>
- </xs:complexType>
+ <xs:complexType name="SMTPContact">
+ <xs:sequence>
+ <xs:element name="display-name" type="xs:string" default=""></xs:element>
+ <xs:element name="smtp-address" type="xs:string" default=""></xs:element>
+ </xs:sequence>
+ </xs:complexType>
<xs:attribute name="version" type="xs:float"/>
</xs:schema>
\ No newline at end of file
diff --git a/schemas/contact.xsd b/schemas/contact.xsd
index 5de990d..dcac506 100644
--- a/schemas/contact.xsd
+++ b/schemas/contact.xsd
@@ -12,70 +12,70 @@
<xs:complexContent>
<xs:extension base="XMLBase">
<xs:sequence>
- <xs:element name="name" type="Name">
- </xs:element>
- <xs:element name="free-busy-url" type="xs:string" default=""></xs:element>
- <xs:element name="organization" type="xs:string" default=""></xs:element>
- <xs:element name="web-page" type="xs:string" default=""></xs:element>
- <xs:element name="im-address" type="xs:string" default=""></xs:element>
- <xs:element name="department" type="xs:string" default=""></xs:element>
- <xs:element name="office-location" type="xs:string" default=""></xs:element>
- <xs:element name="profession" type="xs:string" default=""></xs:element>
- <xs:element name="job-title" type="xs:string" default=""></xs:element>
- <xs:element name="manager-name" type="xs:string" default=""></xs:element>
- <xs:element name="assistant" type="xs:string" default=""></xs:element>
- <xs:element name="nick-name" type="xs:string" default=""></xs:element>
- <xs:element name="spouse-name" type="xs:string" default=""></xs:element>
- <xs:element name="birthday" type="xs:string" minOccurs="0"></xs:element>
- <xs:element name="anniversary" type="xs:string" minOccurs="0"></xs:element>
- <xs:element name="picture" type="xs:string" default=""></xs:element>
- <xs:element name="children" type="xs:string" default=""></xs:element>
- <xs:element name="gender" type="xs:string" default=""></xs:element>
- <xs:element name="language" type="xs:string" default=""></xs:element>
- <xs:element name="phone" maxOccurs="unbounded"
- minOccurs="0" type="PhoneNumber">
- </xs:element>
- <xs:element name="email" maxOccurs="unbounded"
- minOccurs="0" type="SMTPContact">
- </xs:element>
- <xs:element name="address" maxOccurs="unbounded"
- minOccurs="0" type="Address">
- </xs:element>
- <xs:element name="preferred-address"
- type="xs:string" minOccurs="0">
- </xs:element>
- <xs:element name="latitude" type="xs:float" minOccurs="0"></xs:element>
- <xs:element name="longitude" type="xs:float" minOccurs="0"></xs:element>
+ <xs:element name="name" type="Name">
+ </xs:element>
+ <xs:element name="free-busy-url" type="xs:string" default=""></xs:element>
+ <xs:element name="organization" type="xs:string" default=""></xs:element>
+ <xs:element name="web-page" type="xs:string" default=""></xs:element>
+ <xs:element name="im-address" type="xs:string" default=""></xs:element>
+ <xs:element name="department" type="xs:string" default=""></xs:element>
+ <xs:element name="office-location" type="xs:string" default=""></xs:element>
+ <xs:element name="profession" type="xs:string" default=""></xs:element>
+ <xs:element name="job-title" type="xs:string" default=""></xs:element>
+ <xs:element name="manager-name" type="xs:string" default=""></xs:element>
+ <xs:element name="assistant" type="xs:string" default=""></xs:element>
+ <xs:element name="nick-name" type="xs:string" default=""></xs:element>
+ <xs:element name="spouse-name" type="xs:string" default=""></xs:element>
+ <xs:element name="birthday" type="xs:string" minOccurs="0"></xs:element>
+ <xs:element name="anniversary" type="xs:string" minOccurs="0"></xs:element>
+ <xs:element name="picture" type="xs:string" default=""></xs:element>
+ <xs:element name="children" type="xs:string" default=""></xs:element>
+ <xs:element name="gender" type="xs:string" default=""></xs:element>
+ <xs:element name="language" type="xs:string" default=""></xs:element>
+ <xs:element name="phone" maxOccurs="unbounded"
+ minOccurs="0" type="PhoneNumber">
+ </xs:element>
+ <xs:element name="email" maxOccurs="unbounded"
+ minOccurs="0" type="SMTPContact">
+ </xs:element>
+ <xs:element name="address" maxOccurs="unbounded"
+ minOccurs="0" type="Address">
+ </xs:element>
+ <xs:element name="preferred-address"
+ type="xs:string" minOccurs="0">
+ </xs:element>
+ <xs:element name="latitude" type="xs:float" minOccurs="0"></xs:element>
+ <xs:element name="longitude" type="xs:float" minOccurs="0"></xs:element>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
<xs:complexType name="Name">
- <xs:sequence>
- <xs:element name="given-name" type="xs:string" default=""></xs:element>
- <xs:element name="middle-names" type="xs:string" default=""></xs:element>
- <xs:element name="last-name" type="xs:string" default=""></xs:element>
- <xs:element name="full-name" type="xs:string" default=""></xs:element>
- <xs:element name="initials" type="xs:string" default=""></xs:element>
- <xs:element name="prefix" type="xs:string" default=""></xs:element>
- <xs:element name="suffix" type="xs:string" default=""></xs:element>
- </xs:sequence>
+ <xs:sequence>
+ <xs:element name="given-name" type="xs:string" default=""></xs:element>
+ <xs:element name="middle-names" type="xs:string" default=""></xs:element>
+ <xs:element name="last-name" type="xs:string" default=""></xs:element>
+ <xs:element name="full-name" type="xs:string" default=""></xs:element>
+ <xs:element name="initials" type="xs:string" default=""></xs:element>
+ <xs:element name="prefix" type="xs:string" default=""></xs:element>
+ <xs:element name="suffix" type="xs:string" default=""></xs:element>
+ </xs:sequence>
</xs:complexType>
<xs:complexType name="PhoneNumber">
- <xs:sequence>
- <xs:element name="type" type="xs:string" minOccurs="0"></xs:element>
- <xs:element name="number" type="xs:string" default=""></xs:element>
- </xs:sequence>
+ <xs:sequence>
+ <xs:element name="type" type="xs:string" minOccurs="0"></xs:element>
+ <xs:element name="number" type="xs:string" default=""></xs:element>
+ </xs:sequence>
</xs:complexType>
<xs:complexType name="Address">
- <xs:sequence>
- <xs:element name="type" type="xs:string" default="home"></xs:element>
- <xs:element name="street" type="xs:string" default=""></xs:element>
- <xs:element name="locality" type="xs:string" default=""></xs:element>
- <xs:element name="region" type="xs:string" default=""></xs:element>
- <xs:element name="postal-code" type="xs:string" default=""></xs:element>
- <xs:element name="country" type="xs:string" default=""></xs:element>
- </xs:sequence>
+ <xs:sequence>
+ <xs:element name="type" type="xs:string" default="home"></xs:element>
+ <xs:element name="street" type="xs:string" default=""></xs:element>
+ <xs:element name="locality" type="xs:string" default=""></xs:element>
+ <xs:element name="region" type="xs:string" default=""></xs:element>
+ <xs:element name="postal-code" type="xs:string" default=""></xs:element>
+ <xs:element name="country" type="xs:string" default=""></xs:element>
+ </xs:sequence>
</xs:complexType>
</xs:schema>
\ No newline at end of file
diff --git a/schemas/event.xsd b/schemas/event.xsd
index 1f1ac1c..b77f1b6 100644
--- a/schemas/event.xsd
+++ b/schemas/event.xsd
@@ -13,8 +13,8 @@
<xs:extension base="Incidence">
<xs:sequence>
- <xs:element name="show-time-as" type="xs:string"></xs:element>
- <xs:element name="color-label" type="xs:string"></xs:element>
+ <xs:element name="show-time-as" type="xs:string"></xs:element>
+ <xs:element name="color-label" type="xs:string"></xs:element>
<xs:element name="start-date" type="xs:dateTime"></xs:element>
<xs:element name="end-date" type="xs:dateTime"></xs:element>
</xs:sequence>
diff --git a/schemas/incidence.xsd b/schemas/incidence.xsd
index caca888..904f4ad 100644
--- a/schemas/incidence.xsd
+++ b/schemas/incidence.xsd
@@ -1,148 +1,148 @@
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://kolab.org"
- xmlns="http://kolab.org"
- elementFormDefault="qualified">
+ targetNamespace="http://kolab.org"
+ xmlns="http://kolab.org"
+ elementFormDefault="qualified">
- <xs:include schemaLocation="base.xsd" />
+ <xs:include schemaLocation="base.xsd" />
- <xs:complexType name="Incidence">
- <xs:complexContent>
- <xs:extension base="XMLBase">
- <xs:sequence>
- <xs:element name="summary" type="xs:string" />
- <xs:element name="location" type="xs:string" />
- <xs:element name="creator" type="SMTPContact">
+ <xs:complexType name="Incidence">
+ <xs:complexContent>
+ <xs:extension base="XMLBase">
+ <xs:sequence>
+ <xs:element name="summary" type="xs:string" />
+ <xs:element name="location" type="xs:string" />
+ <xs:element name="creator" type="SMTPContact">
- </xs:element>
- <xs:element name="organizer" type="SMTPContact"></xs:element>
- <xs:element name="alarm" type="xs:string"></xs:element>
- <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>
- <xs:extension base="SMTPContact">
- <xs:sequence>
- <xs:element name="status" type="xs:string">
- </xs:element>
- <xs:element name="request-response" type="xs:string">
- </xs:element>
- <xs:element name="role" type="xs:string">
- </xs:element>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
+ </xs:element>
+ <xs:element name="organizer" type="SMTPContact"></xs:element>
+ <xs:element name="alarm" type="xs:string"></xs:element>
+ <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>
+ <xs:extension base="SMTPContact">
+ <xs:sequence>
+ <xs:element name="status" type="xs:string">
+ </xs:element>
+ <xs:element name="request-response" type="xs:string">
+ </xs:element>
+ <xs:element name="role" type="xs:string">
+ </xs:element>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
- <xs:simpleType name="NewSimpleType">
- <xs:restriction base="xs:string">
- <xs:enumeration value="daily"></xs:enumeration>
- <xs:enumeration value="weekly"></xs:enumeration>
- <xs:enumeration value="monthly"></xs:enumeration>
- <xs:enumeration value="yearly"></xs:enumeration>
- </xs:restriction>
- </xs:simpleType>
+ <xs:simpleType name="NewSimpleType">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="daily"></xs:enumeration>
+ <xs:enumeration value="weekly"></xs:enumeration>
+ <xs:enumeration value="monthly"></xs:enumeration>
+ <xs:enumeration value="yearly"></xs:enumeration>
+ </xs:restriction>
+ </xs:simpleType>
- <xs:complexType name="Recurrence" abstract="true">
- <xs:sequence>
- <xs:element name="interval" type="xs:string">
- </xs:element>
- <xs:element name="rangetype">
- <xs:complexType>
- <xs:attribute name="type" type="xs:string">
- </xs:attribute>
- </xs:complexType>
- </xs:element>
- <xs:element name="exclusion" type="xs:string" maxOccurs="unbounded"
- minOccurs="0">
- </xs:element>
- </xs:sequence>
- </xs:complexType>
+ <xs:complexType name="Recurrence" abstract="true">
+ <xs:sequence>
+ <xs:element name="interval" type="xs:string">
+ </xs:element>
+ <xs:element name="rangetype">
+ <xs:complexType>
+ <xs:attribute name="type" type="xs:string">
+ </xs:attribute>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="exclusion" type="xs:string" maxOccurs="unbounded"
+ minOccurs="0">
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
- <xs:complexType name="DailyRecurrence">
- <xs:complexContent>
- <xs:extension base="Recurrence">
- <xs:attribute name="cycle" type="xs:string" fixed="daily"
- use="required">
- </xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
+ <xs:complexType name="DailyRecurrence">
+ <xs:complexContent>
+ <xs:extension base="Recurrence">
+ <xs:attribute name="cycle" type="xs:string" fixed="daily"
+ use="required">
+ </xs:attribute>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
- <xs:complexType name="WeeklyRecurrence">
- <xs:complexContent>
- <xs:extension base="Recurrence">
- <xs:attribute name="cycle" type="xs:string" fixed="weekly"
- use="required">
- </xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
+ <xs:complexType name="WeeklyRecurrence">
+ <xs:complexContent>
+ <xs:extension base="Recurrence">
+ <xs:attribute name="cycle" type="xs:string" fixed="weekly"
+ use="required">
+ </xs:attribute>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
- <xs:complexType name="MonthlyRecurrence">
- <xs:complexContent>
- <xs:extension base="Recurrence">
- <xs:sequence>
- <xs:element name="interval" type="xs:string">
- </xs:element>
- <xs:element name="day" type="xs:string">
- </xs:element>
- <xs:element name="daynumber" type="xs:string">
- </xs:element>
- </xs:sequence>
- <xs:attribute name="cycle" type="xs:string" fixed="monthly"
- use="required">
- </xs:attribute>
- <xs:attribute name="type" type="xs:string" use="required">
- </xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
+ <xs:complexType name="MonthlyRecurrence">
+ <xs:complexContent>
+ <xs:extension base="Recurrence">
+ <xs:sequence>
+ <xs:element name="interval" type="xs:string">
+ </xs:element>
+ <xs:element name="day" type="xs:string">
+ </xs:element>
+ <xs:element name="daynumber" type="xs:string">
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="cycle" type="xs:string" fixed="monthly"
+ use="required">
+ </xs:attribute>
+ <xs:attribute name="type" type="xs:string" use="required">
+ </xs:attribute>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
- <xs:complexType name="YearlyRecurrence">
- <xs:complexContent>
- <xs:extension base="Recurrence">
- <xs:sequence>
- <xs:element name="interval" type="xs:string">
- </xs:element>
- <xs:element name="day" type="xs:string">
- </xs:element>
- <xs:element name="daynumber" type="xs:string">
- </xs:element>
- <xs:element name="month" type="xs:string">
- </xs:element>
- </xs:sequence>
- <xs:attribute name="cycle" type="xs:string" fixed="yearly"
- use="required">
- </xs:attribute>
- <xs:attribute name="type" use="required">
- <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="monthday">
- </xs:enumeration>
- <xs:enumeration value="yearday">
- </xs:enumeration>
- <xs:enumeration value="weekday">
- </xs:enumeration>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
+ <xs:complexType name="YearlyRecurrence">
+ <xs:complexContent>
+ <xs:extension base="Recurrence">
+ <xs:sequence>
+ <xs:element name="interval" type="xs:string">
+ </xs:element>
+ <xs:element name="day" type="xs:string">
+ </xs:element>
+ <xs:element name="daynumber" type="xs:string">
+ </xs:element>
+ <xs:element name="month" type="xs:string">
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="cycle" type="xs:string" fixed="yearly"
+ use="required">
+ </xs:attribute>
+ <xs:attribute name="type" use="required">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="monthday">
+ </xs:enumeration>
+ <xs:enumeration value="yearday">
+ </xs:enumeration>
+ <xs:enumeration value="weekday">
+ </xs:enumeration>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
</xs:schema>
\ No newline at end of file
diff --git a/schemas/note.xsd b/schemas/note.xsd
index a024cb0..06765f9 100644
--- a/schemas/note.xsd
+++ b/schemas/note.xsd
@@ -24,7 +24,7 @@
<xs:complexContent>
<xs:extension base="Note">
<xs:sequence>
- <xs:any namespace="##any" processContents="skip"
+ <xs:any namespace="##any" processContents="skip"
minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
</xs:extension>
diff --git a/schemas/task.xsd b/schemas/task.xsd
index 3e6a0cc..009b779 100644
--- a/schemas/task.xsd
+++ b/schemas/task.xsd
@@ -13,14 +13,14 @@
<xs:extension base="Incidence">
<xs:sequence>
- <xs:element name="priority" type="xs:int"></xs:element>
- <xs:element name="completed" type="xs:int"></xs:element>
- <xs:element name="status" type="xs:string"></xs:element>
+ <xs:element name="priority" type="xs:int"></xs:element>
+ <xs:element name="completed" type="xs:int"></xs:element>
+ <xs:element name="status" type="xs:string"></xs:element>
<xs:element name="start-date" type="xs:dateTime" maxOccurs="1" minOccurs="0"></xs:element>
<xs:element name="due-date" type="xs:dateTime"
- maxOccurs="1" minOccurs="0">
- </xs:element>
- <xs:element name="parent" type="xs:string"></xs:element>
+ maxOccurs="1" minOccurs="0">
+ </xs:element>
+ <xs:element name="parent" type="xs:string"></xs:element>
</xs:sequence>
</xs:extension>
</xs:complexContent>
More information about the commits
mailing list