schemas/base.xsd schemas/contact.xsd schemas/incidence.xsd
Christian Mollekopf
mollekopf at kolabsys.com
Fri Oct 21 12:01:11 CEST 2011
schemas/base.xsd | 11 ++++-
schemas/contact.xsd | 102 +++++++++++++++-----------------------------------
schemas/incidence.xsd | 7 ---
3 files changed, 40 insertions(+), 80 deletions(-)
New commits:
commit 3c5e6bdc63f868ad47188d8b09db00a08626a5b3
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date: Fri Oct 21 12:01:04 2011 +0200
Make types global
diff --git a/schemas/base.xsd b/schemas/base.xsd
index 062f2cf..05219bd 100644
--- a/schemas/base.xsd
+++ b/schemas/base.xsd
@@ -24,7 +24,7 @@
</xs:element>
<xs:element name="creation-date" type="xs:dateTime"/>
<xs:element name="last-modification-date" type="xs:dateTime"/>
- <xs:element name="sensitivity" type="SensitivityType" default="public"/>
+ <xs:element name="sensitivity" type="Sensitivity" default="public"/>
<xs:element minOccurs="0" maxOccurs="unbounded"
name="inline-attachment" type="xs:string"/>
<xs:element minOccurs="0" maxOccurs="unbounded"
@@ -41,7 +41,7 @@
</xs:restriction>
</xs:simpleType>
- <xs:simpleType name="SensitivityType">
+ <xs:simpleType name="Sensitivity">
<xs:restriction base="xs:string">
<xs:enumeration value="private"/>
<xs:enumeration value="confidential"/>
@@ -49,5 +49,12 @@
</xs:restriction>
</xs:simpleType>
+ <xs:complexType name="SMTPContact">
+ <xs:sequence>
+ <xs:element name="display-name" type="xs:string"></xs:element>
+ <xs:element name="smtp-address" type="xs:string"></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 d0508e3..871bb3f 100644
--- a/schemas/contact.xsd
+++ b/schemas/contact.xsd
@@ -12,32 +12,7 @@
<xs:complexContent>
<xs:extension base="XMLBase">
<xs:sequence>
- <xs:element name="name">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="given-name"
- type="xs:string">
- </xs:element>
- <xs:element name="middle-names"
- type="xs:string">
- </xs:element>
- <xs:element name="last-name"
- type="xs:string">
- </xs:element>
- <xs:element name="full-name"
- type="xs:string">
- </xs:element>
- <xs:element name="initials"
- type="xs:string">
- </xs:element>
- <xs:element name="prefix"
- type="xs:string">
- </xs:element>
- <xs:element name="suffix"
- type="xs:string">
- </xs:element>
- </xs:sequence>
- </xs:complexType>
+ <xs:element name="name" type="Name">
</xs:element>
<xs:element name="free-busy-url" type="xs:string"></xs:element>
<xs:element name="organization" type="xs:string"></xs:element>
@@ -60,55 +35,13 @@
<xs:element name="gender" type="xs:string"></xs:element>
<xs:element name="language" type="xs:string"></xs:element>
<xs:element name="phone" maxOccurs="unbounded"
- minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="type"
- type="xs:string">
- </xs:element>
- <xs:element name="number"
- type="xs:string">
- </xs:element>
- </xs:sequence>
- </xs:complexType>
+ minOccurs="0" type="PhoneNumber">
</xs:element>
<xs:element name="email" maxOccurs="unbounded"
- minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="display-name"
- type="xs:string">
- </xs:element>
- <xs:element name="smtp-address"
- type="xs:string">
- </xs:element>
- </xs:sequence>
- </xs:complexType>
+ minOccurs="0" type="SMTPContact">
</xs:element>
<xs:element name="address" maxOccurs="unbounded"
- minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="type"
- type="xs:string">
- </xs:element>
- <xs:element name="street"
- type="xs:string">
- </xs:element>
- <xs:element name="locality"
- type="xs:string">
- </xs:element>
- <xs:element name="region"
- type="xs:string">
- </xs:element>
- <xs:element name="postal-code"
- type="xs:string">
- </xs:element>
- <xs:element name="country"
- type="xs:string">
- </xs:element>
- </xs:sequence>
- </xs:complexType>
+ minOccurs="0" type="Address">
</xs:element>
<xs:element name="preferred-address"
type="xs:string">
@@ -120,4 +53,31 @@
</xs:complexContent>
</xs:complexType>
+ <xs:complexType name="Name">
+ <xs:sequence>
+ <xs:element name="given-name" type="xs:string"></xs:element>
+ <xs:element name="middle-names" type="xs:string"></xs:element>
+ <xs:element name="last-name" type="xs:string"></xs:element>
+ <xs:element name="full-name" type="xs:string"></xs:element>
+ <xs:element name="initials" type="xs:string"></xs:element>
+ <xs:element name="prefix" type="xs:string"></xs:element>
+ <xs:element name="suffix" type="xs:string"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="PhoneNumber">
+ <xs:sequence>
+ <xs:element name="type" type="xs:string"></xs:element>
+ <xs:element name="number" type="xs:string"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="Address">
+ <xs:sequence>
+ <xs:element name="type" type="xs:string"></xs:element>
+ <xs:element name="street" type="xs:string"></xs:element>
+ <xs:element name="locality" type="xs:string"></xs:element>
+ <xs:element name="region" type="xs:string"></xs:element>
+ <xs:element name="postal-code" type="xs:string"></xs:element>
+ <xs:element name="country" type="xs:string"></xs:element>
+ </xs:sequence>
+ </xs:complexType>
</xs:schema>
\ No newline at end of file
diff --git a/schemas/incidence.xsd b/schemas/incidence.xsd
index e73bbe6..69181df 100644
--- a/schemas/incidence.xsd
+++ b/schemas/incidence.xsd
@@ -47,13 +47,6 @@
</xs:complexContent>
</xs:complexType>
- <xs:complexType name="SMTPContact">
- <xs:sequence>
- <xs:element name="display-name" type="xs:string"></xs:element>
- <xs:element name="smtp-address" type="xs:string"></xs:element>
- </xs:sequence>
- </xs:complexType>
-
<xs:simpleType name="NewSimpleType">
<xs:restriction base="xs:string">
<xs:enumeration value="daily"></xs:enumeration>
More information about the commits
mailing list