Branch 'python/master' - 10 commits - contact.py Makefile.am pykolab/format.py pykolab/raw 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 18:43:38 CEST 2011


 Makefile.am           |    2 
 contact.py            |   14 
 pykolab/format.py     |   28 
 pykolab/raw/format.py | 1909 ++++++++++++++++++++++++--------------------------
 schemas/base.xsd      |   82 +-
 schemas/contact.xsd   |  111 +-
 schemas/event.xsd     |    4 
 schemas/incidence.xsd |  232 ++----
 schemas/note.xsd      |    2 
 schemas/task.xsd      |   12 
 10 files changed, 1195 insertions(+), 1201 deletions(-)

New commits:
commit 8582a10ed5aea1d91993ad887be5e72efdf56419
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Sun Oct 23 17:43:14 2011 +0100

    Generate Python bindings based on the latest version of the XML Schema Definitions

diff --git a/pykolab/raw/format.py b/pykolab/raw/format.py
index 29d9605..ac47798 100644
--- a/pykolab/raw/format.py
+++ b/pykolab/raw/format.py
@@ -1,7 +1,7 @@
 # ./pykolab/raw/format.py
 # PyXB bindings for NamespaceModule
 # NSM:627e20d8ff2455aff19af8f568d2295daed9a405
-# Generated 2011-10-23 17:40:55.068585 by PyXB version 1.1.2
+# Generated 2011-10-23 17:43:09.571445 by PyXB version 1.1.2
 import pyxb
 import pyxb.binding
 import pyxb.binding.saxer
@@ -11,7 +11,7 @@ import pyxb.utils.domutils
 import sys
 
 # Unique identifier for bindings created at the same time
-_GenerationUID = pyxb.utils.utility.UniqueIdentifier('urn:uuid:c6ae55ec-fd95-11e0-90b8-001f3c5996b7')
+_GenerationUID = pyxb.utils.utility.UniqueIdentifier('urn:uuid:16db1f1e-fd96-11e0-ad63-001f3c5996b7')
 
 # Import bindings for namespaces imported into schema
 import pyxb.binding.datatypes
@@ -57,17 +57,31 @@ Sensitivity._InitializeFacetMap(Sensitivity._CF_enumeration)
 Namespace.addCategoryObject('typeBinding', u'Sensitivity', Sensitivity)
 
 # Atomic SimpleTypeDefinition
-class STD_ANON (pyxb.binding.datatypes.string, pyxb.binding.basis.enumeration_mixin):
+class Category (pyxb.binding.datatypes.string):
+
+    """An atomic simple type."""
+
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Category')
+    _Documentation = None
+Category._CF_pattern = pyxb.binding.facets.CF_pattern()
+Category._CF_pattern.addPattern(pattern=u'(\\w+(,\\w+)+)?')
+Category._InitializeFacetMap(Category._CF_pattern)
+Namespace.addCategoryObject('typeBinding', u'Category', Category)
+
+# Atomic SimpleTypeDefinition
+class Cycle (pyxb.binding.datatypes.string, pyxb.binding.basis.enumeration_mixin):
 
     """An atomic simple type."""
 
-    _ExpandedName = None
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Cycle')
     _Documentation = None
-STD_ANON._CF_enumeration = pyxb.binding.facets.CF_enumeration(value_datatype=STD_ANON, enum_prefix=None)
-STD_ANON.monthday = STD_ANON._CF_enumeration.addEnumeration(unicode_value=u'monthday')
-STD_ANON.yearday = STD_ANON._CF_enumeration.addEnumeration(unicode_value=u'yearday')
-STD_ANON.weekday = STD_ANON._CF_enumeration.addEnumeration(unicode_value=u'weekday')
-STD_ANON._InitializeFacetMap(STD_ANON._CF_enumeration)
+Cycle._CF_enumeration = pyxb.binding.facets.CF_enumeration(value_datatype=Cycle, enum_prefix=None)
+Cycle.daily = Cycle._CF_enumeration.addEnumeration(unicode_value=u'daily')
+Cycle.weekly = Cycle._CF_enumeration.addEnumeration(unicode_value=u'weekly')
+Cycle.monthly = Cycle._CF_enumeration.addEnumeration(unicode_value=u'monthly')
+Cycle.yearly = Cycle._CF_enumeration.addEnumeration(unicode_value=u'yearly')
+Cycle._InitializeFacetMap(Cycle._CF_enumeration)
+Namespace.addCategoryObject('typeBinding', u'Cycle', Cycle)
 
 # Atomic SimpleTypeDefinition
 class Color (pyxb.binding.datatypes.string):
@@ -76,52 +90,57 @@ class Color (pyxb.binding.datatypes.string):
 
     _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Color')
     _Documentation = None
-Color._CF_length = pyxb.binding.facets.CF_length(value=pyxb.binding.datatypes.nonNegativeInteger(7L))
 Color._CF_pattern = pyxb.binding.facets.CF_pattern()
 Color._CF_pattern.addPattern(pattern=u'#([a-f;0-9]){6}')
-Color._InitializeFacetMap(Color._CF_length,
-   Color._CF_pattern)
+Color._CF_length = pyxb.binding.facets.CF_length(value=pyxb.binding.datatypes.nonNegativeInteger(7L))
+Color._InitializeFacetMap(Color._CF_pattern,
+   Color._CF_length)
 Namespace.addCategoryObject('typeBinding', u'Color', Color)
 
 # Atomic SimpleTypeDefinition
-class NewSimpleType (pyxb.binding.datatypes.string, pyxb.binding.basis.enumeration_mixin):
+class UID (pyxb.binding.datatypes.string):
 
     """An atomic simple type."""
 
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'NewSimpleType')
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'UID')
     _Documentation = None
-NewSimpleType._CF_enumeration = pyxb.binding.facets.CF_enumeration(value_datatype=NewSimpleType, enum_prefix=None)
-NewSimpleType.daily = NewSimpleType._CF_enumeration.addEnumeration(unicode_value=u'daily')
-NewSimpleType.weekly = NewSimpleType._CF_enumeration.addEnumeration(unicode_value=u'weekly')
-NewSimpleType.monthly = NewSimpleType._CF_enumeration.addEnumeration(unicode_value=u'monthly')
-NewSimpleType.yearly = NewSimpleType._CF_enumeration.addEnumeration(unicode_value=u'yearly')
-NewSimpleType._InitializeFacetMap(NewSimpleType._CF_enumeration)
-Namespace.addCategoryObject('typeBinding', u'NewSimpleType', NewSimpleType)
+UID._CF_minLength = pyxb.binding.facets.CF_minLength(value=pyxb.binding.datatypes.nonNegativeInteger(1L))
+UID._CF_whiteSpace = pyxb.binding.facets.CF_whiteSpace(value=pyxb.binding.facets._WhiteSpace_enum.collapse)
+UID._InitializeFacetMap(UID._CF_minLength,
+   UID._CF_whiteSpace)
+Namespace.addCategoryObject('typeBinding', u'UID', UID)
 
-# Atomic SimpleTypeDefinition
-class Category (pyxb.binding.datatypes.string):
+# Complex type PhoneNumber with content type ELEMENT_ONLY
+class PhoneNumber (pyxb.binding.basis.complexTypeDefinition):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = False
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'PhoneNumber')
+    # Base type is pyxb.binding.datatypes.anyType
+    
+    # Element {http://kolab.org}number uses Python identifier number
+    __number = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'number'), 'number', '__httpkolab_org_PhoneNumber_httpkolab_orgnumber', False)
 
-    """An atomic simple type."""
+    
+    number = property(__number.value, __number.set, None, None)
 
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Category')
-    _Documentation = None
-Category._CF_pattern = pyxb.binding.facets.CF_pattern()
-Category._CF_pattern.addPattern(pattern=u'(\\w+(,\\w+)+)?')
-Category._InitializeFacetMap(Category._CF_pattern)
-Namespace.addCategoryObject('typeBinding', u'Category', Category)
+    
+    # Element {http://kolab.org}type uses Python identifier type
+    __type = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'type'), 'type', '__httpkolab_org_PhoneNumber_httpkolab_orgtype', False)
 
-# Atomic SimpleTypeDefinition
-class UID (pyxb.binding.datatypes.string):
+    
+    type = property(__type.value, __type.set, None, None)
 
-    """An atomic simple type."""
 
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'UID')
-    _Documentation = None
-UID._CF_whiteSpace = pyxb.binding.facets.CF_whiteSpace(value=pyxb.binding.facets._WhiteSpace_enum.collapse)
-UID._CF_minLength = pyxb.binding.facets.CF_minLength(value=pyxb.binding.datatypes.nonNegativeInteger(1L))
-UID._InitializeFacetMap(UID._CF_whiteSpace,
-   UID._CF_minLength)
-Namespace.addCategoryObject('typeBinding', u'UID', UID)
+    _ElementMap = {
+        __number.name() : __number,
+        __type.name() : __type
+    }
+    _AttributeMap = {
+        
+    }
+Namespace.addCategoryObject('typeBinding', u'PhoneNumber', PhoneNumber)
+
 
 # Complex type XMLBase with content type ELEMENT_ONLY
 class XMLBase (pyxb.binding.basis.complexTypeDefinition):
@@ -138,18 +157,18 @@ class XMLBase (pyxb.binding.basis.complexTypeDefinition):
     link_attachment = property(__link_attachment.value, __link_attachment.set, None, None)
 
     
-    # Element {http://kolab.org}product-id uses Python identifier product_id
-    __product_id = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'product-id'), 'product_id', '__httpkolab_org_XMLBase_httpkolab_orgproduct_id', False)
+    # Element {http://kolab.org}inline-attachment uses Python identifier inline_attachment
+    __inline_attachment = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment'), 'inline_attachment', '__httpkolab_org_XMLBase_httpkolab_orginline_attachment', True)
 
     
-    product_id = property(__product_id.value, __product_id.set, None, None)
+    inline_attachment = property(__inline_attachment.value, __inline_attachment.set, None, None)
 
     
-    # Element {http://kolab.org}body uses Python identifier body
-    __body = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'body'), 'body', '__httpkolab_org_XMLBase_httpkolab_orgbody', False)
+    # Element {http://kolab.org}categories uses Python identifier categories
+    __categories = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'categories'), 'categories', '__httpkolab_org_XMLBase_httpkolab_orgcategories', False)
 
     
-    body = property(__body.value, __body.set, None, None)
+    categories = property(__categories.value, __categories.set, None, None)
 
     
     # Element {http://kolab.org}sensitivity uses Python identifier sensitivity
@@ -159,18 +178,18 @@ class XMLBase (pyxb.binding.basis.complexTypeDefinition):
     sensitivity = property(__sensitivity.value, __sensitivity.set, None, None)
 
     
-    # Element {http://kolab.org}last-modification-date uses Python identifier last_modification_date
-    __last_modification_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date'), 'last_modification_date', '__httpkolab_org_XMLBase_httpkolab_orglast_modification_date', False)
+    # Element {http://kolab.org}body uses Python identifier body
+    __body = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'body'), 'body', '__httpkolab_org_XMLBase_httpkolab_orgbody', False)
 
     
-    last_modification_date = property(__last_modification_date.value, __last_modification_date.set, None, None)
+    body = property(__body.value, __body.set, None, None)
 
     
-    # Element {http://kolab.org}inline-attachment uses Python identifier inline_attachment
-    __inline_attachment = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment'), 'inline_attachment', '__httpkolab_org_XMLBase_httpkolab_orginline_attachment', True)
+    # Element {http://kolab.org}creation-date uses Python identifier creation_date
+    __creation_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'creation-date'), 'creation_date', '__httpkolab_org_XMLBase_httpkolab_orgcreation_date', False)
 
     
-    inline_attachment = property(__inline_attachment.value, __inline_attachment.set, None, None)
+    creation_date = property(__creation_date.value, __creation_date.set, None, None)
 
     
     # Element {http://kolab.org}uid uses Python identifier uid
@@ -180,36 +199,36 @@ class XMLBase (pyxb.binding.basis.complexTypeDefinition):
     uid = property(__uid.value, __uid.set, None, None)
 
     
-    # Element {http://kolab.org}creation-date uses Python identifier creation_date
-    __creation_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'creation-date'), 'creation_date', '__httpkolab_org_XMLBase_httpkolab_orgcreation_date', False)
+    # Element {http://kolab.org}product-id uses Python identifier product_id
+    __product_id = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'product-id'), 'product_id', '__httpkolab_org_XMLBase_httpkolab_orgproduct_id', False)
 
     
-    creation_date = property(__creation_date.value, __creation_date.set, None, None)
+    product_id = property(__product_id.value, __product_id.set, None, None)
 
     
-    # Element {http://kolab.org}categories uses Python identifier categories
-    __categories = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'categories'), 'categories', '__httpkolab_org_XMLBase_httpkolab_orgcategories', False)
+    # Element {http://kolab.org}last-modification-date uses Python identifier last_modification_date
+    __last_modification_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date'), 'last_modification_date', '__httpkolab_org_XMLBase_httpkolab_orglast_modification_date', False)
 
     
-    categories = property(__categories.value, __categories.set, None, None)
+    last_modification_date = property(__last_modification_date.value, __last_modification_date.set, None, None)
 
     
     # Attribute version uses Python identifier version
-    __version = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'version'), 'version', '__httpkolab_org_XMLBase_version', pyxb.binding.datatypes.double, unicode_default=u'1.0')
+    __version = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'version'), 'version', '__httpkolab_org_XMLBase_version', pyxb.binding.datatypes.string, fixed=True, unicode_default=u'3.0dev1')
     
     version = property(__version.value, __version.set, None, None)
 
 
     _ElementMap = {
         __link_attachment.name() : __link_attachment,
-        __product_id.name() : __product_id,
-        __body.name() : __body,
-        __sensitivity.name() : __sensitivity,
-        __last_modification_date.name() : __last_modification_date,
         __inline_attachment.name() : __inline_attachment,
-        __uid.name() : __uid,
+        __categories.name() : __categories,
+        __sensitivity.name() : __sensitivity,
+        __body.name() : __body,
         __creation_date.name() : __creation_date,
-        __categories.name() : __categories
+        __uid.name() : __uid,
+        __product_id.name() : __product_id,
+        __last_modification_date.name() : __last_modification_date
     }
     _AttributeMap = {
         __version.name() : __version
@@ -225,26 +244,11 @@ class Incidence (XMLBase):
     _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Incidence')
     # Base type is XMLBase
     
-    # Element {http://kolab.org}attendee uses Python identifier attendee
-    __attendee = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'attendee'), 'attendee', '__httpkolab_org_Incidence_httpkolab_orgattendee', False)
-
-    
-    attendee = property(__attendee.value, __attendee.set, None, None)
-
-    
-    # Element {http://kolab.org}location uses Python identifier location
-    __location = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'location'), 'location', '__httpkolab_org_Incidence_httpkolab_orglocation', False)
-
-    
-    location = property(__location.value, __location.set, None, None)
-
+    # Element link_attachment ({http://kolab.org}link-attachment) inherited from {http://kolab.org}XMLBase
     
-    # Element {http://kolab.org}alarm uses Python identifier alarm
-    __alarm = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'alarm'), 'alarm', '__httpkolab_org_Incidence_httpkolab_orgalarm', False)
-
+    # Element last_modification_date ({http://kolab.org}last-modification-date) inherited from {http://kolab.org}XMLBase
     
-    alarm = property(__alarm.value, __alarm.set, None, None)
-
+    # Element categories ({http://kolab.org}categories) inherited from {http://kolab.org}XMLBase
     
     # Element sensitivity ({http://kolab.org}sensitivity) inherited from {http://kolab.org}XMLBase
     
@@ -255,33 +259,50 @@ class Incidence (XMLBase):
     creator = property(__creator.value, __creator.set, None, None)
 
     
-    # Element product_id ({http://kolab.org}product-id) inherited from {http://kolab.org}XMLBase
+    # Element {http://kolab.org}organizer uses Python identifier organizer
+    __organizer = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'organizer'), 'organizer', '__httpkolab_org_Incidence_httpkolab_orgorganizer', False)
+
     
-    # Element link_attachment ({http://kolab.org}link-attachment) inherited from {http://kolab.org}XMLBase
+    organizer = property(__organizer.value, __organizer.set, None, None)
+
     
-    # Element inline_attachment ({http://kolab.org}inline-attachment) inherited from {http://kolab.org}XMLBase
+    # Element {http://kolab.org}recurrence uses Python identifier recurrence
+    __recurrence = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'recurrence'), 'recurrence', '__httpkolab_org_Incidence_httpkolab_orgrecurrence', False)
+
     
-    # Element categories ({http://kolab.org}categories) inherited from {http://kolab.org}XMLBase
+    recurrence = property(__recurrence.value, __recurrence.set, None, None)
+
     
     # Element creation_date ({http://kolab.org}creation-date) inherited from {http://kolab.org}XMLBase
     
+    # Element product_id ({http://kolab.org}product-id) inherited from {http://kolab.org}XMLBase
+    
     # Element uid ({http://kolab.org}uid) inherited from {http://kolab.org}XMLBase
     
-    # Element {http://kolab.org}organizer uses Python identifier organizer
-    __organizer = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'organizer'), 'organizer', '__httpkolab_org_Incidence_httpkolab_orgorganizer', False)
+    # Element body ({http://kolab.org}body) inherited from {http://kolab.org}XMLBase
+    
+    # Element {http://kolab.org}attendee uses Python identifier attendee
+    __attendee = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'attendee'), 'attendee', '__httpkolab_org_Incidence_httpkolab_orgattendee', False)
 
     
-    organizer = property(__organizer.value, __organizer.set, None, None)
+    attendee = property(__attendee.value, __attendee.set, None, None)
 
     
-    # Element {http://kolab.org}recurrence uses Python identifier recurrence
-    __recurrence = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'recurrence'), 'recurrence', '__httpkolab_org_Incidence_httpkolab_orgrecurrence', False)
+    # Element inline_attachment ({http://kolab.org}inline-attachment) inherited from {http://kolab.org}XMLBase
+    
+    # Element {http://kolab.org}alarm uses Python identifier alarm
+    __alarm = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'alarm'), 'alarm', '__httpkolab_org_Incidence_httpkolab_orgalarm', False)
 
     
-    recurrence = property(__recurrence.value, __recurrence.set, None, None)
+    alarm = property(__alarm.value, __alarm.set, None, None)
 
     
-    # Element body ({http://kolab.org}body) inherited from {http://kolab.org}XMLBase
+    # Element {http://kolab.org}location uses Python identifier location
+    __location = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'location'), 'location', '__httpkolab_org_Incidence_httpkolab_orglocation', False)
+
+    
+    location = property(__location.value, __location.set, None, None)
+
     
     # Element {http://kolab.org}summary uses Python identifier summary
     __summary = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'summary'), 'summary', '__httpkolab_org_Incidence_httpkolab_orgsummary', False)
@@ -290,18 +311,16 @@ class Incidence (XMLBase):
     summary = property(__summary.value, __summary.set, None, None)
 
     
-    # Element last_modification_date ({http://kolab.org}last-modification-date) inherited from {http://kolab.org}XMLBase
-    
     # Attribute version inherited from {http://kolab.org}XMLBase
 
     _ElementMap = XMLBase._ElementMap.copy()
     _ElementMap.update({
-        __attendee.name() : __attendee,
-        __location.name() : __location,
-        __alarm.name() : __alarm,
         __creator.name() : __creator,
         __organizer.name() : __organizer,
         __recurrence.name() : __recurrence,
+        __attendee.name() : __attendee,
+        __alarm.name() : __alarm,
+        __location.name() : __location,
         __summary.name() : __summary
     })
     _AttributeMap = XMLBase._AttributeMap.copy()
@@ -319,46 +338,37 @@ class Task (Incidence):
     _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Task')
     # Base type is Incidence
     
-    # Element attendee ({http://kolab.org}attendee) inherited from {http://kolab.org}Incidence
+    # Element creator ({http://kolab.org}creator) inherited from {http://kolab.org}Incidence
     
-    # Element product_id ({http://kolab.org}product-id) inherited from {http://kolab.org}XMLBase
+    # Element organizer ({http://kolab.org}organizer) inherited from {http://kolab.org}Incidence
     
-    # Element {http://kolab.org}completed uses Python identifier completed
-    __completed = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'completed'), 'completed', '__httpkolab_org_Task_httpkolab_orgcompleted', False)
+    # Element {http://kolab.org}status uses Python identifier status
+    __status = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'status'), 'status', '__httpkolab_org_Task_httpkolab_orgstatus', False)
 
     
-    completed = property(__completed.value, __completed.set, None, None)
+    status = property(__status.value, __status.set, None, None)
 
     
-    # Element categories ({http://kolab.org}categories) inherited from {http://kolab.org}XMLBase
-    
-    # Element creation_date ({http://kolab.org}creation-date) inherited from {http://kolab.org}XMLBase
-    
-    # Element location ({http://kolab.org}location) inherited from {http://kolab.org}Incidence
-    
     # Element last_modification_date ({http://kolab.org}last-modification-date) inherited from {http://kolab.org}XMLBase
     
-    # Element sensitivity ({http://kolab.org}sensitivity) inherited from {http://kolab.org}XMLBase
+    # Element attendee ({http://kolab.org}attendee) inherited from {http://kolab.org}Incidence
     
-    # Element inline_attachment ({http://kolab.org}inline-attachment) inherited from {http://kolab.org}XMLBase
+    # Element sensitivity ({http://kolab.org}sensitivity) inherited from {http://kolab.org}XMLBase
     
-    # Element link_attachment ({http://kolab.org}link-attachment) inherited from {http://kolab.org}XMLBase
+    # Element body ({http://kolab.org}body) inherited from {http://kolab.org}XMLBase
     
-    # Element {http://kolab.org}status uses Python identifier status
-    __status = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'status'), 'status', '__httpkolab_org_Task_httpkolab_orgstatus', False)
+    # Element {http://kolab.org}parent uses Python identifier parent
+    __parent = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'parent'), 'parent', '__httpkolab_org_Task_httpkolab_orgparent', False)
 
     
-    status = property(__status.value, __status.set, None, None)
+    parent = property(__parent.value, __parent.set, None, None)
 
     
-    # Element {http://kolab.org}due-date uses Python identifier due_date
-    __due_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'due-date'), 'due_date', '__httpkolab_org_Task_httpkolab_orgdue_date', False)
-
+    # Element categories ({http://kolab.org}categories) inherited from {http://kolab.org}XMLBase
     
-    due_date = property(__due_date.value, __due_date.set, None, None)
-
+    # Element product_id ({http://kolab.org}product-id) inherited from {http://kolab.org}XMLBase
     
-    # Element creator ({http://kolab.org}creator) inherited from {http://kolab.org}Incidence
+    # Element inline_attachment ({http://kolab.org}inline-attachment) inherited from {http://kolab.org}XMLBase
     
     # Element {http://kolab.org}start-date uses Python identifier start_date
     __start_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'start-date'), 'start_date', '__httpkolab_org_Task_httpkolab_orgstart_date', False)
@@ -367,41 +377,50 @@ class Task (Incidence):
     start_date = property(__start_date.value, __start_date.set, None, None)
 
     
-    # Element {http://kolab.org}parent uses Python identifier parent
-    __parent = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'parent'), 'parent', '__httpkolab_org_Task_httpkolab_orgparent', False)
+    # Element {http://kolab.org}completed uses Python identifier completed
+    __completed = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'completed'), 'completed', '__httpkolab_org_Task_httpkolab_orgcompleted', False)
 
     
-    parent = property(__parent.value, __parent.set, None, None)
+    completed = property(__completed.value, __completed.set, None, None)
 
     
-    # Element organizer ({http://kolab.org}organizer) inherited from {http://kolab.org}Incidence
+    # Element uid ({http://kolab.org}uid) inherited from {http://kolab.org}XMLBase
+    
+    # Element link_attachment ({http://kolab.org}link-attachment) inherited from {http://kolab.org}XMLBase
+    
+    # Element recurrence ({http://kolab.org}recurrence) inherited from {http://kolab.org}Incidence
     
     # Element alarm ({http://kolab.org}alarm) inherited from {http://kolab.org}Incidence
     
-    # Element {http://kolab.org}priority uses Python identifier priority
-    __priority = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'priority'), 'priority', '__httpkolab_org_Task_httpkolab_orgpriority', False)
-
+    # Element creation_date ({http://kolab.org}creation-date) inherited from {http://kolab.org}XMLBase
     
-    priority = property(__priority.value, __priority.set, None, None)
+    # Element {http://kolab.org}due-date uses Python identifier due_date
+    __due_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'due-date'), 'due_date', '__httpkolab_org_Task_httpkolab_orgdue_date', False)
 
     
-    # Element recurrence ({http://kolab.org}recurrence) inherited from {http://kolab.org}Incidence
+    due_date = property(__due_date.value, __due_date.set, None, None)
+
     
     # Element summary ({http://kolab.org}summary) inherited from {http://kolab.org}Incidence
     
-    # Element uid ({http://kolab.org}uid) inherited from {http://kolab.org}XMLBase
+    # Element {http://kolab.org}priority uses Python identifier priority
+    __priority = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'priority'), 'priority', '__httpkolab_org_Task_httpkolab_orgpriority', False)
+
     
-    # Element body ({http://kolab.org}body) inherited from {http://kolab.org}XMLBase
+    priority = property(__priority.value, __priority.set, None, None)
+
+    
+    # Element location ({http://kolab.org}location) inherited from {http://kolab.org}Incidence
     
     # Attribute version inherited from {http://kolab.org}XMLBase
 
     _ElementMap = Incidence._ElementMap.copy()
     _ElementMap.update({
-        __completed.name() : __completed,
         __status.name() : __status,
-        __due_date.name() : __due_date,
-        __start_date.name() : __start_date,
         __parent.name() : __parent,
+        __start_date.name() : __start_date,
+        __completed.name() : __completed,
+        __due_date.name() : __due_date,
         __priority.name() : __priority
     })
     _AttributeMap = Incidence._AttributeMap.copy()
@@ -411,437 +430,340 @@ class Task (Incidence):
 Namespace.addCategoryObject('typeBinding', u'Task', Task)
 
 
-# Complex type Name with content type ELEMENT_ONLY
-class Name (pyxb.binding.basis.complexTypeDefinition):
+# Complex type Address with content type ELEMENT_ONLY
+class Address (pyxb.binding.basis.complexTypeDefinition):
     _TypeDefinition = None
     _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
     _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Name')
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Address')
     # Base type is pyxb.binding.datatypes.anyType
     
-    # Element {http://kolab.org}last-name uses Python identifier last_name
-    __last_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'last-name'), 'last_name', '__httpkolab_org_Name_httpkolab_orglast_name', False)
-
-    
-    last_name = property(__last_name.value, __last_name.set, None, None)
-
-    
-    # Element {http://kolab.org}initials uses Python identifier initials
-    __initials = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'initials'), 'initials', '__httpkolab_org_Name_httpkolab_orginitials', False)
+    # Element {http://kolab.org}street uses Python identifier street
+    __street = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'street'), 'street', '__httpkolab_org_Address_httpkolab_orgstreet', False)
 
     
-    initials = property(__initials.value, __initials.set, None, None)
+    street = property(__street.value, __street.set, None, None)
 
     
-    # Element {http://kolab.org}full-name uses Python identifier full_name
-    __full_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'full-name'), 'full_name', '__httpkolab_org_Name_httpkolab_orgfull_name', False)
+    # Element {http://kolab.org}country uses Python identifier country
+    __country = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'country'), 'country', '__httpkolab_org_Address_httpkolab_orgcountry', False)
 
     
-    full_name = property(__full_name.value, __full_name.set, None, None)
+    country = property(__country.value, __country.set, None, None)
 
     
-    # Element {http://kolab.org}given-name uses Python identifier given_name
-    __given_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'given-name'), 'given_name', '__httpkolab_org_Name_httpkolab_orggiven_name', False)
+    # Element {http://kolab.org}postal-code uses Python identifier postal_code
+    __postal_code = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'postal-code'), 'postal_code', '__httpkolab_org_Address_httpkolab_orgpostal_code', False)
 
     
-    given_name = property(__given_name.value, __given_name.set, None, None)
+    postal_code = property(__postal_code.value, __postal_code.set, None, None)
 
     
-    # Element {http://kolab.org}prefix uses Python identifier prefix
-    __prefix = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'prefix'), 'prefix', '__httpkolab_org_Name_httpkolab_orgprefix', False)
+    # Element {http://kolab.org}locality uses Python identifier locality
+    __locality = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'locality'), 'locality', '__httpkolab_org_Address_httpkolab_orglocality', False)
 
     
-    prefix = property(__prefix.value, __prefix.set, None, None)
+    locality = property(__locality.value, __locality.set, None, None)
 
     
-    # Element {http://kolab.org}middle-names uses Python identifier middle_names
-    __middle_names = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'middle-names'), 'middle_names', '__httpkolab_org_Name_httpkolab_orgmiddle_names', False)
+    # Element {http://kolab.org}type uses Python identifier type
+    __type = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'type'), 'type', '__httpkolab_org_Address_httpkolab_orgtype', False, defaultValue=u'home')
 
     
-    middle_names = property(__middle_names.value, __middle_names.set, None, None)
+    type = property(__type.value, __type.set, None, None)
 
     
-    # Element {http://kolab.org}suffix uses Python identifier suffix
-    __suffix = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'suffix'), 'suffix', '__httpkolab_org_Name_httpkolab_orgsuffix', False)
+    # Element {http://kolab.org}region uses Python identifier region
+    __region = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'region'), 'region', '__httpkolab_org_Address_httpkolab_orgregion', False)
 
     
-    suffix = property(__suffix.value, __suffix.set, None, None)
+    region = property(__region.value, __region.set, None, None)
 
 
     _ElementMap = {
-        __last_name.name() : __last_name,
-        __initials.name() : __initials,
-        __full_name.name() : __full_name,
-        __given_name.name() : __given_name,
-        __prefix.name() : __prefix,
-        __middle_names.name() : __middle_names,
-        __suffix.name() : __suffix
+        __street.name() : __street,
+        __country.name() : __country,
+        __postal_code.name() : __postal_code,
+        __locality.name() : __locality,
+        __type.name() : __type,
+        __region.name() : __region
     }
     _AttributeMap = {
         
     }
-Namespace.addCategoryObject('typeBinding', u'Name', Name)
+Namespace.addCategoryObject('typeBinding', u'Address', Address)
 
 
-# Complex type SMTPContact with content type ELEMENT_ONLY
-class SMTPContact (pyxb.binding.basis.complexTypeDefinition):
+# Complex type Event with content type ELEMENT_ONLY
+class Event (Incidence):
     _TypeDefinition = None
     _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
     _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'SMTPContact')
-    # Base type is pyxb.binding.datatypes.anyType
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Event')
+    # Base type is Incidence
     
-    # Element {http://kolab.org}smtp-address uses Python identifier smtp_address
-    __smtp_address = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'smtp-address'), 'smtp_address', '__httpkolab_org_SMTPContact_httpkolab_orgsmtp_address', False)
+    # Element {http://kolab.org}show-time-as uses Python identifier show_time_as
+    __show_time_as = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'show-time-as'), 'show_time_as', '__httpkolab_org_Event_httpkolab_orgshow_time_as', False)
 
     
-    smtp_address = property(__smtp_address.value, __smtp_address.set, None, None)
+    show_time_as = property(__show_time_as.value, __show_time_as.set, None, None)
 
     
-    # Element {http://kolab.org}display-name uses Python identifier display_name
-    __display_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'display-name'), 'display_name', '__httpkolab_org_SMTPContact_httpkolab_orgdisplay_name', False)
-
+    # Element last_modification_date ({http://kolab.org}last-modification-date) inherited from {http://kolab.org}XMLBase
     
-    display_name = property(__display_name.value, __display_name.set, None, None)
-
-
-    _ElementMap = {
-        __smtp_address.name() : __smtp_address,
-        __display_name.name() : __display_name
-    }
-    _AttributeMap = {
-        
-    }
-Namespace.addCategoryObject('typeBinding', u'SMTPContact', SMTPContact)
-
-
-# Complex type Address with content type ELEMENT_ONLY
-class Address (pyxb.binding.basis.complexTypeDefinition):
-    _TypeDefinition = None
-    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
-    _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Address')
-    # Base type is pyxb.binding.datatypes.anyType
+    # Element creation_date ({http://kolab.org}creation-date) inherited from {http://kolab.org}XMLBase
     
-    # Element {http://kolab.org}locality uses Python identifier locality
-    __locality = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'locality'), 'locality', '__httpkolab_org_Address_httpkolab_orglocality', False)
-
+    # Element summary ({http://kolab.org}summary) inherited from {http://kolab.org}Incidence
     
-    locality = property(__locality.value, __locality.set, None, None)
-
+    # Element link_attachment ({http://kolab.org}link-attachment) inherited from {http://kolab.org}XMLBase
     
-    # Element {http://kolab.org}region uses Python identifier region
-    __region = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'region'), 'region', '__httpkolab_org_Address_httpkolab_orgregion', False)
-
+    # Element sensitivity ({http://kolab.org}sensitivity) inherited from {http://kolab.org}XMLBase
     
-    region = property(__region.value, __region.set, None, None)
+    # Element {http://kolab.org}color-label uses Python identifier color_label
+    __color_label = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'color-label'), 'color_label', '__httpkolab_org_Event_httpkolab_orgcolor_label', False)
 
     
-    # Element {http://kolab.org}type uses Python identifier type
-    __type = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'type'), 'type', '__httpkolab_org_Address_httpkolab_orgtype', False, defaultValue=u'home')
+    color_label = property(__color_label.value, __color_label.set, None, None)
 
     
-    type = property(__type.value, __type.set, None, None)
-
+    # Element organizer ({http://kolab.org}organizer) inherited from {http://kolab.org}Incidence
     
-    # Element {http://kolab.org}postal-code uses Python identifier postal_code
-    __postal_code = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'postal-code'), 'postal_code', '__httpkolab_org_Address_httpkolab_orgpostal_code', False)
-
+    # Element recurrence ({http://kolab.org}recurrence) inherited from {http://kolab.org}Incidence
     
-    postal_code = property(__postal_code.value, __postal_code.set, None, None)
-
+    # Element categories ({http://kolab.org}categories) inherited from {http://kolab.org}XMLBase
     
-    # Element {http://kolab.org}street uses Python identifier street
-    __street = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'street'), 'street', '__httpkolab_org_Address_httpkolab_orgstreet', False)
-
+    # Element creator ({http://kolab.org}creator) inherited from {http://kolab.org}Incidence
     
-    street = property(__street.value, __street.set, None, None)
-
+    # Element product_id ({http://kolab.org}product-id) inherited from {http://kolab.org}XMLBase
     
-    # Element {http://kolab.org}country uses Python identifier country
-    __country = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'country'), 'country', '__httpkolab_org_Address_httpkolab_orgcountry', False)
-
+    # Element body ({http://kolab.org}body) inherited from {http://kolab.org}XMLBase
     
-    country = property(__country.value, __country.set, None, None)
-
-
-    _ElementMap = {
-        __locality.name() : __locality,
-        __region.name() : __region,
-        __type.name() : __type,
-        __postal_code.name() : __postal_code,
-        __street.name() : __street,
-        __country.name() : __country
-    }
-    _AttributeMap = {
-        
-    }
-Namespace.addCategoryObject('typeBinding', u'Address', Address)
-
+    # Element {http://kolab.org}end-date uses Python identifier end_date
+    __end_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'end-date'), 'end_date', '__httpkolab_org_Event_httpkolab_orgend_date', False)
 
-# Complex type Recurrence with content type ELEMENT_ONLY
-class Recurrence (pyxb.binding.basis.complexTypeDefinition):
-    _TypeDefinition = None
-    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
-    _Abstract = True
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Recurrence')
-    # Base type is pyxb.binding.datatypes.anyType
     
-    # Element {http://kolab.org}interval uses Python identifier interval
-    __interval = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'interval'), 'interval', '__httpkolab_org_Recurrence_httpkolab_orginterval', False)
+    end_date = property(__end_date.value, __end_date.set, None, None)
 
     
-    interval = property(__interval.value, __interval.set, None, None)
-
+    # Element attendee ({http://kolab.org}attendee) inherited from {http://kolab.org}Incidence
     
-    # Element {http://kolab.org}exclusion uses Python identifier exclusion
-    __exclusion = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'exclusion'), 'exclusion', '__httpkolab_org_Recurrence_httpkolab_orgexclusion', True)
-
+    # Element inline_attachment ({http://kolab.org}inline-attachment) inherited from {http://kolab.org}XMLBase
     
-    exclusion = property(__exclusion.value, __exclusion.set, None, None)
+    # Element {http://kolab.org}start-date uses Python identifier start_date
+    __start_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'start-date'), 'start_date', '__httpkolab_org_Event_httpkolab_orgstart_date', False)
 
     
-    # Element {http://kolab.org}rangetype uses Python identifier rangetype
-    __rangetype = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'rangetype'), 'rangetype', '__httpkolab_org_Recurrence_httpkolab_orgrangetype', False)
+    start_date = property(__start_date.value, __start_date.set, None, None)
 
     
-    rangetype = property(__rangetype.value, __rangetype.set, None, None)
-
+    # Element alarm ({http://kolab.org}alarm) inherited from {http://kolab.org}Incidence
+    
+    # Element location ({http://kolab.org}location) inherited from {http://kolab.org}Incidence
+    
+    # Element uid ({http://kolab.org}uid) inherited from {http://kolab.org}XMLBase
+    
+    # Attribute version inherited from {http://kolab.org}XMLBase
 
-    _ElementMap = {
-        __interval.name() : __interval,
-        __exclusion.name() : __exclusion,
-        __rangetype.name() : __rangetype
-    }
-    _AttributeMap = {
+    _ElementMap = Incidence._ElementMap.copy()
+    _ElementMap.update({
+        __show_time_as.name() : __show_time_as,
+        __color_label.name() : __color_label,
+        __end_date.name() : __end_date,
+        __start_date.name() : __start_date
+    })
+    _AttributeMap = Incidence._AttributeMap.copy()
+    _AttributeMap.update({
         
-    }
-Namespace.addCategoryObject('typeBinding', u'Recurrence', Recurrence)
+    })
+Namespace.addCategoryObject('typeBinding', u'Event', Event)
 
 
-# Complex type YearlyRecurrence with content type ELEMENT_ONLY
-class YearlyRecurrence (Recurrence):
+# Complex type Contact with content type ELEMENT_ONLY
+class Contact (XMLBase):
     _TypeDefinition = None
     _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
     _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'YearlyRecurrence')
-    # Base type is Recurrence
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Contact')
+    # Base type is XMLBase
     
-    # Element {http://kolab.org}daynumber uses Python identifier daynumber
-    __daynumber = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'daynumber'), 'daynumber', '__httpkolab_org_YearlyRecurrence_httpkolab_orgdaynumber', False)
+    # Element {http://kolab.org}spouse-name uses Python identifier spouse_name
+    __spouse_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'spouse-name'), 'spouse_name', '__httpkolab_org_Contact_httpkolab_orgspouse_name', False)
 
     
-    daynumber = property(__daynumber.value, __daynumber.set, None, None)
+    spouse_name = property(__spouse_name.value, __spouse_name.set, None, None)
 
     
-    # Element {http://kolab.org}day uses Python identifier day
-    __day = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'day'), 'day', '__httpkolab_org_YearlyRecurrence_httpkolab_orgday', False)
+    # Element {http://kolab.org}im-address uses Python identifier im_address
+    __im_address = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'im-address'), 'im_address', '__httpkolab_org_Contact_httpkolab_orgim_address', False)
 
     
-    day = property(__day.value, __day.set, None, None)
+    im_address = property(__im_address.value, __im_address.set, None, None)
 
     
-    # Element exclusion ({http://kolab.org}exclusion) inherited from {http://kolab.org}Recurrence
-    
-    # Element interval ({http://kolab.org}interval) inherited from {http://kolab.org}Recurrence
-    
-    # Element rangetype ({http://kolab.org}rangetype) inherited from {http://kolab.org}Recurrence
+    # Element product_id ({http://kolab.org}product-id) inherited from {http://kolab.org}XMLBase
     
-    # Element {http://kolab.org}month uses Python identifier month
-    __month = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'month'), 'month', '__httpkolab_org_YearlyRecurrence_httpkolab_orgmonth', False)
+    # Element {http://kolab.org}birthday uses Python identifier birthday
+    __birthday = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'birthday'), 'birthday', '__httpkolab_org_Contact_httpkolab_orgbirthday', False)
 
     
-    month = property(__month.value, __month.set, None, None)
+    birthday = property(__birthday.value, __birthday.set, None, None)
 
     
-    # Attribute type uses Python identifier type
-    __type = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'type'), 'type', '__httpkolab_org_YearlyRecurrence_type', STD_ANON, required=True)
+    # Element creation_date ({http://kolab.org}creation-date) inherited from {http://kolab.org}XMLBase
     
-    type = property(__type.value, __type.set, None, None)
+    # Element {http://kolab.org}anniversary uses Python identifier anniversary
+    __anniversary = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'anniversary'), 'anniversary', '__httpkolab_org_Contact_httpkolab_organniversary', False)
 
     
-    # Attribute cycle uses Python identifier cycle
-    __cycle = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'cycle'), 'cycle', '__httpkolab_org_YearlyRecurrence_cycle', pyxb.binding.datatypes.string, fixed=True, unicode_default=u'yearly', required=True)
-    
-    cycle = property(__cycle.value, __cycle.set, None, None)
-
-
-    _ElementMap = Recurrence._ElementMap.copy()
-    _ElementMap.update({
-        __daynumber.name() : __daynumber,
-        __day.name() : __day,
-        __month.name() : __month
-    })
-    _AttributeMap = Recurrence._AttributeMap.copy()
-    _AttributeMap.update({
-        __type.name() : __type,
-        __cycle.name() : __cycle
-    })
-Namespace.addCategoryObject('typeBinding', u'YearlyRecurrence', YearlyRecurrence)
-
+    anniversary = property(__anniversary.value, __anniversary.set, None, None)
 
-# Complex type Event with content type ELEMENT_ONLY
-class Event (Incidence):
-    _TypeDefinition = None
-    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
-    _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Event')
-    # Base type is Incidence
     
-    # Element {http://kolab.org}start-date uses Python identifier start_date
-    __start_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'start-date'), 'start_date', '__httpkolab_org_Event_httpkolab_orgstart_date', False)
-
+    # Element last_modification_date ({http://kolab.org}last-modification-date) inherited from {http://kolab.org}XMLBase
     
-    start_date = property(__start_date.value, __start_date.set, None, None)
+    # Element {http://kolab.org}picture uses Python identifier picture
+    __picture = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'picture'), 'picture', '__httpkolab_org_Contact_httpkolab_orgpicture', False)
 
     
-    # Element alarm ({http://kolab.org}alarm) inherited from {http://kolab.org}Incidence
-    
-    # Element summary ({http://kolab.org}summary) inherited from {http://kolab.org}Incidence
+    picture = property(__picture.value, __picture.set, None, None)
+
     
-    # Element location ({http://kolab.org}location) inherited from {http://kolab.org}Incidence
+    # Element {http://kolab.org}name uses Python identifier name
+    __name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'name'), 'name', '__httpkolab_org_Contact_httpkolab_orgname', False)
+
     
-    # Element {http://kolab.org}end-date uses Python identifier end_date
-    __end_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'end-date'), 'end_date', '__httpkolab_org_Event_httpkolab_orgend_date', False)
+    name = property(__name.value, __name.set, None, None)
 
     
-    end_date = property(__end_date.value, __end_date.set, None, None)
+    # Element {http://kolab.org}children uses Python identifier children
+    __children = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'children'), 'children', '__httpkolab_org_Contact_httpkolab_orgchildren', False)
 
     
-    # Element link_attachment ({http://kolab.org}link-attachment) inherited from {http://kolab.org}XMLBase
+    children = property(__children.value, __children.set, None, None)
+
     
-    # Element attendee ({http://kolab.org}attendee) inherited from {http://kolab.org}Incidence
+    # Element {http://kolab.org}organization uses Python identifier organization
+    __organization = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'organization'), 'organization', '__httpkolab_org_Contact_httpkolab_orgorganization', False)
+
     
-    # Element product_id ({http://kolab.org}product-id) inherited from {http://kolab.org}XMLBase
+    organization = property(__organization.value, __organization.set, None, None)
+
     
-    # Element creator ({http://kolab.org}creator) inherited from {http://kolab.org}Incidence
+    # Element body ({http://kolab.org}body) inherited from {http://kolab.org}XMLBase
     
-    # Element {http://kolab.org}show-time-as uses Python identifier show_time_as
-    __show_time_as = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'show-time-as'), 'show_time_as', '__httpkolab_org_Event_httpkolab_orgshow_time_as', False)
+    # Element {http://kolab.org}gender uses Python identifier gender
+    __gender = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'gender'), 'gender', '__httpkolab_org_Contact_httpkolab_orggender', False)
 
     
-    show_time_as = property(__show_time_as.value, __show_time_as.set, None, None)
+    gender = property(__gender.value, __gender.set, None, None)
 
     
-    # Element inline_attachment ({http://kolab.org}inline-attachment) inherited from {http://kolab.org}XMLBase
-    
     # Element categories ({http://kolab.org}categories) inherited from {http://kolab.org}XMLBase
     
-    # Element uid ({http://kolab.org}uid) inherited from {http://kolab.org}XMLBase
+    # Element {http://kolab.org}language uses Python identifier language
+    __language = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'language'), 'language', '__httpkolab_org_Contact_httpkolab_orglanguage', False)
+
     
-    # Element creation_date ({http://kolab.org}creation-date) inherited from {http://kolab.org}XMLBase
+    language = property(__language.value, __language.set, None, None)
+
     
-    # Element {http://kolab.org}color-label uses Python identifier color_label
-    __color_label = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'color-label'), 'color_label', '__httpkolab_org_Event_httpkolab_orgcolor_label', False)
+    # Element inline_attachment ({http://kolab.org}inline-attachment) inherited from {http://kolab.org}XMLBase
+    
+    # Element {http://kolab.org}phone uses Python identifier phone
+    __phone = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'phone'), 'phone', '__httpkolab_org_Contact_httpkolab_orgphone', True)
 
     
-    color_label = property(__color_label.value, __color_label.set, None, None)
+    phone = property(__phone.value, __phone.set, None, None)
 
     
-    # Element organizer ({http://kolab.org}organizer) inherited from {http://kolab.org}Incidence
+    # Element link_attachment ({http://kolab.org}link-attachment) inherited from {http://kolab.org}XMLBase
     
-    # Element recurrence ({http://kolab.org}recurrence) inherited from {http://kolab.org}Incidence
+    # Element {http://kolab.org}email uses Python identifier email
+    __email = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'email'), 'email', '__httpkolab_org_Contact_httpkolab_orgemail', True)
+
     
-    # Element body ({http://kolab.org}body) inherited from {http://kolab.org}XMLBase
+    email = property(__email.value, __email.set, None, None)
+
     
     # Element sensitivity ({http://kolab.org}sensitivity) inherited from {http://kolab.org}XMLBase
     
-    # Element last_modification_date ({http://kolab.org}last-modification-date) inherited from {http://kolab.org}XMLBase
-    
-    # Attribute version inherited from {http://kolab.org}XMLBase
-
-    _ElementMap = Incidence._ElementMap.copy()
-    _ElementMap.update({
-        __start_date.name() : __start_date,
-        __end_date.name() : __end_date,
-        __show_time_as.name() : __show_time_as,
-        __color_label.name() : __color_label
-    })
-    _AttributeMap = Incidence._AttributeMap.copy()
-    _AttributeMap.update({
-        
-    })
-Namespace.addCategoryObject('typeBinding', u'Event', Event)
-
+    # Element {http://kolab.org}department uses Python identifier department
+    __department = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'department'), 'department', '__httpkolab_org_Contact_httpkolab_orgdepartment', False)
 
-# Complex type Contact with content type ELEMENT_ONLY
-class Contact (XMLBase):
-    _TypeDefinition = None
-    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
-    _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Contact')
-    # Base type is XMLBase
     
-    # Element {http://kolab.org}manager-name uses Python identifier manager_name
-    __manager_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'manager-name'), 'manager_name', '__httpkolab_org_Contact_httpkolab_orgmanager_name', False)
+    department = property(__department.value, __department.set, None, None)
 
     
-    manager_name = property(__manager_name.value, __manager_name.set, None, None)
+    # Element {http://kolab.org}address uses Python identifier address
+    __address = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'address'), 'address', '__httpkolab_org_Contact_httpkolab_orgaddress', True)
 
     
-    # Element {http://kolab.org}assistant uses Python identifier assistant
-    __assistant = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'assistant'), 'assistant', '__httpkolab_org_Contact_httpkolab_orgassistant', False)
+    address = property(__address.value, __address.set, None, None)
 
     
-    assistant = property(__assistant.value, __assistant.set, None, None)
+    # Element {http://kolab.org}office-location uses Python identifier office_location
+    __office_location = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'office-location'), 'office_location', '__httpkolab_org_Contact_httpkolab_orgoffice_location', False)
 
     
-    # Element {http://kolab.org}anniversary uses Python identifier anniversary
-    __anniversary = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'anniversary'), 'anniversary', '__httpkolab_org_Contact_httpkolab_organniversary', False)
+    office_location = property(__office_location.value, __office_location.set, None, None)
 
     
-    anniversary = property(__anniversary.value, __anniversary.set, None, None)
+    # Element {http://kolab.org}preferred-address uses Python identifier preferred_address
+    __preferred_address = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'preferred-address'), 'preferred_address', '__httpkolab_org_Contact_httpkolab_orgpreferred_address', False)
 
     
-    # Element {http://kolab.org}nick-name uses Python identifier nick_name
-    __nick_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'nick-name'), 'nick_name', '__httpkolab_org_Contact_httpkolab_orgnick_name', False)
+    preferred_address = property(__preferred_address.value, __preferred_address.set, None, None)
 
     
-    nick_name = property(__nick_name.value, __nick_name.set, None, None)
+    # Element {http://kolab.org}web-page uses Python identifier web_page
+    __web_page = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'web-page'), 'web_page', '__httpkolab_org_Contact_httpkolab_orgweb_page', False)
 
     
-    # Element creation_date ({http://kolab.org}creation-date) inherited from {http://kolab.org}XMLBase
+    web_page = property(__web_page.value, __web_page.set, None, None)
+
     
-    # Element {http://kolab.org}gender uses Python identifier gender
-    __gender = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'gender'), 'gender', '__httpkolab_org_Contact_httpkolab_orggender', False)
+    # Element {http://kolab.org}profession uses Python identifier profession
+    __profession = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'profession'), 'profession', '__httpkolab_org_Contact_httpkolab_orgprofession', False)
 
     
-    gender = property(__gender.value, __gender.set, None, None)
+    profession = property(__profession.value, __profession.set, None, None)
 
     
-    # Element {http://kolab.org}birthday uses Python identifier birthday
-    __birthday = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'birthday'), 'birthday', '__httpkolab_org_Contact_httpkolab_orgbirthday', False)
+    # Element {http://kolab.org}latitude uses Python identifier latitude
+    __latitude = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'latitude'), 'latitude', '__httpkolab_org_Contact_httpkolab_orglatitude', False)
 
     
-    birthday = property(__birthday.value, __birthday.set, None, None)
+    latitude = property(__latitude.value, __latitude.set, None, None)
 
     
-    # Element sensitivity ({http://kolab.org}sensitivity) inherited from {http://kolab.org}XMLBase
+    # Element {http://kolab.org}job-title uses Python identifier job_title
+    __job_title = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'job-title'), 'job_title', '__httpkolab_org_Contact_httpkolab_orgjob_title', False)
+
     
-    # Element {http://kolab.org}spouse-name uses Python identifier spouse_name
-    __spouse_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'spouse-name'), 'spouse_name', '__httpkolab_org_Contact_httpkolab_orgspouse_name', False)
+    job_title = property(__job_title.value, __job_title.set, None, None)
 
     
-    spouse_name = property(__spouse_name.value, __spouse_name.set, None, None)
+    # Element {http://kolab.org}longitude uses Python identifier longitude
+    __longitude = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'longitude'), 'longitude', '__httpkolab_org_Contact_httpkolab_orglongitude', False)
 
     
-    # Element {http://kolab.org}picture uses Python identifier picture
-    __picture = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'picture'), 'picture', '__httpkolab_org_Contact_httpkolab_orgpicture', False)
+    longitude = property(__longitude.value, __longitude.set, None, None)
 
     
-    picture = property(__picture.value, __picture.set, None, None)
+    # Element {http://kolab.org}manager-name uses Python identifier manager_name
+    __manager_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'manager-name'), 'manager_name', '__httpkolab_org_Contact_httpkolab_orgmanager_name', False)
 
     
-    # Element {http://kolab.org}name uses Python identifier name
-    __name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'name'), 'name', '__httpkolab_org_Contact_httpkolab_orgname', False)
+    manager_name = property(__manager_name.value, __manager_name.set, None, None)
 
     
-    name = property(__name.value, __name.set, None, None)
+    # Element {http://kolab.org}assistant uses Python identifier assistant
+    __assistant = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'assistant'), 'assistant', '__httpkolab_org_Contact_httpkolab_orgassistant', False)
 
     
-    # Element link_attachment ({http://kolab.org}link-attachment) inherited from {http://kolab.org}XMLBase
+    assistant = property(__assistant.value, __assistant.set, None, None)
+
     
-    # Element inline_attachment ({http://kolab.org}inline-attachment) inherited from {http://kolab.org}XMLBase
+    # Element uid ({http://kolab.org}uid) inherited from {http://kolab.org}XMLBase
     
     # Element {http://kolab.org}free-busy-url uses Python identifier free_busy_url
     __free_busy_url = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'free-busy-url'), 'free_busy_url', '__httpkolab_org_Contact_httpkolab_orgfree_busy_url', False)
@@ -850,186 +772,253 @@ class Contact (XMLBase):
     free_busy_url = property(__free_busy_url.value, __free_busy_url.set, None, None)
 
     
-    # Element product_id ({http://kolab.org}product-id) inherited from {http://kolab.org}XMLBase
-    
-    # Element {http://kolab.org}organization uses Python identifier organization
-    __organization = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'organization'), 'organization', '__httpkolab_org_Contact_httpkolab_orgorganization', False)
+    # Element {http://kolab.org}nick-name uses Python identifier nick_name
+    __nick_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'nick-name'), 'nick_name', '__httpkolab_org_Contact_httpkolab_orgnick_name', False)
 
     
-    organization = property(__organization.value, __organization.set, None, None)
+    nick_name = property(__nick_name.value, __nick_name.set, None, None)
 
     
-    # Element {http://kolab.org}language uses Python identifier language
-    __language = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'language'), 'language', '__httpkolab_org_Contact_httpkolab_orglanguage', False)
+    # Attribute version inherited from {http://kolab.org}XMLBase
 
-    
-    language = property(__language.value, __language.set, None, None)
+    _ElementMap = XMLBase._ElementMap.copy()
+    _ElementMap.update({
+        __spouse_name.name() : __spouse_name,
+        __im_address.name() : __im_address,
+        __birthday.name() : __birthday,
+        __anniversary.name() : __anniversary,
+        __picture.name() : __picture,
+        __name.name() : __name,
+        __children.name() : __children,
+        __organization.name() : __organization,
+        __gender.name() : __gender,
+        __language.name() : __language,
+        __phone.name() : __phone,
+        __email.name() : __email,
+        __department.name() : __department,
+        __address.name() : __address,
+        __office_location.name() : __office_location,
+        __preferred_address.name() : __preferred_address,
+        __web_page.name() : __web_page,
+        __profession.name() : __profession,
+        __latitude.name() : __latitude,
+        __job_title.name() : __job_title,
+        __longitude.name() : __longitude,
+        __manager_name.name() : __manager_name,
+        __assistant.name() : __assistant,
+        __free_busy_url.name() : __free_busy_url,
+        __nick_name.name() : __nick_name
+    })
+    _AttributeMap = XMLBase._AttributeMap.copy()
+    _AttributeMap.update({
+        
+    })
+Namespace.addCategoryObject('typeBinding', u'Contact', Contact)
 
-    
-    # Element body ({http://kolab.org}body) inherited from {http://kolab.org}XMLBase
-    
-    # Element {http://kolab.org}web-page uses Python identifier web_page
-    __web_page = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'web-page'), 'web_page', '__httpkolab_org_Contact_httpkolab_orgweb_page', False)
 
+# Complex type Name with content type ELEMENT_ONLY
+class Name (pyxb.binding.basis.complexTypeDefinition):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = False
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Name')
+    # Base type is pyxb.binding.datatypes.anyType
     
-    web_page = property(__web_page.value, __web_page.set, None, None)
+    # Element {http://kolab.org}middle-names uses Python identifier middle_names
+    __middle_names = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'middle-names'), 'middle_names', '__httpkolab_org_Name_httpkolab_orgmiddle_names', False)
 
     
-    # Element {http://kolab.org}phone uses Python identifier phone
-    __phone = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'phone'), 'phone', '__httpkolab_org_Contact_httpkolab_orgphone', True)
+    middle_names = property(__middle_names.value, __middle_names.set, None, None)
 
     
-    phone = property(__phone.value, __phone.set, None, None)
+    # Element {http://kolab.org}given-name uses Python identifier given_name
+    __given_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'given-name'), 'given_name', '__httpkolab_org_Name_httpkolab_orggiven_name', False)
 
     
-    # Element {http://kolab.org}job-title uses Python identifier job_title
-    __job_title = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'job-title'), 'job_title', '__httpkolab_org_Contact_httpkolab_orgjob_title', False)
+    given_name = property(__given_name.value, __given_name.set, None, None)
 
     
-    job_title = property(__job_title.value, __job_title.set, None, None)
+    # Element {http://kolab.org}last-name uses Python identifier last_name
+    __last_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'last-name'), 'last_name', '__httpkolab_org_Name_httpkolab_orglast_name', False)
 
     
-    # Element {http://kolab.org}im-address uses Python identifier im_address
-    __im_address = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'im-address'), 'im_address', '__httpkolab_org_Contact_httpkolab_orgim_address', False)
+    last_name = property(__last_name.value, __last_name.set, None, None)
 
     
-    im_address = property(__im_address.value, __im_address.set, None, None)
+    # Element {http://kolab.org}full-name uses Python identifier full_name
+    __full_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'full-name'), 'full_name', '__httpkolab_org_Name_httpkolab_orgfull_name', False)
 
     
-    # Element {http://kolab.org}email uses Python identifier email
-    __email = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'email'), 'email', '__httpkolab_org_Contact_httpkolab_orgemail', True)
+    full_name = property(__full_name.value, __full_name.set, None, None)
 
     
-    email = property(__email.value, __email.set, None, None)
+    # Element {http://kolab.org}suffix uses Python identifier suffix
+    __suffix = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'suffix'), 'suffix', '__httpkolab_org_Name_httpkolab_orgsuffix', False)
 
     
-    # Element last_modification_date ({http://kolab.org}last-modification-date) inherited from {http://kolab.org}XMLBase
-    
-    # Element {http://kolab.org}department uses Python identifier department
-    __department = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'department'), 'department', '__httpkolab_org_Contact_httpkolab_orgdepartment', False)
+    suffix = property(__suffix.value, __suffix.set, None, None)
 
     
-    department = property(__department.value, __department.set, None, None)
+    # Element {http://kolab.org}initials uses Python identifier initials
+    __initials = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'initials'), 'initials', '__httpkolab_org_Name_httpkolab_orginitials', False)
 
     
-    # Element {http://kolab.org}address uses Python identifier address
-    __address = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'address'), 'address', '__httpkolab_org_Contact_httpkolab_orgaddress', True)
+    initials = property(__initials.value, __initials.set, None, None)
 
     
-    address = property(__address.value, __address.set, None, None)
+    # Element {http://kolab.org}prefix uses Python identifier prefix
+    __prefix = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'prefix'), 'prefix', '__httpkolab_org_Name_httpkolab_orgprefix', False)
 
     
-    # Element {http://kolab.org}office-location uses Python identifier office_location
-    __office_location = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'office-location'), 'office_location', '__httpkolab_org_Contact_httpkolab_orgoffice_location', False)
+    prefix = property(__prefix.value, __prefix.set, None, None)
 
-    
-    office_location = property(__office_location.value, __office_location.set, None, None)
 
-    
-    # Element {http://kolab.org}preferred-address uses Python identifier preferred_address
-    __preferred_address = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'preferred-address'), 'preferred_address', '__httpkolab_org_Contact_httpkolab_orgpreferred_address', False)
+    _ElementMap = {
+        __middle_names.name() : __middle_names,
+        __given_name.name() : __given_name,
+        __last_name.name() : __last_name,
+        __full_name.name() : __full_name,
+        __suffix.name() : __suffix,
+        __initials.name() : __initials,
+        __prefix.name() : __prefix
+    }
+    _AttributeMap = {
+        
+    }
+Namespace.addCategoryObject('typeBinding', u'Name', Name)
 
-    
-    preferred_address = property(__preferred_address.value, __preferred_address.set, None, None)
 
+# Complex type Recurrence with content type ELEMENT_ONLY
+class Recurrence (pyxb.binding.basis.complexTypeDefinition):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = True
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Recurrence')
+    # Base type is pyxb.binding.datatypes.anyType
     
-    # Element {http://kolab.org}children uses Python identifier children
-    __children = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'children'), 'children', '__httpkolab_org_Contact_httpkolab_orgchildren', False)
+    # Element {http://kolab.org}rangetype uses Python identifier rangetype
+    __rangetype = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'rangetype'), 'rangetype', '__httpkolab_org_Recurrence_httpkolab_orgrangetype', False)
 
     
-    children = property(__children.value, __children.set, None, None)
+    rangetype = property(__rangetype.value, __rangetype.set, None, None)
 
     
-    # Element {http://kolab.org}profession uses Python identifier profession
-    __profession = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'profession'), 'profession', '__httpkolab_org_Contact_httpkolab_orgprofession', False)
+    # Element {http://kolab.org}interval uses Python identifier interval
+    __interval = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'interval'), 'interval', '__httpkolab_org_Recurrence_httpkolab_orginterval', False)
 
     
-    profession = property(__profession.value, __profession.set, None, None)
+    interval = property(__interval.value, __interval.set, None, None)
 
     
-    # Element {http://kolab.org}latitude uses Python identifier latitude
-    __latitude = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'latitude'), 'latitude', '__httpkolab_org_Contact_httpkolab_orglatitude', False)
+    # Element {http://kolab.org}exclusion uses Python identifier exclusion
+    __exclusion = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'exclusion'), 'exclusion', '__httpkolab_org_Recurrence_httpkolab_orgexclusion', True)
 
     
-    latitude = property(__latitude.value, __latitude.set, None, None)
+    exclusion = property(__exclusion.value, __exclusion.set, None, None)
+
+
+    _ElementMap = {
+        __rangetype.name() : __rangetype,
+        __interval.name() : __interval,
+        __exclusion.name() : __exclusion
+    }
+    _AttributeMap = {
+        
+    }
+Namespace.addCategoryObject('typeBinding', u'Recurrence', Recurrence)
+
 
+# Complex type DailyRecurrence with content type ELEMENT_ONLY
+class DailyRecurrence (Recurrence):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = False
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'DailyRecurrence')
+    # Base type is Recurrence
     
-    # Element uid ({http://kolab.org}uid) inherited from {http://kolab.org}XMLBase
+    # Element rangetype ({http://kolab.org}rangetype) inherited from {http://kolab.org}Recurrence
     
-    # Element {http://kolab.org}longitude uses Python identifier longitude
-    __longitude = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'longitude'), 'longitude', '__httpkolab_org_Contact_httpkolab_orglongitude', False)
-
+    # Element interval ({http://kolab.org}interval) inherited from {http://kolab.org}Recurrence
     
-    longitude = property(__longitude.value, __longitude.set, None, None)
-
+    # Element exclusion ({http://kolab.org}exclusion) inherited from {http://kolab.org}Recurrence
     
-    # Element categories ({http://kolab.org}categories) inherited from {http://kolab.org}XMLBase
+    # Attribute cycle uses Python identifier cycle
+    __cycle = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'cycle'), 'cycle', '__httpkolab_org_DailyRecurrence_cycle', pyxb.binding.datatypes.string, fixed=True, unicode_default=u'daily', required=True)
     
-    # Attribute version inherited from {http://kolab.org}XMLBase
+    cycle = property(__cycle.value, __cycle.set, None, None)
 
-    _ElementMap = XMLBase._ElementMap.copy()
+
+    _ElementMap = Recurrence._ElementMap.copy()
     _ElementMap.update({
-        __manager_name.name() : __manager_name,
-        __assistant.name() : __assistant,
-        __anniversary.name() : __anniversary,
-        __nick_name.name() : __nick_name,
-        __gender.name() : __gender,
-        __birthday.name() : __birthday,
-        __spouse_name.name() : __spouse_name,
-        __picture.name() : __picture,
-        __name.name() : __name,
-        __free_busy_url.name() : __free_busy_url,
-        __organization.name() : __organization,
-        __language.name() : __language,
-        __web_page.name() : __web_page,
-        __phone.name() : __phone,
-        __job_title.name() : __job_title,
-        __im_address.name() : __im_address,
-        __email.name() : __email,
-        __department.name() : __department,
-        __address.name() : __address,
-        __office_location.name() : __office_location,
-        __preferred_address.name() : __preferred_address,
-        __children.name() : __children,
-        __profession.name() : __profession,
-        __latitude.name() : __latitude,
-        __longitude.name() : __longitude
+        
     })
-    _AttributeMap = XMLBase._AttributeMap.copy()
+    _AttributeMap = Recurrence._AttributeMap.copy()
     _AttributeMap.update({
-        
+        __cycle.name() : __cycle
     })
-Namespace.addCategoryObject('typeBinding', u'Contact', Contact)
+Namespace.addCategoryObject('typeBinding', u'DailyRecurrence', DailyRecurrence)
 
 
-# Complex type CTD_ANON with content type ELEMENT_ONLY
-class CTD_ANON (SMTPContact):
+# Complex type SMTPContact with content type ELEMENT_ONLY
+class SMTPContact (pyxb.binding.basis.complexTypeDefinition):
     _TypeDefinition = None
     _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
     _Abstract = False
-    _ExpandedName = None
-    # Base type is SMTPContact
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'SMTPContact')
+    # Base type is pyxb.binding.datatypes.anyType
     
-    # Element {http://kolab.org}role uses Python identifier role
-    __role = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'role'), 'role', '__httpkolab_org_CTD_ANON_httpkolab_orgrole', False)
+    # Element {http://kolab.org}display-name uses Python identifier display_name
+    __display_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'display-name'), 'display_name', '__httpkolab_org_SMTPContact_httpkolab_orgdisplay_name', False)
 
     
-    role = property(__role.value, __role.set, None, None)
+    display_name = property(__display_name.value, __display_name.set, None, None)
+
+    
+    # Element {http://kolab.org}smtp-address uses Python identifier smtp_address
+    __smtp_address = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'smtp-address'), 'smtp_address', '__httpkolab_org_SMTPContact_httpkolab_orgsmtp_address', False)
+
+    
+    smtp_address = property(__smtp_address.value, __smtp_address.set, None, None)
+
+
+    _ElementMap = {
+        __display_name.name() : __display_name,
+        __smtp_address.name() : __smtp_address
+    }
+    _AttributeMap = {
+        
+    }
+Namespace.addCategoryObject('typeBinding', u'SMTPContact', SMTPContact)
+
 
+# Complex type Attendee with content type ELEMENT_ONLY
+class Attendee (SMTPContact):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = True
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Attendee')
+    # Base type is SMTPContact
     
     # Element display_name ({http://kolab.org}display-name) inherited from {http://kolab.org}SMTPContact
     
+    # Element smtp_address ({http://kolab.org}smtp-address) inherited from {http://kolab.org}SMTPContact
+    
     # Element {http://kolab.org}status uses Python identifier status
-    __status = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'status'), 'status', '__httpkolab_org_CTD_ANON_httpkolab_orgstatus', False)
+    __status = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'status'), 'status', '__httpkolab_org_Attendee_httpkolab_orgstatus', False)
 
     
     status = property(__status.value, __status.set, None, None)
 
     
-    # Element smtp_address ({http://kolab.org}smtp-address) inherited from {http://kolab.org}SMTPContact
+    # Element {http://kolab.org}role uses Python identifier role
+    __role = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'role'), 'role', '__httpkolab_org_Attendee_httpkolab_orgrole', False)
+
+    
+    role = property(__role.value, __role.set, None, None)
+
     
     # Element {http://kolab.org}request-response uses Python identifier request_response
-    __request_response = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'request-response'), 'request_response', '__httpkolab_org_CTD_ANON_httpkolab_orgrequest_response', False)
+    __request_response = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'request-response'), 'request_response', '__httpkolab_org_Attendee_httpkolab_orgrequest_response', False)
 
     
     request_response = property(__request_response.value, __request_response.set, None, None)
@@ -1037,15 +1026,15 @@ class CTD_ANON (SMTPContact):
 
     _ElementMap = SMTPContact._ElementMap.copy()
     _ElementMap.update({
-        __role.name() : __role,
         __status.name() : __status,
+        __role.name() : __role,
         __request_response.name() : __request_response
     })
     _AttributeMap = SMTPContact._AttributeMap.copy()
     _AttributeMap.update({
         
     })
-
+Namespace.addCategoryObject('typeBinding', u'Attendee', Attendee)
 
 
 # Complex type Note with content type ELEMENT_ONLY
@@ -1056,9 +1045,22 @@ class Note (XMLBase):
     _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Note')
     # Base type is XMLBase
     
+    # Element {http://kolab.org}background-color uses Python identifier background_color
+    __background_color = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'background-color'), 'background_color', '__httpkolab_org_Note_httpkolab_orgbackground_color', False, defaultValue=u'#000000')
+
+    
+    background_color = property(__background_color.value, __background_color.set, None, None)
+
+    
+    # Element inline_attachment ({http://kolab.org}inline-attachment) inherited from {http://kolab.org}XMLBase
+    
+    # Element creation_date ({http://kolab.org}creation-date) inherited from {http://kolab.org}XMLBase
+    
     # Element link_attachment ({http://kolab.org}link-attachment) inherited from {http://kolab.org}XMLBase
     
-    # Element last_modification_date ({http://kolab.org}last-modification-date) inherited from {http://kolab.org}XMLBase
+    # Element sensitivity ({http://kolab.org}sensitivity) inherited from {http://kolab.org}XMLBase
+    
+    # Element body ({http://kolab.org}body) inherited from {http://kolab.org}XMLBase
     
     # Element {http://kolab.org}foreground-color uses Python identifier foreground_color
     __foreground_color = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'foreground-color'), 'foreground_color', '__httpkolab_org_Note_httpkolab_orgforeground_color', False, defaultValue=u'#ffff00')
@@ -1067,14 +1069,6 @@ class Note (XMLBase):
     foreground_color = property(__foreground_color.value, __foreground_color.set, None, None)
 
     
-    # Element sensitivity ({http://kolab.org}sensitivity) inherited from {http://kolab.org}XMLBase
-    
-    # Element product_id ({http://kolab.org}product-id) inherited from {http://kolab.org}XMLBase
-    
-    # Element body ({http://kolab.org}body) inherited from {http://kolab.org}XMLBase
-    
-    # Element categories ({http://kolab.org}categories) inherited from {http://kolab.org}XMLBase
-    
     # Element {http://kolab.org}summary uses Python identifier summary
     __summary = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'summary'), 'summary', '__httpkolab_org_Note_httpkolab_orgsummary', False)
 
@@ -1082,26 +1076,21 @@ class Note (XMLBase):
     summary = property(__summary.value, __summary.set, None, None)
 
     
-    # Element uid ({http://kolab.org}uid) inherited from {http://kolab.org}XMLBase
-    
-    # Element creation_date ({http://kolab.org}creation-date) inherited from {http://kolab.org}XMLBase
+    # Element categories ({http://kolab.org}categories) inherited from {http://kolab.org}XMLBase
     
-    # Element inline_attachment ({http://kolab.org}inline-attachment) inherited from {http://kolab.org}XMLBase
+    # Element uid ({http://kolab.org}uid) inherited from {http://kolab.org}XMLBase
     
-    # Element {http://kolab.org}background-color uses Python identifier background_color
-    __background_color = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'background-color'), 'background_color', '__httpkolab_org_Note_httpkolab_orgbackground_color', False, defaultValue=u'#000000')
-
+    # Element product_id ({http://kolab.org}product-id) inherited from {http://kolab.org}XMLBase
     
-    background_color = property(__background_color.value, __background_color.set, None, None)
-
+    # Element last_modification_date ({http://kolab.org}last-modification-date) inherited from {http://kolab.org}XMLBase
     
     # Attribute version inherited from {http://kolab.org}XMLBase
 
     _ElementMap = XMLBase._ElementMap.copy()
     _ElementMap.update({
+        __background_color.name() : __background_color,
         __foreground_color.name() : __foreground_color,
-        __summary.name() : __summary,
-        __background_color.name() : __background_color
+        __summary.name() : __summary
     })
     _AttributeMap = XMLBase._AttributeMap.copy()
     _AttributeMap.update({
@@ -1110,16 +1099,16 @@ class Note (XMLBase):
 Namespace.addCategoryObject('typeBinding', u'Note', Note)
 
 
-# Complex type CTD_ANON_ with content type EMPTY
-class CTD_ANON_ (pyxb.binding.basis.complexTypeDefinition):
+# Complex type RecurrenceType with content type EMPTY
+class RecurrenceType (pyxb.binding.basis.complexTypeDefinition):
     _TypeDefinition = None
     _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_EMPTY
-    _Abstract = False
-    _ExpandedName = None
+    _Abstract = True
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'RecurrenceType')
     # Base type is pyxb.binding.datatypes.anyType
     
     # Attribute type uses Python identifier type
-    __type = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'type'), 'type', '__httpkolab_org_CTD_ANON__type', pyxb.binding.datatypes.string)
+    __type = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'type'), 'type', '__httpkolab_org_RecurrenceType_type', pyxb.binding.datatypes.string)
     
     type = property(__type.value, __type.set, None, None)
 
@@ -1130,38 +1119,7 @@ class CTD_ANON_ (pyxb.binding.basis.complexTypeDefinition):
     _AttributeMap = {
         __type.name() : __type
     }
-
-
-
-# Complex type DailyRecurrence with content type ELEMENT_ONLY
-class DailyRecurrence (Recurrence):
-    _TypeDefinition = None
-    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
-    _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'DailyRecurrence')
-    # Base type is Recurrence
-    
-    # Element interval ({http://kolab.org}interval) inherited from {http://kolab.org}Recurrence
-    
-    # Element exclusion ({http://kolab.org}exclusion) inherited from {http://kolab.org}Recurrence
-    
-    # Element rangetype ({http://kolab.org}rangetype) inherited from {http://kolab.org}Recurrence
-    
-    # Attribute cycle uses Python identifier cycle
-    __cycle = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'cycle'), 'cycle', '__httpkolab_org_DailyRecurrence_cycle', pyxb.binding.datatypes.string, fixed=True, unicode_default=u'daily', required=True)
-    
-    cycle = property(__cycle.value, __cycle.set, None, None)
-
-
-    _ElementMap = Recurrence._ElementMap.copy()
-    _ElementMap.update({
-        
-    })
-    _AttributeMap = Recurrence._AttributeMap.copy()
-    _AttributeMap.update({
-        __cycle.name() : __cycle
-    })
-Namespace.addCategoryObject('typeBinding', u'DailyRecurrence', DailyRecurrence)
+Namespace.addCategoryObject('typeBinding', u'RecurrenceType', RecurrenceType)
 
 
 # Complex type WeeklyRecurrence with content type ELEMENT_ONLY
@@ -1172,12 +1130,12 @@ class WeeklyRecurrence (Recurrence):
     _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'WeeklyRecurrence')
     # Base type is Recurrence
     
+    # Element rangetype ({http://kolab.org}rangetype) inherited from {http://kolab.org}Recurrence
+    
     # Element interval ({http://kolab.org}interval) inherited from {http://kolab.org}Recurrence
     
     # Element exclusion ({http://kolab.org}exclusion) inherited from {http://kolab.org}Recurrence
     
-    # Element rangetype ({http://kolab.org}rangetype) inherited from {http://kolab.org}Recurrence
-    
     # Attribute cycle uses Python identifier cycle
     __cycle = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'cycle'), 'cycle', '__httpkolab_org_WeeklyRecurrence_cycle', pyxb.binding.datatypes.string, fixed=True, unicode_default=u'weekly', required=True)
     
@@ -1203,18 +1161,9 @@ class MonthlyRecurrence (Recurrence):
     _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'MonthlyRecurrence')
     # Base type is Recurrence
     
-    # Element {http://kolab.org}daynumber uses Python identifier daynumber
-    __daynumber = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'daynumber'), 'daynumber', '__httpkolab_org_MonthlyRecurrence_httpkolab_orgdaynumber', False)
-
-    
-    daynumber = property(__daynumber.value, __daynumber.set, None, None)
-
-    
-    # Element rangetype ({http://kolab.org}rangetype) inherited from {http://kolab.org}Recurrence
-    
     # Element exclusion ({http://kolab.org}exclusion) inherited from {http://kolab.org}Recurrence
     
-    # Element interval ({http://kolab.org}interval) inherited from {http://kolab.org}Recurrence
+    # Element rangetype ({http://kolab.org}rangetype) inherited from {http://kolab.org}Recurrence
     
     # Element {http://kolab.org}day uses Python identifier day
     __day = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'day'), 'day', '__httpkolab_org_MonthlyRecurrence_httpkolab_orgday', False)
@@ -1223,6 +1172,15 @@ class MonthlyRecurrence (Recurrence):
     day = property(__day.value, __day.set, None, None)
 
     
+    # Element interval ({http://kolab.org}interval) inherited from {http://kolab.org}Recurrence
+    
+    # Element {http://kolab.org}daynumber uses Python identifier daynumber
+    __daynumber = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'daynumber'), 'daynumber', '__httpkolab_org_MonthlyRecurrence_httpkolab_orgdaynumber', False)
+
+    
+    daynumber = property(__daynumber.value, __daynumber.set, None, None)
+
+    
     # Attribute type uses Python identifier type
     __type = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'type'), 'type', '__httpkolab_org_MonthlyRecurrence_type', pyxb.binding.datatypes.string, required=True)
     
@@ -1237,8 +1195,8 @@ class MonthlyRecurrence (Recurrence):
 
     _ElementMap = Recurrence._ElementMap.copy()
     _ElementMap.update({
-        __daynumber.name() : __daynumber,
-        __day.name() : __day
+        __day.name() : __day,
+        __daynumber.name() : __daynumber
     })
     _AttributeMap = Recurrence._AttributeMap.copy()
     _AttributeMap.update({
@@ -1248,60 +1206,65 @@ class MonthlyRecurrence (Recurrence):
 Namespace.addCategoryObject('typeBinding', u'MonthlyRecurrence', MonthlyRecurrence)
 
 
-# Complex type CTD_ANON_2 with content type ELEMENT_ONLY
-class CTD_ANON_2 (pyxb.binding.basis.complexTypeDefinition):
+# Complex type YearlyRecurrence with content type ELEMENT_ONLY
+class YearlyRecurrence (Recurrence):
     _TypeDefinition = None
     _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
     _Abstract = False
-    _ExpandedName = None
-    # Base type is pyxb.binding.datatypes.anyType
-    
-    # Attribute cycle uses Python identifier cycle
-    __cycle = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'cycle'), 'cycle', '__httpkolab_org_CTD_ANON_2_cycle', pyxb.binding.datatypes.string)
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'YearlyRecurrence')
+    # Base type is Recurrence
     
-    cycle = property(__cycle.value, __cycle.set, None, None)
-
-    _HasWildcardElement = True
-
-    _ElementMap = {
-        
-    }
-    _AttributeMap = {
-        __cycle.name() : __cycle
-    }
+    # Element {http://kolab.org}daynumber uses Python identifier daynumber
+    __daynumber = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'daynumber'), 'daynumber', '__httpkolab_org_YearlyRecurrence_httpkolab_orgdaynumber', False)
 
+    
+    daynumber = property(__daynumber.value, __daynumber.set, None, None)
 
+    
+    # Element exclusion ({http://kolab.org}exclusion) inherited from {http://kolab.org}Recurrence
+    
+    # Element {http://kolab.org}month uses Python identifier month
+    __month = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'month'), 'month', '__httpkolab_org_YearlyRecurrence_httpkolab_orgmonth', False)
 
-# Complex type PhoneNumber with content type ELEMENT_ONLY
-class PhoneNumber (pyxb.binding.basis.complexTypeDefinition):
-    _TypeDefinition = None
-    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
-    _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'PhoneNumber')
-    # Base type is pyxb.binding.datatypes.anyType
     
-    # Element {http://kolab.org}number uses Python identifier number
-    __number = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'number'), 'number', '__httpkolab_org_PhoneNumber_httpkolab_orgnumber', False)
+    month = property(__month.value, __month.set, None, None)
 
     
-    number = property(__number.value, __number.set, None, None)
+    # Element rangetype ({http://kolab.org}rangetype) inherited from {http://kolab.org}Recurrence
+    
+    # Element {http://kolab.org}day uses Python identifier day
+    __day = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'day'), 'day', '__httpkolab_org_YearlyRecurrence_httpkolab_orgday', False)
 
     
-    # Element {http://kolab.org}type uses Python identifier type
-    __type = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'type'), 'type', '__httpkolab_org_PhoneNumber_httpkolab_orgtype', False)
+    day = property(__day.value, __day.set, None, None)
 
     
+    # Element interval ({http://kolab.org}interval) inherited from {http://kolab.org}Recurrence
+    
+    # Attribute type uses Python identifier type
+    __type = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'type'), 'type', '__httpkolab_org_YearlyRecurrence_type', pyxb.binding.datatypes.string, required=True)
+    
     type = property(__type.value, __type.set, None, None)
 
+    
+    # Attribute cycle uses Python identifier cycle
+    __cycle = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'cycle'), 'cycle', '__httpkolab_org_YearlyRecurrence_cycle', pyxb.binding.datatypes.string, fixed=True, unicode_default=u'yearly', required=True)
+    
+    cycle = property(__cycle.value, __cycle.set, None, None)
 
-    _ElementMap = {
-        __number.name() : __number,
-        __type.name() : __type
-    }
-    _AttributeMap = {
-        
-    }
-Namespace.addCategoryObject('typeBinding', u'PhoneNumber', PhoneNumber)
+
+    _ElementMap = Recurrence._ElementMap.copy()
+    _ElementMap.update({
+        __daynumber.name() : __daynumber,
+        __month.name() : __month,
+        __day.name() : __day
+    })
+    _AttributeMap = Recurrence._AttributeMap.copy()
+    _AttributeMap.update({
+        __type.name() : __type,
+        __cycle.name() : __cycle
+    })
+Namespace.addCategoryObject('typeBinding', u'YearlyRecurrence', YearlyRecurrence)
 
 
 task = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'task'), Task)
@@ -1318,61 +1281,72 @@ Namespace.addCategoryObject('elementBinding', note.name().localName(), note)
 
 
 
+PhoneNumber._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'number'), pyxb.binding.datatypes.string, scope=PhoneNumber))
+
+PhoneNumber._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'type'), pyxb.binding.datatypes.string, scope=PhoneNumber))
+PhoneNumber._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(PhoneNumber._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'type')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(PhoneNumber._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'number')), min_occurs=1, max_occurs=1)
+    )
+PhoneNumber._ContentModel = pyxb.binding.content.ParticleModel(PhoneNumber._GroupModel, min_occurs=1, max_occurs=1)
+
+
+
 XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'link-attachment'), pyxb.binding.datatypes.string, scope=XMLBase))
 
-XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'product-id'), pyxb.binding.datatypes.string, scope=XMLBase))
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment'), pyxb.binding.datatypes.string, scope=XMLBase))
 
-XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'body'), pyxb.binding.datatypes.string, scope=XMLBase))
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'categories'), Category, scope=XMLBase))
 
 XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'sensitivity'), Sensitivity, scope=XMLBase))
 
-XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date'), pyxb.binding.datatypes.dateTime, scope=XMLBase))
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'body'), pyxb.binding.datatypes.string, scope=XMLBase))
 
-XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment'), pyxb.binding.datatypes.string, scope=XMLBase))
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'creation-date'), pyxb.binding.datatypes.dateTime, scope=XMLBase))
 
 XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'uid'), UID, scope=XMLBase))
 
-XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'creation-date'), pyxb.binding.datatypes.dateTime, scope=XMLBase))
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'product-id'), pyxb.binding.datatypes.string, scope=XMLBase))
 
-XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'categories'), Category, scope=XMLBase))
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date'), pyxb.binding.datatypes.dateTime, scope=XMLBase))
 XMLBase._GroupModel = pyxb.binding.content.GroupSequence(
     pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creation-date')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'sensitivity')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=0L, max_occurs=1),
     pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1)
+    pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None)
     )
 XMLBase._ContentModel = pyxb.binding.content.ParticleModel(XMLBase._GroupModel, min_occurs=1, max_occurs=1)
 
 
 
-Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'attendee'), CTD_ANON, scope=Incidence))
+Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'creator'), SMTPContact, scope=Incidence))
 
-Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'location'), pyxb.binding.datatypes.string, scope=Incidence))
+Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'organizer'), SMTPContact, scope=Incidence))
 
-Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'alarm'), pyxb.binding.datatypes.string, scope=Incidence))
+Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'recurrence'), Recurrence, scope=Incidence))
 
-Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'creator'), SMTPContact, scope=Incidence))
+Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'attendee'), Attendee, scope=Incidence))
 
-Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'organizer'), SMTPContact, scope=Incidence))
+Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'alarm'), pyxb.binding.datatypes.string, scope=Incidence))
 
-Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'recurrence'), CTD_ANON_2, scope=Incidence))
+Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'location'), pyxb.binding.datatypes.string, scope=Incidence))
 
 Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'summary'), pyxb.binding.datatypes.string, scope=Incidence))
 Incidence._GroupModel_ = pyxb.binding.content.GroupSequence(
     pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creation-date')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'sensitivity')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=0L, max_occurs=1),
     pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1)
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None)
     )
 Incidence._GroupModel_2 = pyxb.binding.content.GroupSequence(
     pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'summary')), min_occurs=1, max_occurs=1),
@@ -1391,27 +1365,27 @@ Incidence._ContentModel = pyxb.binding.content.ParticleModel(Incidence._GroupMod
 
 
 
-Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'completed'), pyxb.binding.datatypes.int, scope=Task))
-
 Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'status'), pyxb.binding.datatypes.string, scope=Task))
 
-Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'due-date'), pyxb.binding.datatypes.dateTime, scope=Task))
+Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'parent'), pyxb.binding.datatypes.string, scope=Task))
 
 Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'start-date'), pyxb.binding.datatypes.dateTime, scope=Task))
 
-Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'parent'), pyxb.binding.datatypes.string, scope=Task))
+Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'completed'), pyxb.binding.datatypes.int, scope=Task))
+
+Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'due-date'), pyxb.binding.datatypes.dateTime, scope=Task))
 
 Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'priority'), pyxb.binding.datatypes.int, scope=Task))
 Task._GroupModel_2 = pyxb.binding.content.GroupSequence(
     pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creation-date')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'sensitivity')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=0L, max_occurs=1),
     pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1)
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None)
     )
 Task._GroupModel_3 = pyxb.binding.content.GroupSequence(
     pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'summary')), min_occurs=1, max_occurs=1),
@@ -1442,121 +1416,46 @@ Task._ContentModel = pyxb.binding.content.ParticleModel(Task._GroupModel, min_oc
 
 
 
-Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'last-name'), pyxb.binding.datatypes.string, scope=Name))
-
-Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'initials'), pyxb.binding.datatypes.string, scope=Name))
-
-Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'full-name'), pyxb.binding.datatypes.string, scope=Name))
-
-Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'given-name'), pyxb.binding.datatypes.string, scope=Name))
-
-Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'prefix'), pyxb.binding.datatypes.string, scope=Name))
-
-Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'middle-names'), pyxb.binding.datatypes.string, scope=Name))
-
-Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'suffix'), pyxb.binding.datatypes.string, scope=Name))
-Name._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'given-name')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'middle-names')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-name')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'full-name')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'initials')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'prefix')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'suffix')), min_occurs=1, max_occurs=1)
-    )
-Name._ContentModel = pyxb.binding.content.ParticleModel(Name._GroupModel, min_occurs=1, max_occurs=1)
-
-
-
-SMTPContact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'smtp-address'), pyxb.binding.datatypes.string, scope=SMTPContact))
-
-SMTPContact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'display-name'), pyxb.binding.datatypes.string, scope=SMTPContact))
-SMTPContact._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(SMTPContact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'display-name')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(SMTPContact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'smtp-address')), min_occurs=1, max_occurs=1)
-    )
-SMTPContact._ContentModel = pyxb.binding.content.ParticleModel(SMTPContact._GroupModel, min_occurs=1, max_occurs=1)
+Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'street'), pyxb.binding.datatypes.string, scope=Address))
 
+Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'country'), pyxb.binding.datatypes.string, scope=Address))
 
+Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'postal-code'), pyxb.binding.datatypes.string, scope=Address))
 
 Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'locality'), pyxb.binding.datatypes.string, scope=Address))
 
-Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'region'), pyxb.binding.datatypes.string, scope=Address))
-
 Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'type'), pyxb.binding.datatypes.string, scope=Address))
 
-Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'postal-code'), pyxb.binding.datatypes.string, scope=Address))
-
-Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'street'), pyxb.binding.datatypes.string, scope=Address))
-
-Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'country'), pyxb.binding.datatypes.string, scope=Address))
+Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'region'), pyxb.binding.datatypes.string, scope=Address))
 Address._GroupModel = pyxb.binding.content.GroupSequence(
     pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'type')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'street')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'locality')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'region')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'postal-code')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'country')), min_occurs=1, max_occurs=1)
+    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'street')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'postal-code')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'locality')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'region')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'country')), min_occurs=0L, max_occurs=1)
     )
 Address._ContentModel = pyxb.binding.content.ParticleModel(Address._GroupModel, min_occurs=1, max_occurs=1)
 
 
 
-Recurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'interval'), pyxb.binding.datatypes.string, scope=Recurrence))
-
-Recurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'exclusion'), pyxb.binding.datatypes.string, scope=Recurrence))
-
-Recurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'rangetype'), CTD_ANON_, scope=Recurrence))
-Recurrence._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Recurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Recurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'rangetype')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Recurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'exclusion')), min_occurs=0L, max_occurs=None)
-    )
-Recurrence._ContentModel = pyxb.binding.content.ParticleModel(Recurrence._GroupModel, min_occurs=1, max_occurs=1)
-
-
-
-YearlyRecurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'daynumber'), pyxb.binding.datatypes.string, scope=YearlyRecurrence))
-
-YearlyRecurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'day'), pyxb.binding.datatypes.string, scope=YearlyRecurrence))
-
-YearlyRecurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'month'), pyxb.binding.datatypes.string, scope=YearlyRecurrence))
-YearlyRecurrence._GroupModel_ = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'rangetype')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'exclusion')), min_occurs=0L, max_occurs=None)
-    )
-YearlyRecurrence._GroupModel_2 = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'day')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'daynumber')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'month')), min_occurs=1, max_occurs=1)
-    )
-YearlyRecurrence._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(YearlyRecurrence._GroupModel_, min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(YearlyRecurrence._GroupModel_2, min_occurs=1, max_occurs=1)
-    )
-YearlyRecurrence._ContentModel = pyxb.binding.content.ParticleModel(YearlyRecurrence._GroupModel, min_occurs=1, max_occurs=1)
-
-
+Event._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'show-time-as'), pyxb.binding.datatypes.string, scope=Event))
 
-Event._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'start-date'), pyxb.binding.datatypes.dateTime, scope=Event))
+Event._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'color-label'), pyxb.binding.datatypes.string, scope=Event))
 
 Event._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'end-date'), pyxb.binding.datatypes.dateTime, scope=Event))
 
-Event._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'show-time-as'), pyxb.binding.datatypes.string, scope=Event))
-
-Event._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'color-label'), pyxb.binding.datatypes.string, scope=Event))
+Event._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'start-date'), pyxb.binding.datatypes.dateTime, scope=Event))
 Event._GroupModel_2 = pyxb.binding.content.GroupSequence(
     pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creation-date')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'sensitivity')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=0L, max_occurs=1),
     pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1)
+    pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None)
     )
 Event._GroupModel_3 = pyxb.binding.content.GroupSequence(
     pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'summary')), min_occurs=1, max_occurs=1),
@@ -1585,38 +1484,28 @@ Event._ContentModel = pyxb.binding.content.ParticleModel(Event._GroupModel, min_
 
 
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'manager-name'), pyxb.binding.datatypes.string, scope=Contact))
-
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'assistant'), pyxb.binding.datatypes.string, scope=Contact))
-
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'anniversary'), pyxb.binding.datatypes.string, scope=Contact))
-
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'nick-name'), pyxb.binding.datatypes.string, scope=Contact))
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'spouse-name'), pyxb.binding.datatypes.string, scope=Contact))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'gender'), pyxb.binding.datatypes.string, scope=Contact))
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'im-address'), pyxb.binding.datatypes.string, scope=Contact))
 
 Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'birthday'), pyxb.binding.datatypes.string, scope=Contact))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'spouse-name'), pyxb.binding.datatypes.string, scope=Contact))
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'anniversary'), pyxb.binding.datatypes.string, scope=Contact))
 
 Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'picture'), pyxb.binding.datatypes.string, scope=Contact))
 
 Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'name'), Name, scope=Contact))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'free-busy-url'), pyxb.binding.datatypes.string, scope=Contact))
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'children'), pyxb.binding.datatypes.string, scope=Contact))
 
 Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'organization'), pyxb.binding.datatypes.string, scope=Contact))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'language'), pyxb.binding.datatypes.string, scope=Contact))
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'gender'), pyxb.binding.datatypes.string, scope=Contact))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'web-page'), pyxb.binding.datatypes.string, scope=Contact))
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'language'), pyxb.binding.datatypes.string, scope=Contact))
 
 Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'phone'), PhoneNumber, scope=Contact))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'job-title'), pyxb.binding.datatypes.string, scope=Contact))
-
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'im-address'), pyxb.binding.datatypes.string, scope=Contact))
-
 Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'email'), SMTPContact, scope=Contact))
 
 Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'department'), pyxb.binding.datatypes.string, scope=Contact))
@@ -1627,44 +1516,54 @@ Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Names
 
 Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'preferred-address'), pyxb.binding.datatypes.string, scope=Contact))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'children'), pyxb.binding.datatypes.string, scope=Contact))
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'web-page'), pyxb.binding.datatypes.string, scope=Contact))
 
 Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'profession'), pyxb.binding.datatypes.string, scope=Contact))
 
 Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'latitude'), pyxb.binding.datatypes.float, scope=Contact))
 
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'job-title'), pyxb.binding.datatypes.string, scope=Contact))
+
 Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'longitude'), pyxb.binding.datatypes.float, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'manager-name'), pyxb.binding.datatypes.string, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'assistant'), pyxb.binding.datatypes.string, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'free-busy-url'), pyxb.binding.datatypes.string, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'nick-name'), pyxb.binding.datatypes.string, scope=Contact))
 Contact._GroupModel_ = pyxb.binding.content.GroupSequence(
     pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creation-date')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'sensitivity')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=0L, max_occurs=1),
     pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1)
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None)
     )
 Contact._GroupModel_2 = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'name')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'free-busy-url')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'organization')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'web-page')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'im-address')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'department')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'office-location')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'profession')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'job-title')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'manager-name')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'assistant')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'nick-name')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'spouse-name')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'name')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'free-busy-url')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'organization')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'web-page')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'im-address')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'department')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'office-location')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'profession')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'job-title')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'manager-name')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'assistant')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'nick-name')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'spouse-name')), min_occurs=0L, max_occurs=1),
     pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'birthday')), min_occurs=0L, max_occurs=1),
     pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'anniversary')), min_occurs=0L, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'picture')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'children')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'gender')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'language')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'picture')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'children')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'gender')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'language')), min_occurs=0L, max_occurs=1),
     pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'phone')), min_occurs=0L, max_occurs=None),
     pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'email')), min_occurs=0L, max_occurs=None),
     pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'address')), min_occurs=0L, max_occurs=None),
@@ -1680,43 +1579,102 @@ Contact._ContentModel = pyxb.binding.content.ParticleModel(Contact._GroupModel,
 
 
 
-CTD_ANON._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'role'), pyxb.binding.datatypes.string, scope=CTD_ANON))
+Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'middle-names'), pyxb.binding.datatypes.string, scope=Name))
+
+Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'given-name'), pyxb.binding.datatypes.string, scope=Name))
+
+Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'last-name'), pyxb.binding.datatypes.string, scope=Name))
+
+Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'full-name'), pyxb.binding.datatypes.string, scope=Name))
+
+Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'suffix'), pyxb.binding.datatypes.string, scope=Name))
+
+Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'initials'), pyxb.binding.datatypes.string, scope=Name))
+
+Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'prefix'), pyxb.binding.datatypes.string, scope=Name))
+Name._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'given-name')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'middle-names')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-name')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'full-name')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'initials')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'prefix')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'suffix')), min_occurs=0L, max_occurs=1)
+    )
+Name._ContentModel = pyxb.binding.content.ParticleModel(Name._GroupModel, min_occurs=1, max_occurs=1)
+
+
+
+Recurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'rangetype'), RecurrenceType, scope=Recurrence))
+
+Recurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'interval'), pyxb.binding.datatypes.string, scope=Recurrence))
+
+Recurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'exclusion'), pyxb.binding.datatypes.string, scope=Recurrence))
+Recurrence._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Recurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Recurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'exclusion')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(Recurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'rangetype')), min_occurs=1, max_occurs=1)
+    )
+Recurrence._ContentModel = pyxb.binding.content.ParticleModel(Recurrence._GroupModel, min_occurs=1, max_occurs=1)
+
+
+DailyRecurrence._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(DailyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(DailyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'exclusion')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(DailyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'rangetype')), min_occurs=1, max_occurs=1)
+    )
+DailyRecurrence._ContentModel = pyxb.binding.content.ParticleModel(DailyRecurrence._GroupModel, min_occurs=1, max_occurs=1)
+
+
+
+SMTPContact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'display-name'), pyxb.binding.datatypes.string, scope=SMTPContact))
+
+SMTPContact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'smtp-address'), pyxb.binding.datatypes.string, scope=SMTPContact))
+SMTPContact._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(SMTPContact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'smtp-address')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(SMTPContact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'display-name')), min_occurs=0L, max_occurs=1)
+    )
+SMTPContact._ContentModel = pyxb.binding.content.ParticleModel(SMTPContact._GroupModel, min_occurs=1, max_occurs=1)
+
 
-CTD_ANON._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'status'), pyxb.binding.datatypes.string, scope=CTD_ANON))
 
-CTD_ANON._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'request-response'), pyxb.binding.datatypes.string, scope=CTD_ANON))
-CTD_ANON._GroupModel_ = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(CTD_ANON._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'display-name')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(CTD_ANON._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'smtp-address')), min_occurs=1, max_occurs=1)
+Attendee._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'status'), pyxb.binding.datatypes.string, scope=Attendee))
+
+Attendee._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'role'), pyxb.binding.datatypes.string, scope=Attendee))
+
+Attendee._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'request-response'), pyxb.binding.datatypes.string, scope=Attendee))
+Attendee._GroupModel_ = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Attendee._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'smtp-address')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Attendee._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'display-name')), min_occurs=0L, max_occurs=1)
     )
-CTD_ANON._GroupModel_2 = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(CTD_ANON._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'status')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(CTD_ANON._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'request-response')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(CTD_ANON._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'role')), min_occurs=1, max_occurs=1)
+Attendee._GroupModel_2 = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Attendee._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'status')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Attendee._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'request-response')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Attendee._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'role')), min_occurs=1, max_occurs=1)
     )
-CTD_ANON._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(CTD_ANON._GroupModel_, min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(CTD_ANON._GroupModel_2, min_occurs=1, max_occurs=1)
+Attendee._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Attendee._GroupModel_, min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Attendee._GroupModel_2, min_occurs=1, max_occurs=1)
     )
-CTD_ANON._ContentModel = pyxb.binding.content.ParticleModel(CTD_ANON._GroupModel, min_occurs=1, max_occurs=1)
+Attendee._ContentModel = pyxb.binding.content.ParticleModel(Attendee._GroupModel, min_occurs=1, max_occurs=1)
 
 
 
+Note._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'background-color'), Color, scope=Note))
+
 Note._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'foreground-color'), Color, scope=Note))
 
 Note._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'summary'), pyxb.binding.datatypes.string, scope=Note))
-
-Note._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'background-color'), Color, scope=Note))
 Note._GroupModel_ = pyxb.binding.content.GroupSequence(
     pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creation-date')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'sensitivity')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=0L, max_occurs=1),
     pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1)
+    pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None)
     )
 Note._GroupModel_2 = pyxb.binding.content.GroupSequence(
     pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'summary')), min_occurs=1, max_occurs=1),
@@ -1730,30 +1688,22 @@ Note._GroupModel = pyxb.binding.content.GroupSequence(
 Note._ContentModel = pyxb.binding.content.ParticleModel(Note._GroupModel, min_occurs=1, max_occurs=1)
 
 
-DailyRecurrence._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(DailyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(DailyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'rangetype')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(DailyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'exclusion')), min_occurs=0L, max_occurs=None)
-    )
-DailyRecurrence._ContentModel = pyxb.binding.content.ParticleModel(DailyRecurrence._GroupModel, min_occurs=1, max_occurs=1)
-
-
 WeeklyRecurrence._GroupModel = pyxb.binding.content.GroupSequence(
     pyxb.binding.content.ParticleModel(WeeklyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(WeeklyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'rangetype')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(WeeklyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'exclusion')), min_occurs=0L, max_occurs=None)
+    pyxb.binding.content.ParticleModel(WeeklyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'exclusion')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(WeeklyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'rangetype')), min_occurs=1, max_occurs=1)
     )
 WeeklyRecurrence._ContentModel = pyxb.binding.content.ParticleModel(WeeklyRecurrence._GroupModel, min_occurs=1, max_occurs=1)
 
 
 
-MonthlyRecurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'daynumber'), pyxb.binding.datatypes.string, scope=MonthlyRecurrence))
-
 MonthlyRecurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'day'), pyxb.binding.datatypes.string, scope=MonthlyRecurrence))
+
+MonthlyRecurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'daynumber'), pyxb.binding.datatypes.string, scope=MonthlyRecurrence))
 MonthlyRecurrence._GroupModel_ = pyxb.binding.content.GroupSequence(
     pyxb.binding.content.ParticleModel(MonthlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(MonthlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'rangetype')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(MonthlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'exclusion')), min_occurs=0L, max_occurs=None)
+    pyxb.binding.content.ParticleModel(MonthlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'exclusion')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(MonthlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'rangetype')), min_occurs=1, max_occurs=1)
     )
 MonthlyRecurrence._GroupModel_2 = pyxb.binding.content.GroupSequence(
     pyxb.binding.content.ParticleModel(MonthlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
@@ -1767,18 +1717,25 @@ MonthlyRecurrence._GroupModel = pyxb.binding.content.GroupSequence(
 MonthlyRecurrence._ContentModel = pyxb.binding.content.ParticleModel(MonthlyRecurrence._GroupModel, min_occurs=1, max_occurs=1)
 
 
-CTD_ANON_2._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(pyxb.binding.content.Wildcard(process_contents=pyxb.binding.content.Wildcard.PC_skip, namespace_constraint=pyxb.binding.content.Wildcard.NC_any), min_occurs=0L, max_occurs=None)
-    )
-CTD_ANON_2._ContentModel = pyxb.binding.content.ParticleModel(CTD_ANON_2._GroupModel, min_occurs=1, max_occurs=1)
-
 
+YearlyRecurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'daynumber'), pyxb.binding.datatypes.string, scope=YearlyRecurrence))
 
-PhoneNumber._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'number'), pyxb.binding.datatypes.string, scope=PhoneNumber))
+YearlyRecurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'month'), pyxb.binding.datatypes.string, scope=YearlyRecurrence))
 
-PhoneNumber._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'type'), pyxb.binding.datatypes.string, scope=PhoneNumber))
-PhoneNumber._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(PhoneNumber._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'type')), min_occurs=0L, max_occurs=1),
-    pyxb.binding.content.ParticleModel(PhoneNumber._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'number')), min_occurs=1, max_occurs=1)
+YearlyRecurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'day'), pyxb.binding.datatypes.string, scope=YearlyRecurrence))
+YearlyRecurrence._GroupModel_ = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'exclusion')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'rangetype')), min_occurs=1, max_occurs=1)
     )
-PhoneNumber._ContentModel = pyxb.binding.content.ParticleModel(PhoneNumber._GroupModel, min_occurs=1, max_occurs=1)
+YearlyRecurrence._GroupModel_2 = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'day')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'daynumber')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'month')), min_occurs=1, max_occurs=1)
+    )
+YearlyRecurrence._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(YearlyRecurrence._GroupModel_, min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(YearlyRecurrence._GroupModel_2, min_occurs=1, max_occurs=1)
+    )
+YearlyRecurrence._ContentModel = pyxb.binding.content.ParticleModel(YearlyRecurrence._GroupModel, min_occurs=1, max_occurs=1)


commit 13f9fa7d2d019a3020c934dec3ead697d79c05ea
Merge: bba76cb b5cd74c
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Sun Oct 23 17:43:04 2011 +0100

    Merge remote-tracking branch 'origin/master' into python/master



commit bba76cb48a3460a3822decd6ccb72a8b93b51683
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Sun Oct 23 17:42:53 2011 +0100

    Add demonstrative contact.py

diff --git a/contact.py b/contact.py
new file mode 100755
index 0000000..bf9efaf
--- /dev/null
+++ b/contact.py
@@ -0,0 +1,14 @@
+#!/usr/bin/python
+
+import sys
+
+sys.path.append('.')
+
+from pykolab.contact import Contact
+
+mycontact = Contact()
+
+mycontact.set_email("vanmeeuwen at kolabsys.com", display_name="Jeroen van Meeuwen")
+mycontact.set_name("Jeroen", "Alexander", "van Meeuwen", "Jeroen A. van Meeuwen", "J.A.", "Mr.")
+
+print mycontact.toxml()
\ No newline at end of file


commit 66ca5a2ae4883b6f38e6d78e32430289c958748a
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Sun Oct 23 17:41:41 2011 +0100

    Generated bindings rebased on latest XML schema definition

diff --git a/pykolab/raw/format.py b/pykolab/raw/format.py
index 6b3a5b2..29d9605 100644
--- a/pykolab/raw/format.py
+++ b/pykolab/raw/format.py
@@ -1,7 +1,7 @@
 # ./pykolab/raw/format.py
 # PyXB bindings for NamespaceModule
-# NSM:57793f9fb1566a6e3db3fa9685718c0d26782d75
-# Generated 2011-10-21 14:48:37.851146 by PyXB version 1.1.2
+# NSM:627e20d8ff2455aff19af8f568d2295daed9a405
+# Generated 2011-10-23 17:40:55.068585 by PyXB version 1.1.2
 import pyxb
 import pyxb.binding
 import pyxb.binding.saxer
@@ -11,12 +11,12 @@ import pyxb.utils.domutils
 import sys
 
 # Unique identifier for bindings created at the same time
-_GenerationUID = pyxb.utils.utility.UniqueIdentifier('urn:uuid:6062637e-fbeb-11e0-9097-001f3c5996b7')
+_GenerationUID = pyxb.utils.utility.UniqueIdentifier('urn:uuid:c6ae55ec-fd95-11e0-90b8-001f3c5996b7')
 
 # Import bindings for namespaces imported into schema
 import pyxb.binding.datatypes
 
-Namespace = pyxb.namespace.NamespaceForURI(u'kolab.org', create_if_missing=True)
+Namespace = pyxb.namespace.NamespaceForURI(u'http://kolab.org', create_if_missing=True)
 Namespace.configureCategories(['typeBinding', 'elementBinding'])
 ModuleRecord = Namespace.lookupModuleRecordByUID(_GenerationUID, create_if_missing=True)
 ModuleRecord._setModule(sys.modules[__name__])
@@ -43,19 +43,18 @@ def CreateFromDOM (node, default_namespace=None):
 
 
 # Atomic SimpleTypeDefinition
-class NewSimpleType (pyxb.binding.datatypes.string, pyxb.binding.basis.enumeration_mixin):
+class Sensitivity (pyxb.binding.datatypes.string, pyxb.binding.basis.enumeration_mixin):
 
     """An atomic simple type."""
 
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'NewSimpleType')
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Sensitivity')
     _Documentation = None
-NewSimpleType._CF_enumeration = pyxb.binding.facets.CF_enumeration(value_datatype=NewSimpleType, enum_prefix=None)
-NewSimpleType.daily = NewSimpleType._CF_enumeration.addEnumeration(unicode_value=u'daily')
-NewSimpleType.weekly = NewSimpleType._CF_enumeration.addEnumeration(unicode_value=u'weekly')
-NewSimpleType.monthly = NewSimpleType._CF_enumeration.addEnumeration(unicode_value=u'monthly')
-NewSimpleType.yearly = NewSimpleType._CF_enumeration.addEnumeration(unicode_value=u'yearly')
-NewSimpleType._InitializeFacetMap(NewSimpleType._CF_enumeration)
-Namespace.addCategoryObject('typeBinding', u'NewSimpleType', NewSimpleType)
+Sensitivity._CF_enumeration = pyxb.binding.facets.CF_enumeration(value_datatype=Sensitivity, enum_prefix=None)
+Sensitivity.private = Sensitivity._CF_enumeration.addEnumeration(unicode_value=u'private')
+Sensitivity.confidential = Sensitivity._CF_enumeration.addEnumeration(unicode_value=u'confidential')
+Sensitivity.public = Sensitivity._CF_enumeration.addEnumeration(unicode_value=u'public')
+Sensitivity._InitializeFacetMap(Sensitivity._CF_enumeration)
+Namespace.addCategoryObject('typeBinding', u'Sensitivity', Sensitivity)
 
 # Atomic SimpleTypeDefinition
 class STD_ANON (pyxb.binding.datatypes.string, pyxb.binding.basis.enumeration_mixin):
@@ -71,57 +70,58 @@ STD_ANON.weekday = STD_ANON._CF_enumeration.addEnumeration(unicode_value=u'weekd
 STD_ANON._InitializeFacetMap(STD_ANON._CF_enumeration)
 
 # Atomic SimpleTypeDefinition
-class UID (pyxb.binding.datatypes.string):
+class Color (pyxb.binding.datatypes.string):
 
     """An atomic simple type."""
 
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'UID')
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Color')
     _Documentation = None
-UID._CF_whiteSpace = pyxb.binding.facets.CF_whiteSpace(value=pyxb.binding.facets._WhiteSpace_enum.collapse)
-UID._CF_minLength = pyxb.binding.facets.CF_minLength(value=pyxb.binding.datatypes.nonNegativeInteger(1L))
-UID._InitializeFacetMap(UID._CF_whiteSpace,
-   UID._CF_minLength)
-Namespace.addCategoryObject('typeBinding', u'UID', UID)
+Color._CF_length = pyxb.binding.facets.CF_length(value=pyxb.binding.datatypes.nonNegativeInteger(7L))
+Color._CF_pattern = pyxb.binding.facets.CF_pattern()
+Color._CF_pattern.addPattern(pattern=u'#([a-f;0-9]){6}')
+Color._InitializeFacetMap(Color._CF_length,
+   Color._CF_pattern)
+Namespace.addCategoryObject('typeBinding', u'Color', Color)
 
 # Atomic SimpleTypeDefinition
-class Category (pyxb.binding.datatypes.string):
+class NewSimpleType (pyxb.binding.datatypes.string, pyxb.binding.basis.enumeration_mixin):
 
     """An atomic simple type."""
 
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Category')
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'NewSimpleType')
     _Documentation = None
-Category._CF_pattern = pyxb.binding.facets.CF_pattern()
-Category._CF_pattern.addPattern(pattern=u'(\\w+(,\\w+)+)?')
-Category._InitializeFacetMap(Category._CF_pattern)
-Namespace.addCategoryObject('typeBinding', u'Category', Category)
+NewSimpleType._CF_enumeration = pyxb.binding.facets.CF_enumeration(value_datatype=NewSimpleType, enum_prefix=None)
+NewSimpleType.daily = NewSimpleType._CF_enumeration.addEnumeration(unicode_value=u'daily')
+NewSimpleType.weekly = NewSimpleType._CF_enumeration.addEnumeration(unicode_value=u'weekly')
+NewSimpleType.monthly = NewSimpleType._CF_enumeration.addEnumeration(unicode_value=u'monthly')
+NewSimpleType.yearly = NewSimpleType._CF_enumeration.addEnumeration(unicode_value=u'yearly')
+NewSimpleType._InitializeFacetMap(NewSimpleType._CF_enumeration)
+Namespace.addCategoryObject('typeBinding', u'NewSimpleType', NewSimpleType)
 
 # Atomic SimpleTypeDefinition
-class Sensitivity (pyxb.binding.datatypes.string, pyxb.binding.basis.enumeration_mixin):
+class Category (pyxb.binding.datatypes.string):
 
     """An atomic simple type."""
 
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Sensitivity')
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Category')
     _Documentation = None
-Sensitivity._CF_enumeration = pyxb.binding.facets.CF_enumeration(value_datatype=Sensitivity, enum_prefix=None)
-Sensitivity.private = Sensitivity._CF_enumeration.addEnumeration(unicode_value=u'private')
-Sensitivity.confidential = Sensitivity._CF_enumeration.addEnumeration(unicode_value=u'confidential')
-Sensitivity.public = Sensitivity._CF_enumeration.addEnumeration(unicode_value=u'public')
-Sensitivity._InitializeFacetMap(Sensitivity._CF_enumeration)
-Namespace.addCategoryObject('typeBinding', u'Sensitivity', Sensitivity)
+Category._CF_pattern = pyxb.binding.facets.CF_pattern()
+Category._CF_pattern.addPattern(pattern=u'(\\w+(,\\w+)+)?')
+Category._InitializeFacetMap(Category._CF_pattern)
+Namespace.addCategoryObject('typeBinding', u'Category', Category)
 
 # Atomic SimpleTypeDefinition
-class Color (pyxb.binding.datatypes.string):
+class UID (pyxb.binding.datatypes.string):
 
     """An atomic simple type."""
 
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Color')
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'UID')
     _Documentation = None
-Color._CF_length = pyxb.binding.facets.CF_length(value=pyxb.binding.datatypes.nonNegativeInteger(7L))
-Color._CF_pattern = pyxb.binding.facets.CF_pattern()
-Color._CF_pattern.addPattern(pattern=u'#([a-f;0-9]){6}')
-Color._InitializeFacetMap(Color._CF_length,
-   Color._CF_pattern)
-Namespace.addCategoryObject('typeBinding', u'Color', Color)
+UID._CF_whiteSpace = pyxb.binding.facets.CF_whiteSpace(value=pyxb.binding.facets._WhiteSpace_enum.collapse)
+UID._CF_minLength = pyxb.binding.facets.CF_minLength(value=pyxb.binding.datatypes.nonNegativeInteger(1L))
+UID._InitializeFacetMap(UID._CF_whiteSpace,
+   UID._CF_minLength)
+Namespace.addCategoryObject('typeBinding', u'UID', UID)
 
 # Complex type XMLBase with content type ELEMENT_ONLY
 class XMLBase (pyxb.binding.basis.complexTypeDefinition):
@@ -131,85 +131,85 @@ class XMLBase (pyxb.binding.basis.complexTypeDefinition):
     _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'XMLBase')
     # Base type is pyxb.binding.datatypes.anyType
     
-    # Element {kolab.org}last-modification-date uses Python identifier last_modification_date
-    __last_modification_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date'), 'last_modification_date', '__kolab_org_XMLBase_kolab_orglast_modification_date', False)
+    # Element {http://kolab.org}link-attachment uses Python identifier link_attachment
+    __link_attachment = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'link-attachment'), 'link_attachment', '__httpkolab_org_XMLBase_httpkolab_orglink_attachment', True)
 
     
-    last_modification_date = property(__last_modification_date.value, __last_modification_date.set, None, None)
+    link_attachment = property(__link_attachment.value, __link_attachment.set, None, None)
 
     
-    # Element {kolab.org}body uses Python identifier body
-    __body = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'body'), 'body', '__kolab_org_XMLBase_kolab_orgbody', False)
+    # Element {http://kolab.org}product-id uses Python identifier product_id
+    __product_id = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'product-id'), 'product_id', '__httpkolab_org_XMLBase_httpkolab_orgproduct_id', False)
 
     
-    body = property(__body.value, __body.set, None, None)
+    product_id = property(__product_id.value, __product_id.set, None, None)
 
     
-    # Element {kolab.org}categories uses Python identifier categories
-    __categories = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'categories'), 'categories', '__kolab_org_XMLBase_kolab_orgcategories', False)
+    # Element {http://kolab.org}body uses Python identifier body
+    __body = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'body'), 'body', '__httpkolab_org_XMLBase_httpkolab_orgbody', False)
 
     
-    categories = property(__categories.value, __categories.set, None, None)
+    body = property(__body.value, __body.set, None, None)
 
     
-    # Element {kolab.org}inline-attachment uses Python identifier inline_attachment
-    __inline_attachment = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment'), 'inline_attachment', '__kolab_org_XMLBase_kolab_orginline_attachment', True)
+    # Element {http://kolab.org}sensitivity uses Python identifier sensitivity
+    __sensitivity = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'sensitivity'), 'sensitivity', '__httpkolab_org_XMLBase_httpkolab_orgsensitivity', False, defaultValue=u'public')
 
     
-    inline_attachment = property(__inline_attachment.value, __inline_attachment.set, None, None)
+    sensitivity = property(__sensitivity.value, __sensitivity.set, None, None)
 
     
-    # Element {kolab.org}creation-date uses Python identifier creation_date
-    __creation_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'creation-date'), 'creation_date', '__kolab_org_XMLBase_kolab_orgcreation_date', False)
+    # Element {http://kolab.org}last-modification-date uses Python identifier last_modification_date
+    __last_modification_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date'), 'last_modification_date', '__httpkolab_org_XMLBase_httpkolab_orglast_modification_date', False)
 
     
-    creation_date = property(__creation_date.value, __creation_date.set, None, None)
+    last_modification_date = property(__last_modification_date.value, __last_modification_date.set, None, None)
 
     
-    # Element {kolab.org}link-attachment uses Python identifier link_attachment
-    __link_attachment = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'link-attachment'), 'link_attachment', '__kolab_org_XMLBase_kolab_orglink_attachment', True)
+    # Element {http://kolab.org}inline-attachment uses Python identifier inline_attachment
+    __inline_attachment = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment'), 'inline_attachment', '__httpkolab_org_XMLBase_httpkolab_orginline_attachment', True)
 
     
-    link_attachment = property(__link_attachment.value, __link_attachment.set, None, None)
+    inline_attachment = property(__inline_attachment.value, __inline_attachment.set, None, None)
 
     
-    # Element {kolab.org}uid uses Python identifier uid
-    __uid = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'uid'), 'uid', '__kolab_org_XMLBase_kolab_orguid', False)
+    # Element {http://kolab.org}uid uses Python identifier uid
+    __uid = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'uid'), 'uid', '__httpkolab_org_XMLBase_httpkolab_orguid', False)
 
     
     uid = property(__uid.value, __uid.set, None, None)
 
     
-    # Element {kolab.org}product-id uses Python identifier product_id
-    __product_id = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'product-id'), 'product_id', '__kolab_org_XMLBase_kolab_orgproduct_id', False)
+    # Element {http://kolab.org}creation-date uses Python identifier creation_date
+    __creation_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'creation-date'), 'creation_date', '__httpkolab_org_XMLBase_httpkolab_orgcreation_date', False)
 
     
-    product_id = property(__product_id.value, __product_id.set, None, None)
+    creation_date = property(__creation_date.value, __creation_date.set, None, None)
 
     
-    # Element {kolab.org}sensitivity uses Python identifier sensitivity
-    __sensitivity = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'sensitivity'), 'sensitivity', '__kolab_org_XMLBase_kolab_orgsensitivity', False)
+    # Element {http://kolab.org}categories uses Python identifier categories
+    __categories = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'categories'), 'categories', '__httpkolab_org_XMLBase_httpkolab_orgcategories', False)
 
     
-    sensitivity = property(__sensitivity.value, __sensitivity.set, None, None)
+    categories = property(__categories.value, __categories.set, None, None)
 
     
     # Attribute version uses Python identifier version
-    __version = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'version'), 'version', '__kolab_org_XMLBase_version', pyxb.binding.datatypes.double)
+    __version = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'version'), 'version', '__httpkolab_org_XMLBase_version', pyxb.binding.datatypes.double, unicode_default=u'1.0')
     
     version = property(__version.value, __version.set, None, None)
 
 
     _ElementMap = {
-        __last_modification_date.name() : __last_modification_date,
+        __link_attachment.name() : __link_attachment,
+        __product_id.name() : __product_id,
         __body.name() : __body,
-        __categories.name() : __categories,
+        __sensitivity.name() : __sensitivity,
+        __last_modification_date.name() : __last_modification_date,
         __inline_attachment.name() : __inline_attachment,
-        __creation_date.name() : __creation_date,
-        __link_attachment.name() : __link_attachment,
         __uid.name() : __uid,
-        __product_id.name() : __product_id,
-        __sensitivity.name() : __sensitivity
+        __creation_date.name() : __creation_date,
+        __categories.name() : __categories
     }
     _AttributeMap = {
         __version.name() : __version
@@ -217,437 +217,467 @@ class XMLBase (pyxb.binding.basis.complexTypeDefinition):
 Namespace.addCategoryObject('typeBinding', u'XMLBase', XMLBase)
 
 
-# Complex type Contact with content type ELEMENT_ONLY
-class Contact (XMLBase):
+# Complex type Incidence with content type ELEMENT_ONLY
+class Incidence (XMLBase):
     _TypeDefinition = None
     _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
     _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Contact')
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Incidence')
     # Base type is XMLBase
     
-    # Element {kolab.org}phone uses Python identifier phone
-    __phone = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'phone'), 'phone', '__kolab_org_Contact_kolab_orgphone', True)
-
-    
-    phone = property(__phone.value, __phone.set, None, None)
-
-    
-    # Element {kolab.org}email uses Python identifier email
-    __email = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'email'), 'email', '__kolab_org_Contact_kolab_orgemail', True)
+    # Element {http://kolab.org}attendee uses Python identifier attendee
+    __attendee = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'attendee'), 'attendee', '__httpkolab_org_Incidence_httpkolab_orgattendee', False)
 
     
-    email = property(__email.value, __email.set, None, None)
+    attendee = property(__attendee.value, __attendee.set, None, None)
 
     
-    # Element inline_attachment ({kolab.org}inline-attachment) inherited from {kolab.org}XMLBase
-    
-    # Element {kolab.org}address uses Python identifier address
-    __address = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'address'), 'address', '__kolab_org_Contact_kolab_orgaddress', True)
+    # Element {http://kolab.org}location uses Python identifier location
+    __location = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'location'), 'location', '__httpkolab_org_Incidence_httpkolab_orglocation', False)
 
     
-    address = property(__address.value, __address.set, None, None)
+    location = property(__location.value, __location.set, None, None)
 
     
-    # Element {kolab.org}preferred-address uses Python identifier preferred_address
-    __preferred_address = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'preferred-address'), 'preferred_address', '__kolab_org_Contact_kolab_orgpreferred_address', False)
+    # Element {http://kolab.org}alarm uses Python identifier alarm
+    __alarm = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'alarm'), 'alarm', '__httpkolab_org_Incidence_httpkolab_orgalarm', False)
 
     
-    preferred_address = property(__preferred_address.value, __preferred_address.set, None, None)
+    alarm = property(__alarm.value, __alarm.set, None, None)
 
     
-    # Element {kolab.org}office-location uses Python identifier office_location
-    __office_location = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'office-location'), 'office_location', '__kolab_org_Contact_kolab_orgoffice_location', False)
-
+    # Element sensitivity ({http://kolab.org}sensitivity) inherited from {http://kolab.org}XMLBase
     
-    office_location = property(__office_location.value, __office_location.set, None, None)
+    # Element {http://kolab.org}creator uses Python identifier creator
+    __creator = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'creator'), 'creator', '__httpkolab_org_Incidence_httpkolab_orgcreator', False)
 
     
-    # Element {kolab.org}latitude uses Python identifier latitude
-    __latitude = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'latitude'), 'latitude', '__kolab_org_Contact_kolab_orglatitude', False)
+    creator = property(__creator.value, __creator.set, None, None)
 
     
-    latitude = property(__latitude.value, __latitude.set, None, None)
-
+    # Element product_id ({http://kolab.org}product-id) inherited from {http://kolab.org}XMLBase
     
-    # Element {kolab.org}job-title uses Python identifier job_title
-    __job_title = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'job-title'), 'job_title', '__kolab_org_Contact_kolab_orgjob_title', False)
-
+    # Element link_attachment ({http://kolab.org}link-attachment) inherited from {http://kolab.org}XMLBase
     
-    job_title = property(__job_title.value, __job_title.set, None, None)
-
+    # Element inline_attachment ({http://kolab.org}inline-attachment) inherited from {http://kolab.org}XMLBase
     
-    # Element {kolab.org}manager-name uses Python identifier manager_name
-    __manager_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'manager-name'), 'manager_name', '__kolab_org_Contact_kolab_orgmanager_name', False)
-
+    # Element categories ({http://kolab.org}categories) inherited from {http://kolab.org}XMLBase
     
-    manager_name = property(__manager_name.value, __manager_name.set, None, None)
-
+    # Element creation_date ({http://kolab.org}creation-date) inherited from {http://kolab.org}XMLBase
     
-    # Element uid ({kolab.org}uid) inherited from {kolab.org}XMLBase
+    # Element uid ({http://kolab.org}uid) inherited from {http://kolab.org}XMLBase
     
-    # Element {kolab.org}im-address uses Python identifier im_address
-    __im_address = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'im-address'), 'im_address', '__kolab_org_Contact_kolab_orgim_address', False)
+    # Element {http://kolab.org}organizer uses Python identifier organizer
+    __organizer = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'organizer'), 'organizer', '__httpkolab_org_Incidence_httpkolab_orgorganizer', False)
 
     
-    im_address = property(__im_address.value, __im_address.set, None, None)
+    organizer = property(__organizer.value, __organizer.set, None, None)
 
     
-    # Element {kolab.org}assistant uses Python identifier assistant
-    __assistant = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'assistant'), 'assistant', '__kolab_org_Contact_kolab_orgassistant', False)
+    # Element {http://kolab.org}recurrence uses Python identifier recurrence
+    __recurrence = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'recurrence'), 'recurrence', '__httpkolab_org_Incidence_httpkolab_orgrecurrence', False)
 
     
-    assistant = property(__assistant.value, __assistant.set, None, None)
+    recurrence = property(__recurrence.value, __recurrence.set, None, None)
 
     
-    # Element link_attachment ({kolab.org}link-attachment) inherited from {kolab.org}XMLBase
+    # Element body ({http://kolab.org}body) inherited from {http://kolab.org}XMLBase
     
-    # Element {kolab.org}nick-name uses Python identifier nick_name
-    __nick_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'nick-name'), 'nick_name', '__kolab_org_Contact_kolab_orgnick_name', False)
+    # Element {http://kolab.org}summary uses Python identifier summary
+    __summary = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'summary'), 'summary', '__httpkolab_org_Incidence_httpkolab_orgsummary', False)
 
     
-    nick_name = property(__nick_name.value, __nick_name.set, None, None)
+    summary = property(__summary.value, __summary.set, None, None)
 
     
-    # Element body ({kolab.org}body) inherited from {kolab.org}XMLBase
+    # Element last_modification_date ({http://kolab.org}last-modification-date) inherited from {http://kolab.org}XMLBase
     
-    # Element {kolab.org}profession uses Python identifier profession
-    __profession = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'profession'), 'profession', '__kolab_org_Contact_kolab_orgprofession', False)
+    # Attribute version inherited from {http://kolab.org}XMLBase
 
-    
-    profession = property(__profession.value, __profession.set, None, None)
+    _ElementMap = XMLBase._ElementMap.copy()
+    _ElementMap.update({
+        __attendee.name() : __attendee,
+        __location.name() : __location,
+        __alarm.name() : __alarm,
+        __creator.name() : __creator,
+        __organizer.name() : __organizer,
+        __recurrence.name() : __recurrence,
+        __summary.name() : __summary
+    })
+    _AttributeMap = XMLBase._AttributeMap.copy()
+    _AttributeMap.update({
+        
+    })
+Namespace.addCategoryObject('typeBinding', u'Incidence', Incidence)
 
-    
-    # Element {kolab.org}spouse-name uses Python identifier spouse_name
-    __spouse_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'spouse-name'), 'spouse_name', '__kolab_org_Contact_kolab_orgspouse_name', False)
 
+# Complex type Task with content type ELEMENT_ONLY
+class Task (Incidence):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = False
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Task')
+    # Base type is Incidence
     
-    spouse_name = property(__spouse_name.value, __spouse_name.set, None, None)
-
+    # Element attendee ({http://kolab.org}attendee) inherited from {http://kolab.org}Incidence
     
-    # Element categories ({kolab.org}categories) inherited from {kolab.org}XMLBase
+    # Element product_id ({http://kolab.org}product-id) inherited from {http://kolab.org}XMLBase
     
-    # Element {kolab.org}birthday uses Python identifier birthday
-    __birthday = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'birthday'), 'birthday', '__kolab_org_Contact_kolab_orgbirthday', False)
+    # Element {http://kolab.org}completed uses Python identifier completed
+    __completed = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'completed'), 'completed', '__httpkolab_org_Task_httpkolab_orgcompleted', False)
 
     
-    birthday = property(__birthday.value, __birthday.set, None, None)
+    completed = property(__completed.value, __completed.set, None, None)
 
     
-    # Element creation_date ({kolab.org}creation-date) inherited from {kolab.org}XMLBase
+    # Element categories ({http://kolab.org}categories) inherited from {http://kolab.org}XMLBase
     
-    # Element {kolab.org}anniversary uses Python identifier anniversary
-    __anniversary = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'anniversary'), 'anniversary', '__kolab_org_Contact_kolab_organniversary', False)
-
+    # Element creation_date ({http://kolab.org}creation-date) inherited from {http://kolab.org}XMLBase
     
-    anniversary = property(__anniversary.value, __anniversary.set, None, None)
-
+    # Element location ({http://kolab.org}location) inherited from {http://kolab.org}Incidence
     
-    # Element last_modification_date ({kolab.org}last-modification-date) inherited from {kolab.org}XMLBase
+    # Element last_modification_date ({http://kolab.org}last-modification-date) inherited from {http://kolab.org}XMLBase
     
-    # Element {kolab.org}name uses Python identifier name
-    __name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'name'), 'name', '__kolab_org_Contact_kolab_orgname', False)
-
+    # Element sensitivity ({http://kolab.org}sensitivity) inherited from {http://kolab.org}XMLBase
     
-    name = property(__name.value, __name.set, None, None)
-
+    # Element inline_attachment ({http://kolab.org}inline-attachment) inherited from {http://kolab.org}XMLBase
     
-    # Element {kolab.org}picture uses Python identifier picture
-    __picture = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'picture'), 'picture', '__kolab_org_Contact_kolab_orgpicture', False)
-
+    # Element link_attachment ({http://kolab.org}link-attachment) inherited from {http://kolab.org}XMLBase
     
-    picture = property(__picture.value, __picture.set, None, None)
+    # Element {http://kolab.org}status uses Python identifier status
+    __status = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'status'), 'status', '__httpkolab_org_Task_httpkolab_orgstatus', False)
 
     
-    # Element sensitivity ({kolab.org}sensitivity) inherited from {kolab.org}XMLBase
-    
-    # Element {kolab.org}department uses Python identifier department
-    __department = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'department'), 'department', '__kolab_org_Contact_kolab_orgdepartment', False)
+    status = property(__status.value, __status.set, None, None)
 
     
-    department = property(__department.value, __department.set, None, None)
+    # Element {http://kolab.org}due-date uses Python identifier due_date
+    __due_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'due-date'), 'due_date', '__httpkolab_org_Task_httpkolab_orgdue_date', False)
 
     
-    # Element {kolab.org}children uses Python identifier children
-    __children = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'children'), 'children', '__kolab_org_Contact_kolab_orgchildren', False)
+    due_date = property(__due_date.value, __due_date.set, None, None)
 
     
-    children = property(__children.value, __children.set, None, None)
-
+    # Element creator ({http://kolab.org}creator) inherited from {http://kolab.org}Incidence
     
-    # Element {kolab.org}free-busy-url uses Python identifier free_busy_url
-    __free_busy_url = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'free-busy-url'), 'free_busy_url', '__kolab_org_Contact_kolab_orgfree_busy_url', False)
+    # Element {http://kolab.org}start-date uses Python identifier start_date
+    __start_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'start-date'), 'start_date', '__httpkolab_org_Task_httpkolab_orgstart_date', False)
 
     
-    free_busy_url = property(__free_busy_url.value, __free_busy_url.set, None, None)
+    start_date = property(__start_date.value, __start_date.set, None, None)
 
     
-    # Element product_id ({kolab.org}product-id) inherited from {kolab.org}XMLBase
-    
-    # Element {kolab.org}gender uses Python identifier gender
-    __gender = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'gender'), 'gender', '__kolab_org_Contact_kolab_orggender', False)
+    # Element {http://kolab.org}parent uses Python identifier parent
+    __parent = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'parent'), 'parent', '__httpkolab_org_Task_httpkolab_orgparent', False)
 
     
-    gender = property(__gender.value, __gender.set, None, None)
+    parent = property(__parent.value, __parent.set, None, None)
 
     
-    # Element {kolab.org}organization uses Python identifier organization
-    __organization = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'organization'), 'organization', '__kolab_org_Contact_kolab_orgorganization', False)
-
+    # Element organizer ({http://kolab.org}organizer) inherited from {http://kolab.org}Incidence
     
-    organization = property(__organization.value, __organization.set, None, None)
-
+    # Element alarm ({http://kolab.org}alarm) inherited from {http://kolab.org}Incidence
     
-    # Element {kolab.org}longitude uses Python identifier longitude
-    __longitude = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'longitude'), 'longitude', '__kolab_org_Contact_kolab_orglongitude', False)
+    # Element {http://kolab.org}priority uses Python identifier priority
+    __priority = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'priority'), 'priority', '__httpkolab_org_Task_httpkolab_orgpriority', False)
 
     
-    longitude = property(__longitude.value, __longitude.set, None, None)
+    priority = property(__priority.value, __priority.set, None, None)
 
     
-    # Element {kolab.org}language uses Python identifier language
-    __language = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'language'), 'language', '__kolab_org_Contact_kolab_orglanguage', False)
-
+    # Element recurrence ({http://kolab.org}recurrence) inherited from {http://kolab.org}Incidence
     
-    language = property(__language.value, __language.set, None, None)
-
+    # Element summary ({http://kolab.org}summary) inherited from {http://kolab.org}Incidence
     
-    # Element {kolab.org}web-page uses Python identifier web_page
-    __web_page = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'web-page'), 'web_page', '__kolab_org_Contact_kolab_orgweb_page', False)
-
+    # Element uid ({http://kolab.org}uid) inherited from {http://kolab.org}XMLBase
     
-    web_page = property(__web_page.value, __web_page.set, None, None)
-
+    # Element body ({http://kolab.org}body) inherited from {http://kolab.org}XMLBase
     
-    # Attribute version inherited from {kolab.org}XMLBase
+    # Attribute version inherited from {http://kolab.org}XMLBase
 
-    _ElementMap = XMLBase._ElementMap.copy()
+    _ElementMap = Incidence._ElementMap.copy()
     _ElementMap.update({
-        __phone.name() : __phone,
-        __email.name() : __email,
-        __address.name() : __address,
-        __preferred_address.name() : __preferred_address,
-        __office_location.name() : __office_location,
-        __latitude.name() : __latitude,
-        __job_title.name() : __job_title,
-        __manager_name.name() : __manager_name,
-        __im_address.name() : __im_address,
-        __assistant.name() : __assistant,
-        __nick_name.name() : __nick_name,
-        __profession.name() : __profession,
-        __spouse_name.name() : __spouse_name,
-        __birthday.name() : __birthday,
-        __anniversary.name() : __anniversary,
-        __name.name() : __name,
-        __picture.name() : __picture,
-        __department.name() : __department,
-        __children.name() : __children,
-        __free_busy_url.name() : __free_busy_url,
-        __gender.name() : __gender,
-        __organization.name() : __organization,
-        __longitude.name() : __longitude,
-        __language.name() : __language,
-        __web_page.name() : __web_page
+        __completed.name() : __completed,
+        __status.name() : __status,
+        __due_date.name() : __due_date,
+        __start_date.name() : __start_date,
+        __parent.name() : __parent,
+        __priority.name() : __priority
     })
-    _AttributeMap = XMLBase._AttributeMap.copy()
+    _AttributeMap = Incidence._AttributeMap.copy()
     _AttributeMap.update({
         
     })
-Namespace.addCategoryObject('typeBinding', u'Contact', Contact)
+Namespace.addCategoryObject('typeBinding', u'Task', Task)
 
 
-# Complex type Recurrence with content type ELEMENT_ONLY
-class Recurrence (pyxb.binding.basis.complexTypeDefinition):
+# Complex type Name with content type ELEMENT_ONLY
+class Name (pyxb.binding.basis.complexTypeDefinition):
     _TypeDefinition = None
     _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
-    _Abstract = True
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Recurrence')
+    _Abstract = False
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Name')
     # Base type is pyxb.binding.datatypes.anyType
     
-    # Element {kolab.org}exclusion uses Python identifier exclusion
-    __exclusion = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'exclusion'), 'exclusion', '__kolab_org_Recurrence_kolab_orgexclusion', True)
+    # Element {http://kolab.org}last-name uses Python identifier last_name
+    __last_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'last-name'), 'last_name', '__httpkolab_org_Name_httpkolab_orglast_name', False)
 
     
-    exclusion = property(__exclusion.value, __exclusion.set, None, None)
+    last_name = property(__last_name.value, __last_name.set, None, None)
 
     
-    # Element {kolab.org}interval uses Python identifier interval
-    __interval = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'interval'), 'interval', '__kolab_org_Recurrence_kolab_orginterval', False)
+    # Element {http://kolab.org}initials uses Python identifier initials
+    __initials = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'initials'), 'initials', '__httpkolab_org_Name_httpkolab_orginitials', False)
 
     
-    interval = property(__interval.value, __interval.set, None, None)
+    initials = property(__initials.value, __initials.set, None, None)
 
     
-    # Element {kolab.org}rangetype uses Python identifier rangetype
-    __rangetype = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'rangetype'), 'rangetype', '__kolab_org_Recurrence_kolab_orgrangetype', False)
+    # Element {http://kolab.org}full-name uses Python identifier full_name
+    __full_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'full-name'), 'full_name', '__httpkolab_org_Name_httpkolab_orgfull_name', False)
 
     
-    rangetype = property(__rangetype.value, __rangetype.set, None, None)
+    full_name = property(__full_name.value, __full_name.set, None, None)
 
+    
+    # Element {http://kolab.org}given-name uses Python identifier given_name
+    __given_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'given-name'), 'given_name', '__httpkolab_org_Name_httpkolab_orggiven_name', False)
 
-    _ElementMap = {
-        __exclusion.name() : __exclusion,
-        __interval.name() : __interval,
-        __rangetype.name() : __rangetype
-    }
-    _AttributeMap = {
-        
-    }
-Namespace.addCategoryObject('typeBinding', u'Recurrence', Recurrence)
+    
+    given_name = property(__given_name.value, __given_name.set, None, None)
 
+    
+    # Element {http://kolab.org}prefix uses Python identifier prefix
+    __prefix = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'prefix'), 'prefix', '__httpkolab_org_Name_httpkolab_orgprefix', False)
 
-# Complex type YearlyRecurrence with content type ELEMENT_ONLY
-class YearlyRecurrence (Recurrence):
+    
+    prefix = property(__prefix.value, __prefix.set, None, None)
+
+    
+    # Element {http://kolab.org}middle-names uses Python identifier middle_names
+    __middle_names = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'middle-names'), 'middle_names', '__httpkolab_org_Name_httpkolab_orgmiddle_names', False)
+
+    
+    middle_names = property(__middle_names.value, __middle_names.set, None, None)
+
+    
+    # Element {http://kolab.org}suffix uses Python identifier suffix
+    __suffix = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'suffix'), 'suffix', '__httpkolab_org_Name_httpkolab_orgsuffix', False)
+
+    
+    suffix = property(__suffix.value, __suffix.set, None, None)
+
+
+    _ElementMap = {
+        __last_name.name() : __last_name,
+        __initials.name() : __initials,
+        __full_name.name() : __full_name,
+        __given_name.name() : __given_name,
+        __prefix.name() : __prefix,
+        __middle_names.name() : __middle_names,
+        __suffix.name() : __suffix
+    }
+    _AttributeMap = {
+        
+    }
+Namespace.addCategoryObject('typeBinding', u'Name', Name)
+
+
+# Complex type SMTPContact with content type ELEMENT_ONLY
+class SMTPContact (pyxb.binding.basis.complexTypeDefinition):
     _TypeDefinition = None
     _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
     _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'YearlyRecurrence')
-    # Base type is Recurrence
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'SMTPContact')
+    # Base type is pyxb.binding.datatypes.anyType
     
-    # Element {kolab.org}daynumber uses Python identifier daynumber
-    __daynumber = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'daynumber'), 'daynumber', '__kolab_org_YearlyRecurrence_kolab_orgdaynumber', False)
+    # Element {http://kolab.org}smtp-address uses Python identifier smtp_address
+    __smtp_address = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'smtp-address'), 'smtp_address', '__httpkolab_org_SMTPContact_httpkolab_orgsmtp_address', False)
 
     
-    daynumber = property(__daynumber.value, __daynumber.set, None, None)
+    smtp_address = property(__smtp_address.value, __smtp_address.set, None, None)
 
     
-    # Element rangetype ({kolab.org}rangetype) inherited from {kolab.org}Recurrence
-    
-    # Element {kolab.org}month uses Python identifier month
-    __month = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'month'), 'month', '__kolab_org_YearlyRecurrence_kolab_orgmonth', False)
+    # Element {http://kolab.org}display-name uses Python identifier display_name
+    __display_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'display-name'), 'display_name', '__httpkolab_org_SMTPContact_httpkolab_orgdisplay_name', False)
 
     
-    month = property(__month.value, __month.set, None, None)
+    display_name = property(__display_name.value, __display_name.set, None, None)
+
+
+    _ElementMap = {
+        __smtp_address.name() : __smtp_address,
+        __display_name.name() : __display_name
+    }
+    _AttributeMap = {
+        
+    }
+Namespace.addCategoryObject('typeBinding', u'SMTPContact', SMTPContact)
 
+
+# Complex type Address with content type ELEMENT_ONLY
+class Address (pyxb.binding.basis.complexTypeDefinition):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = False
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Address')
+    # Base type is pyxb.binding.datatypes.anyType
     
-    # Element {kolab.org}day uses Python identifier day
-    __day = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'day'), 'day', '__kolab_org_YearlyRecurrence_kolab_orgday', False)
+    # Element {http://kolab.org}locality uses Python identifier locality
+    __locality = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'locality'), 'locality', '__httpkolab_org_Address_httpkolab_orglocality', False)
 
     
-    day = property(__day.value, __day.set, None, None)
+    locality = property(__locality.value, __locality.set, None, None)
 
     
-    # Element exclusion ({kolab.org}exclusion) inherited from {kolab.org}Recurrence
+    # Element {http://kolab.org}region uses Python identifier region
+    __region = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'region'), 'region', '__httpkolab_org_Address_httpkolab_orgregion', False)
+
     
-    # Element interval ({kolab.org}interval) inherited from {kolab.org}Recurrence
+    region = property(__region.value, __region.set, None, None)
+
     
-    # Attribute type uses Python identifier type
-    __type = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'type'), 'type', '__kolab_org_YearlyRecurrence_type', STD_ANON, required=True)
+    # Element {http://kolab.org}type uses Python identifier type
+    __type = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'type'), 'type', '__httpkolab_org_Address_httpkolab_orgtype', False, defaultValue=u'home')
+
     
     type = property(__type.value, __type.set, None, None)
 
     
-    # Attribute cycle uses Python identifier cycle
-    __cycle = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'cycle'), 'cycle', '__kolab_org_YearlyRecurrence_cycle', pyxb.binding.datatypes.string, fixed=True, unicode_default=u'yearly', required=True)
+    # Element {http://kolab.org}postal-code uses Python identifier postal_code
+    __postal_code = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'postal-code'), 'postal_code', '__httpkolab_org_Address_httpkolab_orgpostal_code', False)
+
     
-    cycle = property(__cycle.value, __cycle.set, None, None)
+    postal_code = property(__postal_code.value, __postal_code.set, None, None)
 
+    
+    # Element {http://kolab.org}street uses Python identifier street
+    __street = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'street'), 'street', '__httpkolab_org_Address_httpkolab_orgstreet', False)
 
-    _ElementMap = Recurrence._ElementMap.copy()
-    _ElementMap.update({
-        __daynumber.name() : __daynumber,
-        __month.name() : __month,
-        __day.name() : __day
-    })
-    _AttributeMap = Recurrence._AttributeMap.copy()
-    _AttributeMap.update({
+    
+    street = property(__street.value, __street.set, None, None)
+
+    
+    # Element {http://kolab.org}country uses Python identifier country
+    __country = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'country'), 'country', '__httpkolab_org_Address_httpkolab_orgcountry', False)
+
+    
+    country = property(__country.value, __country.set, None, None)
+
+
+    _ElementMap = {
+        __locality.name() : __locality,
+        __region.name() : __region,
         __type.name() : __type,
-        __cycle.name() : __cycle
-    })
-Namespace.addCategoryObject('typeBinding', u'YearlyRecurrence', YearlyRecurrence)
+        __postal_code.name() : __postal_code,
+        __street.name() : __street,
+        __country.name() : __country
+    }
+    _AttributeMap = {
+        
+    }
+Namespace.addCategoryObject('typeBinding', u'Address', Address)
 
 
-# Complex type Incidence with content type ELEMENT_ONLY
-class Incidence (XMLBase):
+# Complex type Recurrence with content type ELEMENT_ONLY
+class Recurrence (pyxb.binding.basis.complexTypeDefinition):
     _TypeDefinition = None
     _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
-    _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Incidence')
-    # Base type is XMLBase
-    
-    # Element last_modification_date ({kolab.org}last-modification-date) inherited from {kolab.org}XMLBase
-    
-    # Element inline_attachment ({kolab.org}inline-attachment) inherited from {kolab.org}XMLBase
+    _Abstract = True
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Recurrence')
+    # Base type is pyxb.binding.datatypes.anyType
     
-    # Element {kolab.org}recurrence uses Python identifier recurrence
-    __recurrence = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'recurrence'), 'recurrence', '__kolab_org_Incidence_kolab_orgrecurrence', False)
+    # Element {http://kolab.org}interval uses Python identifier interval
+    __interval = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'interval'), 'interval', '__httpkolab_org_Recurrence_httpkolab_orginterval', False)
 
     
-    recurrence = property(__recurrence.value, __recurrence.set, None, None)
+    interval = property(__interval.value, __interval.set, None, None)
 
     
-    # Element {kolab.org}organizer uses Python identifier organizer
-    __organizer = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'organizer'), 'organizer', '__kolab_org_Incidence_kolab_orgorganizer', False)
+    # Element {http://kolab.org}exclusion uses Python identifier exclusion
+    __exclusion = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'exclusion'), 'exclusion', '__httpkolab_org_Recurrence_httpkolab_orgexclusion', True)
 
     
-    organizer = property(__organizer.value, __organizer.set, None, None)
+    exclusion = property(__exclusion.value, __exclusion.set, None, None)
 
     
-    # Element {kolab.org}summary uses Python identifier summary
-    __summary = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'summary'), 'summary', '__kolab_org_Incidence_kolab_orgsummary', False)
+    # Element {http://kolab.org}rangetype uses Python identifier rangetype
+    __rangetype = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'rangetype'), 'rangetype', '__httpkolab_org_Recurrence_httpkolab_orgrangetype', False)
 
     
-    summary = property(__summary.value, __summary.set, None, None)
+    rangetype = property(__rangetype.value, __rangetype.set, None, None)
 
+
+    _ElementMap = {
+        __interval.name() : __interval,
+        __exclusion.name() : __exclusion,
+        __rangetype.name() : __rangetype
+    }
+    _AttributeMap = {
+        
+    }
+Namespace.addCategoryObject('typeBinding', u'Recurrence', Recurrence)
+
+
+# Complex type YearlyRecurrence with content type ELEMENT_ONLY
+class YearlyRecurrence (Recurrence):
+    _TypeDefinition = None
+    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
+    _Abstract = False
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'YearlyRecurrence')
+    # Base type is Recurrence
     
-    # Element categories ({kolab.org}categories) inherited from {kolab.org}XMLBase
-    
-    # Element {kolab.org}alarm uses Python identifier alarm
-    __alarm = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'alarm'), 'alarm', '__kolab_org_Incidence_kolab_orgalarm', False)
+    # Element {http://kolab.org}daynumber uses Python identifier daynumber
+    __daynumber = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'daynumber'), 'daynumber', '__httpkolab_org_YearlyRecurrence_httpkolab_orgdaynumber', False)
 
     
-    alarm = property(__alarm.value, __alarm.set, None, None)
+    daynumber = property(__daynumber.value, __daynumber.set, None, None)
 
     
-    # Element {kolab.org}location uses Python identifier location
-    __location = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'location'), 'location', '__kolab_org_Incidence_kolab_orglocation', False)
+    # Element {http://kolab.org}day uses Python identifier day
+    __day = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'day'), 'day', '__httpkolab_org_YearlyRecurrence_httpkolab_orgday', False)
 
     
-    location = property(__location.value, __location.set, None, None)
+    day = property(__day.value, __day.set, None, None)
 
     
-    # Element creation_date ({kolab.org}creation-date) inherited from {kolab.org}XMLBase
+    # Element exclusion ({http://kolab.org}exclusion) inherited from {http://kolab.org}Recurrence
     
-    # Element sensitivity ({kolab.org}sensitivity) inherited from {kolab.org}XMLBase
+    # Element interval ({http://kolab.org}interval) inherited from {http://kolab.org}Recurrence
     
-    # Element link_attachment ({kolab.org}link-attachment) inherited from {kolab.org}XMLBase
+    # Element rangetype ({http://kolab.org}rangetype) inherited from {http://kolab.org}Recurrence
     
-    # Element {kolab.org}attendee uses Python identifier attendee
-    __attendee = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'attendee'), 'attendee', '__kolab_org_Incidence_kolab_orgattendee', False)
+    # Element {http://kolab.org}month uses Python identifier month
+    __month = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'month'), 'month', '__httpkolab_org_YearlyRecurrence_httpkolab_orgmonth', False)
 
     
-    attendee = property(__attendee.value, __attendee.set, None, None)
+    month = property(__month.value, __month.set, None, None)
 
     
-    # Element {kolab.org}creator uses Python identifier creator
-    __creator = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'creator'), 'creator', '__kolab_org_Incidence_kolab_orgcreator', False)
-
+    # Attribute type uses Python identifier type
+    __type = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'type'), 'type', '__httpkolab_org_YearlyRecurrence_type', STD_ANON, required=True)
     
-    creator = property(__creator.value, __creator.set, None, None)
+    type = property(__type.value, __type.set, None, None)
 
     
-    # Element product_id ({kolab.org}product-id) inherited from {kolab.org}XMLBase
-    
-    # Element uid ({kolab.org}uid) inherited from {kolab.org}XMLBase
-    
-    # Element body ({kolab.org}body) inherited from {kolab.org}XMLBase
+    # Attribute cycle uses Python identifier cycle
+    __cycle = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'cycle'), 'cycle', '__httpkolab_org_YearlyRecurrence_cycle', pyxb.binding.datatypes.string, fixed=True, unicode_default=u'yearly', required=True)
     
-    # Attribute version inherited from {kolab.org}XMLBase
+    cycle = property(__cycle.value, __cycle.set, None, None)
 
-    _ElementMap = XMLBase._ElementMap.copy()
+
+    _ElementMap = Recurrence._ElementMap.copy()
     _ElementMap.update({
-        __recurrence.name() : __recurrence,
-        __organizer.name() : __organizer,
-        __summary.name() : __summary,
-        __alarm.name() : __alarm,
-        __location.name() : __location,
-        __attendee.name() : __attendee,
-        __creator.name() : __creator
+        __daynumber.name() : __daynumber,
+        __day.name() : __day,
+        __month.name() : __month
     })
-    _AttributeMap = XMLBase._AttributeMap.copy()
+    _AttributeMap = Recurrence._AttributeMap.copy()
     _AttributeMap.update({
-        
+        __type.name() : __type,
+        __cycle.name() : __cycle
     })
-Namespace.addCategoryObject('typeBinding', u'Incidence', Incidence)
+Namespace.addCategoryObject('typeBinding', u'YearlyRecurrence', YearlyRecurrence)
 
 
 # Complex type Event with content type ELEMENT_ONLY
@@ -658,74 +688,74 @@ class Event (Incidence):
     _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Event')
     # Base type is Incidence
     
-    # Element categories ({kolab.org}categories) inherited from {kolab.org}XMLBase
-    
-    # Element {kolab.org}end-date uses Python identifier end_date
-    __end_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'end-date'), 'end_date', '__kolab_org_Event_kolab_orgend_date', False)
+    # Element {http://kolab.org}start-date uses Python identifier start_date
+    __start_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'start-date'), 'start_date', '__httpkolab_org_Event_httpkolab_orgstart_date', False)
 
     
-    end_date = property(__end_date.value, __end_date.set, None, None)
+    start_date = property(__start_date.value, __start_date.set, None, None)
 
     
-    # Element recurrence ({kolab.org}recurrence) inherited from {kolab.org}Incidence
+    # Element alarm ({http://kolab.org}alarm) inherited from {http://kolab.org}Incidence
+    
+    # Element summary ({http://kolab.org}summary) inherited from {http://kolab.org}Incidence
     
-    # Element sensitivity ({kolab.org}sensitivity) inherited from {kolab.org}XMLBase
+    # Element location ({http://kolab.org}location) inherited from {http://kolab.org}Incidence
     
-    # Element {kolab.org}start-date uses Python identifier start_date
-    __start_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'start-date'), 'start_date', '__kolab_org_Event_kolab_orgstart_date', False)
+    # Element {http://kolab.org}end-date uses Python identifier end_date
+    __end_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'end-date'), 'end_date', '__httpkolab_org_Event_httpkolab_orgend_date', False)
 
     
-    start_date = property(__start_date.value, __start_date.set, None, None)
+    end_date = property(__end_date.value, __end_date.set, None, None)
 
     
-    # Element summary ({kolab.org}summary) inherited from {kolab.org}Incidence
+    # Element link_attachment ({http://kolab.org}link-attachment) inherited from {http://kolab.org}XMLBase
     
-    # Element inline_attachment ({kolab.org}inline-attachment) inherited from {kolab.org}XMLBase
+    # Element attendee ({http://kolab.org}attendee) inherited from {http://kolab.org}Incidence
     
-    # Element organizer ({kolab.org}organizer) inherited from {kolab.org}Incidence
+    # Element product_id ({http://kolab.org}product-id) inherited from {http://kolab.org}XMLBase
     
-    # Element last_modification_date ({kolab.org}last-modification-date) inherited from {kolab.org}XMLBase
+    # Element creator ({http://kolab.org}creator) inherited from {http://kolab.org}Incidence
     
-    # Element location ({kolab.org}location) inherited from {kolab.org}Incidence
+    # Element {http://kolab.org}show-time-as uses Python identifier show_time_as
+    __show_time_as = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'show-time-as'), 'show_time_as', '__httpkolab_org_Event_httpkolab_orgshow_time_as', False)
+
+    
+    show_time_as = property(__show_time_as.value, __show_time_as.set, None, None)
+
     
-    # Element creation_date ({kolab.org}creation-date) inherited from {kolab.org}XMLBase
+    # Element inline_attachment ({http://kolab.org}inline-attachment) inherited from {http://kolab.org}XMLBase
     
-    # Element link_attachment ({kolab.org}link-attachment) inherited from {kolab.org}XMLBase
+    # Element categories ({http://kolab.org}categories) inherited from {http://kolab.org}XMLBase
     
-    # Element alarm ({kolab.org}alarm) inherited from {kolab.org}Incidence
+    # Element uid ({http://kolab.org}uid) inherited from {http://kolab.org}XMLBase
     
-    # Element uid ({kolab.org}uid) inherited from {kolab.org}XMLBase
+    # Element creation_date ({http://kolab.org}creation-date) inherited from {http://kolab.org}XMLBase
     
-    # Element {kolab.org}color-label uses Python identifier color_label
-    __color_label = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'color-label'), 'color_label', '__kolab_org_Event_kolab_orgcolor_label', False)
+    # Element {http://kolab.org}color-label uses Python identifier color_label
+    __color_label = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'color-label'), 'color_label', '__httpkolab_org_Event_httpkolab_orgcolor_label', False)
 
     
     color_label = property(__color_label.value, __color_label.set, None, None)
 
     
-    # Element attendee ({kolab.org}attendee) inherited from {kolab.org}Incidence
+    # Element organizer ({http://kolab.org}organizer) inherited from {http://kolab.org}Incidence
     
-    # Element product_id ({kolab.org}product-id) inherited from {kolab.org}XMLBase
+    # Element recurrence ({http://kolab.org}recurrence) inherited from {http://kolab.org}Incidence
     
-    # Element creator ({kolab.org}creator) inherited from {kolab.org}Incidence
+    # Element body ({http://kolab.org}body) inherited from {http://kolab.org}XMLBase
     
-    # Element {kolab.org}show-time-as uses Python identifier show_time_as
-    __show_time_as = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'show-time-as'), 'show_time_as', '__kolab_org_Event_kolab_orgshow_time_as', False)
-
-    
-    show_time_as = property(__show_time_as.value, __show_time_as.set, None, None)
-
+    # Element sensitivity ({http://kolab.org}sensitivity) inherited from {http://kolab.org}XMLBase
     
-    # Element body ({kolab.org}body) inherited from {kolab.org}XMLBase
+    # Element last_modification_date ({http://kolab.org}last-modification-date) inherited from {http://kolab.org}XMLBase
     
-    # Attribute version inherited from {kolab.org}XMLBase
+    # Attribute version inherited from {http://kolab.org}XMLBase
 
     _ElementMap = Incidence._ElementMap.copy()
     _ElementMap.update({
-        __end_date.name() : __end_date,
         __start_date.name() : __start_date,
-        __color_label.name() : __color_label,
-        __show_time_as.name() : __show_time_as
+        __end_date.name() : __end_date,
+        __show_time_as.name() : __show_time_as,
+        __color_label.name() : __color_label
     })
     _AttributeMap = Incidence._AttributeMap.copy()
     _AttributeMap.update({
@@ -734,172 +764,282 @@ class Event (Incidence):
 Namespace.addCategoryObject('typeBinding', u'Event', Event)
 
 
-# Complex type Name with content type ELEMENT_ONLY
-class Name (pyxb.binding.basis.complexTypeDefinition):
+# Complex type Contact with content type ELEMENT_ONLY
+class Contact (XMLBase):
     _TypeDefinition = None
     _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
     _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Name')
-    # Base type is pyxb.binding.datatypes.anyType
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Contact')
+    # Base type is XMLBase
     
-    # Element {kolab.org}prefix uses Python identifier prefix
-    __prefix = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'prefix'), 'prefix', '__kolab_org_Name_kolab_orgprefix', False)
+    # Element {http://kolab.org}manager-name uses Python identifier manager_name
+    __manager_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'manager-name'), 'manager_name', '__httpkolab_org_Contact_httpkolab_orgmanager_name', False)
 
     
-    prefix = property(__prefix.value, __prefix.set, None, None)
+    manager_name = property(__manager_name.value, __manager_name.set, None, None)
 
     
-    # Element {kolab.org}suffix uses Python identifier suffix
-    __suffix = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'suffix'), 'suffix', '__kolab_org_Name_kolab_orgsuffix', False)
+    # Element {http://kolab.org}assistant uses Python identifier assistant
+    __assistant = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'assistant'), 'assistant', '__httpkolab_org_Contact_httpkolab_orgassistant', False)
 
     
-    suffix = property(__suffix.value, __suffix.set, None, None)
+    assistant = property(__assistant.value, __assistant.set, None, None)
 
     
-    # Element {kolab.org}last-name uses Python identifier last_name
-    __last_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'last-name'), 'last_name', '__kolab_org_Name_kolab_orglast_name', False)
+    # Element {http://kolab.org}anniversary uses Python identifier anniversary
+    __anniversary = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'anniversary'), 'anniversary', '__httpkolab_org_Contact_httpkolab_organniversary', False)
 
     
-    last_name = property(__last_name.value, __last_name.set, None, None)
+    anniversary = property(__anniversary.value, __anniversary.set, None, None)
 
     
-    # Element {kolab.org}initials uses Python identifier initials
-    __initials = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'initials'), 'initials', '__kolab_org_Name_kolab_orginitials', False)
+    # Element {http://kolab.org}nick-name uses Python identifier nick_name
+    __nick_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'nick-name'), 'nick_name', '__httpkolab_org_Contact_httpkolab_orgnick_name', False)
 
     
-    initials = property(__initials.value, __initials.set, None, None)
+    nick_name = property(__nick_name.value, __nick_name.set, None, None)
 
     
-    # Element {kolab.org}full-name uses Python identifier full_name
-    __full_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'full-name'), 'full_name', '__kolab_org_Name_kolab_orgfull_name', False)
+    # Element creation_date ({http://kolab.org}creation-date) inherited from {http://kolab.org}XMLBase
+    
+    # Element {http://kolab.org}gender uses Python identifier gender
+    __gender = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'gender'), 'gender', '__httpkolab_org_Contact_httpkolab_orggender', False)
 
     
-    full_name = property(__full_name.value, __full_name.set, None, None)
+    gender = property(__gender.value, __gender.set, None, None)
 
     
-    # Element {kolab.org}given-name uses Python identifier given_name
-    __given_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'given-name'), 'given_name', '__kolab_org_Name_kolab_orggiven_name', False)
+    # Element {http://kolab.org}birthday uses Python identifier birthday
+    __birthday = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'birthday'), 'birthday', '__httpkolab_org_Contact_httpkolab_orgbirthday', False)
 
     
-    given_name = property(__given_name.value, __given_name.set, None, None)
+    birthday = property(__birthday.value, __birthday.set, None, None)
 
     
-    # Element {kolab.org}middle-names uses Python identifier middle_names
-    __middle_names = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'middle-names'), 'middle_names', '__kolab_org_Name_kolab_orgmiddle_names', False)
+    # Element sensitivity ({http://kolab.org}sensitivity) inherited from {http://kolab.org}XMLBase
+    
+    # Element {http://kolab.org}spouse-name uses Python identifier spouse_name
+    __spouse_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'spouse-name'), 'spouse_name', '__httpkolab_org_Contact_httpkolab_orgspouse_name', False)
 
     
-    middle_names = property(__middle_names.value, __middle_names.set, None, None)
+    spouse_name = property(__spouse_name.value, __spouse_name.set, None, None)
 
+    
+    # Element {http://kolab.org}picture uses Python identifier picture
+    __picture = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'picture'), 'picture', '__httpkolab_org_Contact_httpkolab_orgpicture', False)
 
-    _ElementMap = {
-        __prefix.name() : __prefix,
-        __suffix.name() : __suffix,
-        __last_name.name() : __last_name,
-        __initials.name() : __initials,
-        __full_name.name() : __full_name,
-        __given_name.name() : __given_name,
-        __middle_names.name() : __middle_names
-    }
-    _AttributeMap = {
-        
-    }
-Namespace.addCategoryObject('typeBinding', u'Name', Name)
+    
+    picture = property(__picture.value, __picture.set, None, None)
 
+    
+    # Element {http://kolab.org}name uses Python identifier name
+    __name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'name'), 'name', '__httpkolab_org_Contact_httpkolab_orgname', False)
 
-# Complex type SMTPContact with content type ELEMENT_ONLY
-class SMTPContact (pyxb.binding.basis.complexTypeDefinition):
-    _TypeDefinition = None
-    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
-    _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'SMTPContact')
-    # Base type is pyxb.binding.datatypes.anyType
     
-    # Element {kolab.org}smtp-address uses Python identifier smtp_address
-    __smtp_address = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'smtp-address'), 'smtp_address', '__kolab_org_SMTPContact_kolab_orgsmtp_address', False)
+    name = property(__name.value, __name.set, None, None)
 
     
-    smtp_address = property(__smtp_address.value, __smtp_address.set, None, None)
+    # Element link_attachment ({http://kolab.org}link-attachment) inherited from {http://kolab.org}XMLBase
+    
+    # Element inline_attachment ({http://kolab.org}inline-attachment) inherited from {http://kolab.org}XMLBase
+    
+    # Element {http://kolab.org}free-busy-url uses Python identifier free_busy_url
+    __free_busy_url = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'free-busy-url'), 'free_busy_url', '__httpkolab_org_Contact_httpkolab_orgfree_busy_url', False)
 
     
-    # Element {kolab.org}display-name uses Python identifier display_name
-    __display_name = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'display-name'), 'display_name', '__kolab_org_SMTPContact_kolab_orgdisplay_name', False)
+    free_busy_url = property(__free_busy_url.value, __free_busy_url.set, None, None)
 
     
-    display_name = property(__display_name.value, __display_name.set, None, None)
+    # Element product_id ({http://kolab.org}product-id) inherited from {http://kolab.org}XMLBase
+    
+    # Element {http://kolab.org}organization uses Python identifier organization
+    __organization = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'organization'), 'organization', '__httpkolab_org_Contact_httpkolab_orgorganization', False)
 
+    
+    organization = property(__organization.value, __organization.set, None, None)
 
-    _ElementMap = {
-        __smtp_address.name() : __smtp_address,
-        __display_name.name() : __display_name
-    }
-    _AttributeMap = {
-        
-    }
-Namespace.addCategoryObject('typeBinding', u'SMTPContact', SMTPContact)
+    
+    # Element {http://kolab.org}language uses Python identifier language
+    __language = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'language'), 'language', '__httpkolab_org_Contact_httpkolab_orglanguage', False)
 
+    
+    language = property(__language.value, __language.set, None, None)
 
-# Complex type CTD_ANON with content type ELEMENT_ONLY
-class CTD_ANON (pyxb.binding.basis.complexTypeDefinition):
-    _TypeDefinition = None
-    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
-    _Abstract = False
-    _ExpandedName = None
-    # Base type is pyxb.binding.datatypes.anyType
     
-    # Attribute cycle uses Python identifier cycle
-    __cycle = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'cycle'), 'cycle', '__kolab_org_CTD_ANON_cycle', pyxb.binding.datatypes.string)
+    # Element body ({http://kolab.org}body) inherited from {http://kolab.org}XMLBase
     
-    cycle = property(__cycle.value, __cycle.set, None, None)
+    # Element {http://kolab.org}web-page uses Python identifier web_page
+    __web_page = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'web-page'), 'web_page', '__httpkolab_org_Contact_httpkolab_orgweb_page', False)
 
-    _HasWildcardElement = True
+    
+    web_page = property(__web_page.value, __web_page.set, None, None)
 
-    _ElementMap = {
-        
-    }
-    _AttributeMap = {
-        __cycle.name() : __cycle
-    }
+    
+    # Element {http://kolab.org}phone uses Python identifier phone
+    __phone = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'phone'), 'phone', '__httpkolab_org_Contact_httpkolab_orgphone', True)
+
+    
+    phone = property(__phone.value, __phone.set, None, None)
+
+    
+    # Element {http://kolab.org}job-title uses Python identifier job_title
+    __job_title = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'job-title'), 'job_title', '__httpkolab_org_Contact_httpkolab_orgjob_title', False)
+
+    
+    job_title = property(__job_title.value, __job_title.set, None, None)
+
+    
+    # Element {http://kolab.org}im-address uses Python identifier im_address
+    __im_address = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'im-address'), 'im_address', '__httpkolab_org_Contact_httpkolab_orgim_address', False)
+
+    
+    im_address = property(__im_address.value, __im_address.set, None, None)
+
+    
+    # Element {http://kolab.org}email uses Python identifier email
+    __email = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'email'), 'email', '__httpkolab_org_Contact_httpkolab_orgemail', True)
+
+    
+    email = property(__email.value, __email.set, None, None)
+
+    
+    # Element last_modification_date ({http://kolab.org}last-modification-date) inherited from {http://kolab.org}XMLBase
+    
+    # Element {http://kolab.org}department uses Python identifier department
+    __department = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'department'), 'department', '__httpkolab_org_Contact_httpkolab_orgdepartment', False)
+
+    
+    department = property(__department.value, __department.set, None, None)
+
+    
+    # Element {http://kolab.org}address uses Python identifier address
+    __address = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'address'), 'address', '__httpkolab_org_Contact_httpkolab_orgaddress', True)
+
+    
+    address = property(__address.value, __address.set, None, None)
+
+    
+    # Element {http://kolab.org}office-location uses Python identifier office_location
+    __office_location = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'office-location'), 'office_location', '__httpkolab_org_Contact_httpkolab_orgoffice_location', False)
+
+    
+    office_location = property(__office_location.value, __office_location.set, None, None)
+
+    
+    # Element {http://kolab.org}preferred-address uses Python identifier preferred_address
+    __preferred_address = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'preferred-address'), 'preferred_address', '__httpkolab_org_Contact_httpkolab_orgpreferred_address', False)
+
+    
+    preferred_address = property(__preferred_address.value, __preferred_address.set, None, None)
+
+    
+    # Element {http://kolab.org}children uses Python identifier children
+    __children = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'children'), 'children', '__httpkolab_org_Contact_httpkolab_orgchildren', False)
+
+    
+    children = property(__children.value, __children.set, None, None)
+
+    
+    # Element {http://kolab.org}profession uses Python identifier profession
+    __profession = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'profession'), 'profession', '__httpkolab_org_Contact_httpkolab_orgprofession', False)
+
+    
+    profession = property(__profession.value, __profession.set, None, None)
+
+    
+    # Element {http://kolab.org}latitude uses Python identifier latitude
+    __latitude = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'latitude'), 'latitude', '__httpkolab_org_Contact_httpkolab_orglatitude', False)
+
+    
+    latitude = property(__latitude.value, __latitude.set, None, None)
 
+    
+    # Element uid ({http://kolab.org}uid) inherited from {http://kolab.org}XMLBase
+    
+    # Element {http://kolab.org}longitude uses Python identifier longitude
+    __longitude = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'longitude'), 'longitude', '__httpkolab_org_Contact_httpkolab_orglongitude', False)
+
+    
+    longitude = property(__longitude.value, __longitude.set, None, None)
+
+    
+    # Element categories ({http://kolab.org}categories) inherited from {http://kolab.org}XMLBase
+    
+    # Attribute version inherited from {http://kolab.org}XMLBase
+
+    _ElementMap = XMLBase._ElementMap.copy()
+    _ElementMap.update({
+        __manager_name.name() : __manager_name,
+        __assistant.name() : __assistant,
+        __anniversary.name() : __anniversary,
+        __nick_name.name() : __nick_name,
+        __gender.name() : __gender,
+        __birthday.name() : __birthday,
+        __spouse_name.name() : __spouse_name,
+        __picture.name() : __picture,
+        __name.name() : __name,
+        __free_busy_url.name() : __free_busy_url,
+        __organization.name() : __organization,
+        __language.name() : __language,
+        __web_page.name() : __web_page,
+        __phone.name() : __phone,
+        __job_title.name() : __job_title,
+        __im_address.name() : __im_address,
+        __email.name() : __email,
+        __department.name() : __department,
+        __address.name() : __address,
+        __office_location.name() : __office_location,
+        __preferred_address.name() : __preferred_address,
+        __children.name() : __children,
+        __profession.name() : __profession,
+        __latitude.name() : __latitude,
+        __longitude.name() : __longitude
+    })
+    _AttributeMap = XMLBase._AttributeMap.copy()
+    _AttributeMap.update({
+        
+    })
+Namespace.addCategoryObject('typeBinding', u'Contact', Contact)
 
 
-# Complex type CTD_ANON_ with content type ELEMENT_ONLY
-class CTD_ANON_ (SMTPContact):
+# Complex type CTD_ANON with content type ELEMENT_ONLY
+class CTD_ANON (SMTPContact):
     _TypeDefinition = None
     _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
     _Abstract = False
     _ExpandedName = None
     # Base type is SMTPContact
     
-    # Element smtp_address ({kolab.org}smtp-address) inherited from {kolab.org}SMTPContact
-    
-    # Element display_name ({kolab.org}display-name) inherited from {kolab.org}SMTPContact
-    
-    # Element {kolab.org}request-response uses Python identifier request_response
-    __request_response = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'request-response'), 'request_response', '__kolab_org_CTD_ANON__kolab_orgrequest_response', False)
+    # Element {http://kolab.org}role uses Python identifier role
+    __role = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'role'), 'role', '__httpkolab_org_CTD_ANON_httpkolab_orgrole', False)
 
     
-    request_response = property(__request_response.value, __request_response.set, None, None)
+    role = property(__role.value, __role.set, None, None)
 
     
-    # Element {kolab.org}status uses Python identifier status
-    __status = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'status'), 'status', '__kolab_org_CTD_ANON__kolab_orgstatus', False)
+    # Element display_name ({http://kolab.org}display-name) inherited from {http://kolab.org}SMTPContact
+    
+    # Element {http://kolab.org}status uses Python identifier status
+    __status = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'status'), 'status', '__httpkolab_org_CTD_ANON_httpkolab_orgstatus', False)
 
     
     status = property(__status.value, __status.set, None, None)
 
     
-    # Element {kolab.org}role uses Python identifier role
-    __role = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'role'), 'role', '__kolab_org_CTD_ANON__kolab_orgrole', False)
+    # Element smtp_address ({http://kolab.org}smtp-address) inherited from {http://kolab.org}SMTPContact
+    
+    # Element {http://kolab.org}request-response uses Python identifier request_response
+    __request_response = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'request-response'), 'request_response', '__httpkolab_org_CTD_ANON_httpkolab_orgrequest_response', False)
 
     
-    role = property(__role.value, __role.set, None, None)
+    request_response = property(__request_response.value, __request_response.set, None, None)
 
 
     _ElementMap = SMTPContact._ElementMap.copy()
     _ElementMap.update({
-        __request_response.name() : __request_response,
+        __role.name() : __role,
         __status.name() : __status,
-        __role.name() : __role
+        __request_response.name() : __request_response
     })
     _AttributeMap = SMTPContact._AttributeMap.copy()
     _AttributeMap.update({
@@ -916,52 +1056,52 @@ class Note (XMLBase):
     _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Note')
     # Base type is XMLBase
     
-    # Element {kolab.org}background-color uses Python identifier background_color
-    __background_color = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'background-color'), 'background_color', '__kolab_org_Note_kolab_orgbackground_color', False)
-
-    
-    background_color = property(__background_color.value, __background_color.set, None, None)
-
-    
-    # Element last_modification_date ({kolab.org}last-modification-date) inherited from {kolab.org}XMLBase
+    # Element link_attachment ({http://kolab.org}link-attachment) inherited from {http://kolab.org}XMLBase
     
-    # Element sensitivity ({kolab.org}sensitivity) inherited from {kolab.org}XMLBase
+    # Element last_modification_date ({http://kolab.org}last-modification-date) inherited from {http://kolab.org}XMLBase
     
-    # Element {kolab.org}foreground-color uses Python identifier foreground_color
-    __foreground_color = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'foreground-color'), 'foreground_color', '__kolab_org_Note_kolab_orgforeground_color', False)
+    # Element {http://kolab.org}foreground-color uses Python identifier foreground_color
+    __foreground_color = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'foreground-color'), 'foreground_color', '__httpkolab_org_Note_httpkolab_orgforeground_color', False, defaultValue=u'#ffff00')
 
     
     foreground_color = property(__foreground_color.value, __foreground_color.set, None, None)
 
     
-    # Element inline_attachment ({kolab.org}inline-attachment) inherited from {kolab.org}XMLBase
+    # Element sensitivity ({http://kolab.org}sensitivity) inherited from {http://kolab.org}XMLBase
     
-    # Element categories ({kolab.org}categories) inherited from {kolab.org}XMLBase
+    # Element product_id ({http://kolab.org}product-id) inherited from {http://kolab.org}XMLBase
     
-    # Element creation_date ({kolab.org}creation-date) inherited from {kolab.org}XMLBase
+    # Element body ({http://kolab.org}body) inherited from {http://kolab.org}XMLBase
     
-    # Element link_attachment ({kolab.org}link-attachment) inherited from {kolab.org}XMLBase
+    # Element categories ({http://kolab.org}categories) inherited from {http://kolab.org}XMLBase
     
-    # Element uid ({kolab.org}uid) inherited from {kolab.org}XMLBase
-    
-    # Element {kolab.org}summary uses Python identifier summary
-    __summary = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'summary'), 'summary', '__kolab_org_Note_kolab_orgsummary', False)
+    # Element {http://kolab.org}summary uses Python identifier summary
+    __summary = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'summary'), 'summary', '__httpkolab_org_Note_httpkolab_orgsummary', False)
 
     
     summary = property(__summary.value, __summary.set, None, None)
 
     
-    # Element product_id ({kolab.org}product-id) inherited from {kolab.org}XMLBase
+    # Element uid ({http://kolab.org}uid) inherited from {http://kolab.org}XMLBase
+    
+    # Element creation_date ({http://kolab.org}creation-date) inherited from {http://kolab.org}XMLBase
     
-    # Element body ({kolab.org}body) inherited from {kolab.org}XMLBase
+    # Element inline_attachment ({http://kolab.org}inline-attachment) inherited from {http://kolab.org}XMLBase
     
-    # Attribute version inherited from {kolab.org}XMLBase
+    # Element {http://kolab.org}background-color uses Python identifier background_color
+    __background_color = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'background-color'), 'background_color', '__httpkolab_org_Note_httpkolab_orgbackground_color', False, defaultValue=u'#000000')
+
+    
+    background_color = property(__background_color.value, __background_color.set, None, None)
+
+    
+    # Attribute version inherited from {http://kolab.org}XMLBase
 
     _ElementMap = XMLBase._ElementMap.copy()
     _ElementMap.update({
-        __background_color.name() : __background_color,
         __foreground_color.name() : __foreground_color,
-        __summary.name() : __summary
+        __summary.name() : __summary,
+        __background_color.name() : __background_color
     })
     _AttributeMap = XMLBase._AttributeMap.copy()
     _AttributeMap.update({
@@ -970,40 +1110,8 @@ class Note (XMLBase):
 Namespace.addCategoryObject('typeBinding', u'Note', Note)
 
 
-# Complex type PhoneNumber with content type ELEMENT_ONLY
-class PhoneNumber (pyxb.binding.basis.complexTypeDefinition):
-    _TypeDefinition = None
-    _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
-    _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'PhoneNumber')
-    # Base type is pyxb.binding.datatypes.anyType
-    
-    # Element {kolab.org}number uses Python identifier number
-    __number = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'number'), 'number', '__kolab_org_PhoneNumber_kolab_orgnumber', False)
-
-    
-    number = property(__number.value, __number.set, None, None)
-
-    
-    # Element {kolab.org}type uses Python identifier type
-    __type = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'type'), 'type', '__kolab_org_PhoneNumber_kolab_orgtype', False)
-
-    
-    type = property(__type.value, __type.set, None, None)
-
-
-    _ElementMap = {
-        __number.name() : __number,
-        __type.name() : __type
-    }
-    _AttributeMap = {
-        
-    }
-Namespace.addCategoryObject('typeBinding', u'PhoneNumber', PhoneNumber)
-
-
-# Complex type CTD_ANON_2 with content type EMPTY
-class CTD_ANON_2 (pyxb.binding.basis.complexTypeDefinition):
+# Complex type CTD_ANON_ with content type EMPTY
+class CTD_ANON_ (pyxb.binding.basis.complexTypeDefinition):
     _TypeDefinition = None
     _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_EMPTY
     _Abstract = False
@@ -1011,7 +1119,7 @@ class CTD_ANON_2 (pyxb.binding.basis.complexTypeDefinition):
     # Base type is pyxb.binding.datatypes.anyType
     
     # Attribute type uses Python identifier type
-    __type = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'type'), 'type', '__kolab_org_CTD_ANON_2_type', pyxb.binding.datatypes.string)
+    __type = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'type'), 'type', '__httpkolab_org_CTD_ANON__type', pyxb.binding.datatypes.string)
     
     type = property(__type.value, __type.set, None, None)
 
@@ -1025,86 +1133,53 @@ class CTD_ANON_2 (pyxb.binding.basis.complexTypeDefinition):
 
 
 
-# Complex type Address with content type ELEMENT_ONLY
-class Address (pyxb.binding.basis.complexTypeDefinition):
+# Complex type DailyRecurrence with content type ELEMENT_ONLY
+class DailyRecurrence (Recurrence):
     _TypeDefinition = None
     _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
     _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Address')
-    # Base type is pyxb.binding.datatypes.anyType
-    
-    # Element {kolab.org}type uses Python identifier type
-    __type = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'type'), 'type', '__kolab_org_Address_kolab_orgtype', False)
-
-    
-    type = property(__type.value, __type.set, None, None)
-
-    
-    # Element {kolab.org}postal-code uses Python identifier postal_code
-    __postal_code = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'postal-code'), 'postal_code', '__kolab_org_Address_kolab_orgpostal_code', False)
-
-    
-    postal_code = property(__postal_code.value, __postal_code.set, None, None)
-
-    
-    # Element {kolab.org}street uses Python identifier street
-    __street = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'street'), 'street', '__kolab_org_Address_kolab_orgstreet', False)
-
-    
-    street = property(__street.value, __street.set, None, None)
-
-    
-    # Element {kolab.org}locality uses Python identifier locality
-    __locality = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'locality'), 'locality', '__kolab_org_Address_kolab_orglocality', False)
-
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'DailyRecurrence')
+    # Base type is Recurrence
     
-    locality = property(__locality.value, __locality.set, None, None)
-
+    # Element interval ({http://kolab.org}interval) inherited from {http://kolab.org}Recurrence
     
-    # Element {kolab.org}country uses Python identifier country
-    __country = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'country'), 'country', '__kolab_org_Address_kolab_orgcountry', False)
-
+    # Element exclusion ({http://kolab.org}exclusion) inherited from {http://kolab.org}Recurrence
     
-    country = property(__country.value, __country.set, None, None)
-
+    # Element rangetype ({http://kolab.org}rangetype) inherited from {http://kolab.org}Recurrence
     
-    # Element {kolab.org}region uses Python identifier region
-    __region = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'region'), 'region', '__kolab_org_Address_kolab_orgregion', False)
-
+    # Attribute cycle uses Python identifier cycle
+    __cycle = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'cycle'), 'cycle', '__httpkolab_org_DailyRecurrence_cycle', pyxb.binding.datatypes.string, fixed=True, unicode_default=u'daily', required=True)
     
-    region = property(__region.value, __region.set, None, None)
+    cycle = property(__cycle.value, __cycle.set, None, None)
 
 
-    _ElementMap = {
-        __type.name() : __type,
-        __postal_code.name() : __postal_code,
-        __street.name() : __street,
-        __locality.name() : __locality,
-        __country.name() : __country,
-        __region.name() : __region
-    }
-    _AttributeMap = {
+    _ElementMap = Recurrence._ElementMap.copy()
+    _ElementMap.update({
         
-    }
-Namespace.addCategoryObject('typeBinding', u'Address', Address)
+    })
+    _AttributeMap = Recurrence._AttributeMap.copy()
+    _AttributeMap.update({
+        __cycle.name() : __cycle
+    })
+Namespace.addCategoryObject('typeBinding', u'DailyRecurrence', DailyRecurrence)
 
 
-# Complex type DailyRecurrence with content type ELEMENT_ONLY
-class DailyRecurrence (Recurrence):
+# Complex type WeeklyRecurrence with content type ELEMENT_ONLY
+class WeeklyRecurrence (Recurrence):
     _TypeDefinition = None
     _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
     _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'DailyRecurrence')
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'WeeklyRecurrence')
     # Base type is Recurrence
     
-    # Element exclusion ({kolab.org}exclusion) inherited from {kolab.org}Recurrence
+    # Element interval ({http://kolab.org}interval) inherited from {http://kolab.org}Recurrence
     
-    # Element interval ({kolab.org}interval) inherited from {kolab.org}Recurrence
+    # Element exclusion ({http://kolab.org}exclusion) inherited from {http://kolab.org}Recurrence
     
-    # Element rangetype ({kolab.org}rangetype) inherited from {kolab.org}Recurrence
+    # Element rangetype ({http://kolab.org}rangetype) inherited from {http://kolab.org}Recurrence
     
     # Attribute cycle uses Python identifier cycle
-    __cycle = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'cycle'), 'cycle', '__kolab_org_DailyRecurrence_cycle', pyxb.binding.datatypes.string, fixed=True, unicode_default=u'daily', required=True)
+    __cycle = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'cycle'), 'cycle', '__httpkolab_org_WeeklyRecurrence_cycle', pyxb.binding.datatypes.string, fixed=True, unicode_default=u'weekly', required=True)
     
     cycle = property(__cycle.value, __cycle.set, None, None)
 
@@ -1117,7 +1192,7 @@ class DailyRecurrence (Recurrence):
     _AttributeMap.update({
         __cycle.name() : __cycle
     })
-Namespace.addCategoryObject('typeBinding', u'DailyRecurrence', DailyRecurrence)
+Namespace.addCategoryObject('typeBinding', u'WeeklyRecurrence', WeeklyRecurrence)
 
 
 # Complex type MonthlyRecurrence with content type ELEMENT_ONLY
@@ -1128,42 +1203,42 @@ class MonthlyRecurrence (Recurrence):
     _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'MonthlyRecurrence')
     # Base type is Recurrence
     
-    # Element rangetype ({kolab.org}rangetype) inherited from {kolab.org}Recurrence
-    
-    # Element exclusion ({kolab.org}exclusion) inherited from {kolab.org}Recurrence
-    
-    # Element {kolab.org}day uses Python identifier day
-    __day = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'day'), 'day', '__kolab_org_MonthlyRecurrence_kolab_orgday', False)
+    # Element {http://kolab.org}daynumber uses Python identifier daynumber
+    __daynumber = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'daynumber'), 'daynumber', '__httpkolab_org_MonthlyRecurrence_httpkolab_orgdaynumber', False)
 
     
-    day = property(__day.value, __day.set, None, None)
+    daynumber = property(__daynumber.value, __daynumber.set, None, None)
 
     
-    # Element {kolab.org}daynumber uses Python identifier daynumber
-    __daynumber = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'daynumber'), 'daynumber', '__kolab_org_MonthlyRecurrence_kolab_orgdaynumber', False)
-
+    # Element rangetype ({http://kolab.org}rangetype) inherited from {http://kolab.org}Recurrence
     
-    daynumber = property(__daynumber.value, __daynumber.set, None, None)
+    # Element exclusion ({http://kolab.org}exclusion) inherited from {http://kolab.org}Recurrence
+    
+    # Element interval ({http://kolab.org}interval) inherited from {http://kolab.org}Recurrence
+    
+    # Element {http://kolab.org}day uses Python identifier day
+    __day = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'day'), 'day', '__httpkolab_org_MonthlyRecurrence_httpkolab_orgday', False)
 
     
-    # Element interval ({kolab.org}interval) inherited from {kolab.org}Recurrence
+    day = property(__day.value, __day.set, None, None)
+
     
     # Attribute type uses Python identifier type
-    __type = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'type'), 'type', '__kolab_org_MonthlyRecurrence_type', pyxb.binding.datatypes.string, required=True)
+    __type = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'type'), 'type', '__httpkolab_org_MonthlyRecurrence_type', pyxb.binding.datatypes.string, required=True)
     
     type = property(__type.value, __type.set, None, None)
 
     
     # Attribute cycle uses Python identifier cycle
-    __cycle = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'cycle'), 'cycle', '__kolab_org_MonthlyRecurrence_cycle', pyxb.binding.datatypes.string, fixed=True, unicode_default=u'monthly', required=True)
+    __cycle = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'cycle'), 'cycle', '__httpkolab_org_MonthlyRecurrence_cycle', pyxb.binding.datatypes.string, fixed=True, unicode_default=u'monthly', required=True)
     
     cycle = property(__cycle.value, __cycle.set, None, None)
 
 
     _ElementMap = Recurrence._ElementMap.copy()
     _ElementMap.update({
-        __day.name() : __day,
-        __daynumber.name() : __daynumber
+        __daynumber.name() : __daynumber,
+        __day.name() : __day
     })
     _AttributeMap = Recurrence._AttributeMap.copy()
     _AttributeMap.update({
@@ -1173,168 +1248,93 @@ class MonthlyRecurrence (Recurrence):
 Namespace.addCategoryObject('typeBinding', u'MonthlyRecurrence', MonthlyRecurrence)
 
 
-# Complex type WeeklyRecurrence with content type ELEMENT_ONLY
-class WeeklyRecurrence (Recurrence):
+# Complex type CTD_ANON_2 with content type ELEMENT_ONLY
+class CTD_ANON_2 (pyxb.binding.basis.complexTypeDefinition):
     _TypeDefinition = None
     _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
     _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'WeeklyRecurrence')
-    # Base type is Recurrence
-    
-    # Element exclusion ({kolab.org}exclusion) inherited from {kolab.org}Recurrence
-    
-    # Element interval ({kolab.org}interval) inherited from {kolab.org}Recurrence
-    
-    # Element rangetype ({kolab.org}rangetype) inherited from {kolab.org}Recurrence
+    _ExpandedName = None
+    # Base type is pyxb.binding.datatypes.anyType
     
     # Attribute cycle uses Python identifier cycle
-    __cycle = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'cycle'), 'cycle', '__kolab_org_WeeklyRecurrence_cycle', pyxb.binding.datatypes.string, fixed=True, unicode_default=u'weekly', required=True)
+    __cycle = pyxb.binding.content.AttributeUse(pyxb.namespace.ExpandedName(None, u'cycle'), 'cycle', '__httpkolab_org_CTD_ANON_2_cycle', pyxb.binding.datatypes.string)
     
     cycle = property(__cycle.value, __cycle.set, None, None)
 
+    _HasWildcardElement = True
 
-    _ElementMap = Recurrence._ElementMap.copy()
-    _ElementMap.update({
+    _ElementMap = {
         
-    })
-    _AttributeMap = Recurrence._AttributeMap.copy()
-    _AttributeMap.update({
+    }
+    _AttributeMap = {
         __cycle.name() : __cycle
-    })
-Namespace.addCategoryObject('typeBinding', u'WeeklyRecurrence', WeeklyRecurrence)
+    }
 
 
-# Complex type Task with content type ELEMENT_ONLY
-class Task (Incidence):
+
+# Complex type PhoneNumber with content type ELEMENT_ONLY
+class PhoneNumber (pyxb.binding.basis.complexTypeDefinition):
     _TypeDefinition = None
     _ContentTypeTag = pyxb.binding.basis.complexTypeDefinition._CT_ELEMENT_ONLY
     _Abstract = False
-    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'Task')
-    # Base type is Incidence
-    
-    # Element organizer ({kolab.org}organizer) inherited from {kolab.org}Incidence
-    
-    # Element alarm ({kolab.org}alarm) inherited from {kolab.org}Incidence
-    
-    # Element recurrence ({kolab.org}recurrence) inherited from {kolab.org}Incidence
-    
-    # Element location ({kolab.org}location) inherited from {kolab.org}Incidence
-    
-    # Element {kolab.org}start-date uses Python identifier start_date
-    __start_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'start-date'), 'start_date', '__kolab_org_Task_kolab_orgstart_date', False)
-
-    
-    start_date = property(__start_date.value, __start_date.set, None, None)
-
-    
-    # Element uid ({kolab.org}uid) inherited from {kolab.org}XMLBase
-    
-    # Element attendee ({kolab.org}attendee) inherited from {kolab.org}Incidence
-    
-    # Element body ({kolab.org}body) inherited from {kolab.org}XMLBase
-    
-    # Element {kolab.org}due-date uses Python identifier due_date
-    __due_date = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'due-date'), 'due_date', '__kolab_org_Task_kolab_orgdue_date', False)
-
-    
-    due_date = property(__due_date.value, __due_date.set, None, None)
-
-    
-    # Element categories ({kolab.org}categories) inherited from {kolab.org}XMLBase
-    
-    # Element {kolab.org}parent uses Python identifier parent
-    __parent = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'parent'), 'parent', '__kolab_org_Task_kolab_orgparent', False)
-
-    
-    parent = property(__parent.value, __parent.set, None, None)
-
-    
-    # Element creation_date ({kolab.org}creation-date) inherited from {kolab.org}XMLBase
-    
-    # Element last_modification_date ({kolab.org}last-modification-date) inherited from {kolab.org}XMLBase
-    
-    # Element sensitivity ({kolab.org}sensitivity) inherited from {kolab.org}XMLBase
-    
-    # Element {kolab.org}priority uses Python identifier priority
-    __priority = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'priority'), 'priority', '__kolab_org_Task_kolab_orgpriority', False)
-
-    
-    priority = property(__priority.value, __priority.set, None, None)
-
-    
-    # Element summary ({kolab.org}summary) inherited from {kolab.org}Incidence
-    
-    # Element inline_attachment ({kolab.org}inline-attachment) inherited from {kolab.org}XMLBase
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'PhoneNumber')
+    # Base type is pyxb.binding.datatypes.anyType
     
-    # Element {kolab.org}completed uses Python identifier completed
-    __completed = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'completed'), 'completed', '__kolab_org_Task_kolab_orgcompleted', False)
+    # Element {http://kolab.org}number uses Python identifier number
+    __number = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'number'), 'number', '__httpkolab_org_PhoneNumber_httpkolab_orgnumber', False)
 
     
-    completed = property(__completed.value, __completed.set, None, None)
+    number = property(__number.value, __number.set, None, None)
 
     
-    # Element link_attachment ({kolab.org}link-attachment) inherited from {kolab.org}XMLBase
-    
-    # Element {kolab.org}status uses Python identifier status
-    __status = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'status'), 'status', '__kolab_org_Task_kolab_orgstatus', False)
+    # Element {http://kolab.org}type uses Python identifier type
+    __type = pyxb.binding.content.ElementUse(pyxb.namespace.ExpandedName(Namespace, u'type'), 'type', '__httpkolab_org_PhoneNumber_httpkolab_orgtype', False)
 
     
-    status = property(__status.value, __status.set, None, None)
+    type = property(__type.value, __type.set, None, None)
 
-    
-    # Element creator ({kolab.org}creator) inherited from {kolab.org}Incidence
-    
-    # Element product_id ({kolab.org}product-id) inherited from {kolab.org}XMLBase
-    
-    # Attribute version inherited from {kolab.org}XMLBase
 
-    _ElementMap = Incidence._ElementMap.copy()
-    _ElementMap.update({
-        __start_date.name() : __start_date,
-        __due_date.name() : __due_date,
-        __parent.name() : __parent,
-        __priority.name() : __priority,
-        __completed.name() : __completed,
-        __status.name() : __status
-    })
-    _AttributeMap = Incidence._AttributeMap.copy()
-    _AttributeMap.update({
+    _ElementMap = {
+        __number.name() : __number,
+        __type.name() : __type
+    }
+    _AttributeMap = {
         
-    })
-Namespace.addCategoryObject('typeBinding', u'Task', Task)
+    }
+Namespace.addCategoryObject('typeBinding', u'PhoneNumber', PhoneNumber)
 
 
-contact = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'contact'), Contact)
-Namespace.addCategoryObject('elementBinding', contact.name().localName(), contact)
+task = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'task'), Task)
+Namespace.addCategoryObject('elementBinding', task.name().localName(), task)
 
 event = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'event'), Event)
 Namespace.addCategoryObject('elementBinding', event.name().localName(), event)
 
+contact = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'contact'), Contact)
+Namespace.addCategoryObject('elementBinding', contact.name().localName(), contact)
+
 note = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'note'), Note)
 Namespace.addCategoryObject('elementBinding', note.name().localName(), note)
 
-task = pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'task'), Task)
-Namespace.addCategoryObject('elementBinding', task.name().localName(), task)
 
 
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'link-attachment'), pyxb.binding.datatypes.string, scope=XMLBase))
 
-XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date'), pyxb.binding.datatypes.dateTime, scope=XMLBase))
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'product-id'), pyxb.binding.datatypes.string, scope=XMLBase))
 
 XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'body'), pyxb.binding.datatypes.string, scope=XMLBase))
 
-XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'categories'), Category, scope=XMLBase))
-
-XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment'), pyxb.binding.datatypes.string, scope=XMLBase))
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'sensitivity'), Sensitivity, scope=XMLBase))
 
-XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'creation-date'), pyxb.binding.datatypes.dateTime, scope=XMLBase))
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date'), pyxb.binding.datatypes.dateTime, scope=XMLBase))
 
-XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'link-attachment'), pyxb.binding.datatypes.string, scope=XMLBase))
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment'), pyxb.binding.datatypes.string, scope=XMLBase))
 
 XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'uid'), UID, scope=XMLBase))
 
-XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'product-id'), pyxb.binding.datatypes.string, scope=XMLBase))
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'creation-date'), pyxb.binding.datatypes.dateTime, scope=XMLBase))
 
-XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'sensitivity'), Sensitivity, scope=XMLBase))
+XMLBase._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'categories'), Category, scope=XMLBase))
 XMLBase._GroupModel = pyxb.binding.content.GroupSequence(
     pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(XMLBase._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=1, max_occurs=1),
@@ -1350,106 +1350,163 @@ XMLBase._ContentModel = pyxb.binding.content.ParticleModel(XMLBase._GroupModel,
 
 
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'phone'), PhoneNumber, scope=Contact))
+Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'attendee'), CTD_ANON, scope=Incidence))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'email'), SMTPContact, scope=Contact))
-
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'address'), Address, scope=Contact))
+Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'location'), pyxb.binding.datatypes.string, scope=Incidence))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'preferred-address'), pyxb.binding.datatypes.string, scope=Contact))
+Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'alarm'), pyxb.binding.datatypes.string, scope=Incidence))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'office-location'), pyxb.binding.datatypes.string, scope=Contact))
+Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'creator'), SMTPContact, scope=Incidence))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'latitude'), pyxb.binding.datatypes.float, scope=Contact))
+Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'organizer'), SMTPContact, scope=Incidence))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'job-title'), pyxb.binding.datatypes.string, scope=Contact))
+Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'recurrence'), CTD_ANON_2, scope=Incidence))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'manager-name'), pyxb.binding.datatypes.string, scope=Contact))
+Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'summary'), pyxb.binding.datatypes.string, scope=Incidence))
+Incidence._GroupModel_ = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creation-date')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'sensitivity')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1)
+    )
+Incidence._GroupModel_2 = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'summary')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'location')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creator')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'organizer')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'alarm')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'recurrence')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'attendee')), min_occurs=1, max_occurs=1)
+    )
+Incidence._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Incidence._GroupModel_, min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Incidence._GroupModel_2, min_occurs=1, max_occurs=1)
+    )
+Incidence._ContentModel = pyxb.binding.content.ParticleModel(Incidence._GroupModel, min_occurs=1, max_occurs=1)
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'im-address'), pyxb.binding.datatypes.string, scope=Contact))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'assistant'), pyxb.binding.datatypes.string, scope=Contact))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'nick-name'), pyxb.binding.datatypes.string, scope=Contact))
+Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'completed'), pyxb.binding.datatypes.int, scope=Task))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'profession'), pyxb.binding.datatypes.string, scope=Contact))
+Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'status'), pyxb.binding.datatypes.string, scope=Task))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'spouse-name'), pyxb.binding.datatypes.string, scope=Contact))
+Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'due-date'), pyxb.binding.datatypes.dateTime, scope=Task))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'birthday'), pyxb.binding.datatypes.string, scope=Contact))
+Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'start-date'), pyxb.binding.datatypes.dateTime, scope=Task))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'anniversary'), pyxb.binding.datatypes.string, scope=Contact))
+Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'parent'), pyxb.binding.datatypes.string, scope=Task))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'name'), Name, scope=Contact))
+Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'priority'), pyxb.binding.datatypes.int, scope=Task))
+Task._GroupModel_2 = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creation-date')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'sensitivity')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1)
+    )
+Task._GroupModel_3 = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'summary')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'location')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creator')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'organizer')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'alarm')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'recurrence')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'attendee')), min_occurs=1, max_occurs=1)
+    )
+Task._GroupModel_ = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Task._GroupModel_2, min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._GroupModel_3, min_occurs=1, max_occurs=1)
+    )
+Task._GroupModel_4 = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'priority')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'completed')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'status')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'start-date')), min_occurs=0L, max_occurs=1L),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'due-date')), min_occurs=0L, max_occurs=1L),
+    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'parent')), min_occurs=1, max_occurs=1)
+    )
+Task._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Task._GroupModel_, min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Task._GroupModel_4, min_occurs=1, max_occurs=1)
+    )
+Task._ContentModel = pyxb.binding.content.ParticleModel(Task._GroupModel, min_occurs=1, max_occurs=1)
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'picture'), pyxb.binding.datatypes.string, scope=Contact))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'department'), pyxb.binding.datatypes.string, scope=Contact))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'children'), pyxb.binding.datatypes.string, scope=Contact))
+Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'last-name'), pyxb.binding.datatypes.string, scope=Name))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'free-busy-url'), pyxb.binding.datatypes.string, scope=Contact))
+Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'initials'), pyxb.binding.datatypes.string, scope=Name))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'gender'), pyxb.binding.datatypes.string, scope=Contact))
+Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'full-name'), pyxb.binding.datatypes.string, scope=Name))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'organization'), pyxb.binding.datatypes.string, scope=Contact))
+Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'given-name'), pyxb.binding.datatypes.string, scope=Name))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'longitude'), pyxb.binding.datatypes.float, scope=Contact))
+Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'prefix'), pyxb.binding.datatypes.string, scope=Name))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'language'), pyxb.binding.datatypes.string, scope=Contact))
+Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'middle-names'), pyxb.binding.datatypes.string, scope=Name))
 
-Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'web-page'), pyxb.binding.datatypes.string, scope=Contact))
-Contact._GroupModel_ = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creation-date')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'sensitivity')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1)
-    )
-Contact._GroupModel_2 = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'name')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'free-busy-url')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'organization')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'web-page')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'im-address')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'department')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'office-location')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'profession')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'job-title')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'manager-name')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'assistant')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'nick-name')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'spouse-name')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'birthday')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'anniversary')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'picture')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'children')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'gender')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'language')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'phone')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'email')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'address')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'preferred-address')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'latitude')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'longitude')), min_occurs=1, max_occurs=1)
+Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'suffix'), pyxb.binding.datatypes.string, scope=Name))
+Name._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'given-name')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'middle-names')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-name')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'full-name')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'initials')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'prefix')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'suffix')), min_occurs=1, max_occurs=1)
     )
-Contact._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Contact._GroupModel_, min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Contact._GroupModel_2, min_occurs=1, max_occurs=1)
+Name._ContentModel = pyxb.binding.content.ParticleModel(Name._GroupModel, min_occurs=1, max_occurs=1)
+
+
+
+SMTPContact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'smtp-address'), pyxb.binding.datatypes.string, scope=SMTPContact))
+
+SMTPContact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'display-name'), pyxb.binding.datatypes.string, scope=SMTPContact))
+SMTPContact._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(SMTPContact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'display-name')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(SMTPContact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'smtp-address')), min_occurs=1, max_occurs=1)
     )
-Contact._ContentModel = pyxb.binding.content.ParticleModel(Contact._GroupModel, min_occurs=1, max_occurs=1)
+SMTPContact._ContentModel = pyxb.binding.content.ParticleModel(SMTPContact._GroupModel, min_occurs=1, max_occurs=1)
 
 
 
-Recurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'exclusion'), pyxb.binding.datatypes.string, scope=Recurrence))
+Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'locality'), pyxb.binding.datatypes.string, scope=Address))
+
+Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'region'), pyxb.binding.datatypes.string, scope=Address))
+
+Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'type'), pyxb.binding.datatypes.string, scope=Address))
+
+Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'postal-code'), pyxb.binding.datatypes.string, scope=Address))
+
+Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'street'), pyxb.binding.datatypes.string, scope=Address))
+
+Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'country'), pyxb.binding.datatypes.string, scope=Address))
+Address._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'type')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'street')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'locality')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'region')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'postal-code')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'country')), min_occurs=1, max_occurs=1)
+    )
+Address._ContentModel = pyxb.binding.content.ParticleModel(Address._GroupModel, min_occurs=1, max_occurs=1)
+
+
 
 Recurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'interval'), pyxb.binding.datatypes.string, scope=Recurrence))
 
-Recurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'rangetype'), CTD_ANON_2, scope=Recurrence))
+Recurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'exclusion'), pyxb.binding.datatypes.string, scope=Recurrence))
+
+Recurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'rangetype'), CTD_ANON_, scope=Recurrence))
 Recurrence._GroupModel = pyxb.binding.content.GroupSequence(
     pyxb.binding.content.ParticleModel(Recurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(Recurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'rangetype')), min_occurs=1, max_occurs=1),
@@ -1461,9 +1518,9 @@ Recurrence._ContentModel = pyxb.binding.content.ParticleModel(Recurrence._GroupM
 
 YearlyRecurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'daynumber'), pyxb.binding.datatypes.string, scope=YearlyRecurrence))
 
-YearlyRecurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'month'), pyxb.binding.datatypes.string, scope=YearlyRecurrence))
-
 YearlyRecurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'day'), pyxb.binding.datatypes.string, scope=YearlyRecurrence))
+
+YearlyRecurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'month'), pyxb.binding.datatypes.string, scope=YearlyRecurrence))
 YearlyRecurrence._GroupModel_ = pyxb.binding.content.GroupSequence(
     pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(YearlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'rangetype')), min_occurs=1, max_occurs=1),
@@ -1483,54 +1540,13 @@ YearlyRecurrence._ContentModel = pyxb.binding.content.ParticleModel(YearlyRecurr
 
 
 
-Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'recurrence'), CTD_ANON, scope=Incidence))
-
-Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'organizer'), SMTPContact, scope=Incidence))
-
-Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'summary'), pyxb.binding.datatypes.string, scope=Incidence))
-
-Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'alarm'), pyxb.binding.datatypes.string, scope=Incidence))
-
-Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'location'), pyxb.binding.datatypes.string, scope=Incidence))
-
-Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'attendee'), CTD_ANON_, scope=Incidence))
-
-Incidence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'creator'), SMTPContact, scope=Incidence))
-Incidence._GroupModel_ = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creation-date')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'sensitivity')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1)
-    )
-Incidence._GroupModel_2 = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'summary')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'location')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creator')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'organizer')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'alarm')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'recurrence')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'attendee')), min_occurs=1, max_occurs=1)
-    )
-Incidence._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Incidence._GroupModel_, min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Incidence._GroupModel_2, min_occurs=1, max_occurs=1)
-    )
-Incidence._ContentModel = pyxb.binding.content.ParticleModel(Incidence._GroupModel, min_occurs=1, max_occurs=1)
-
-
+Event._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'start-date'), pyxb.binding.datatypes.dateTime, scope=Event))
 
 Event._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'end-date'), pyxb.binding.datatypes.dateTime, scope=Event))
 
-Event._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'start-date'), pyxb.binding.datatypes.dateTime, scope=Event))
+Event._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'show-time-as'), pyxb.binding.datatypes.string, scope=Event))
 
 Event._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'color-label'), pyxb.binding.datatypes.string, scope=Event))
-
-Event._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'show-time-as'), pyxb.binding.datatypes.string, scope=Event))
 Event._GroupModel_2 = pyxb.binding.content.GroupSequence(
     pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(Event._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=1, max_occurs=1),
@@ -1569,76 +1585,128 @@ Event._ContentModel = pyxb.binding.content.ParticleModel(Event._GroupModel, min_
 
 
 
-Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'prefix'), pyxb.binding.datatypes.string, scope=Name))
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'manager-name'), pyxb.binding.datatypes.string, scope=Contact))
 
-Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'suffix'), pyxb.binding.datatypes.string, scope=Name))
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'assistant'), pyxb.binding.datatypes.string, scope=Contact))
 
-Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'last-name'), pyxb.binding.datatypes.string, scope=Name))
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'anniversary'), pyxb.binding.datatypes.string, scope=Contact))
 
-Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'initials'), pyxb.binding.datatypes.string, scope=Name))
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'nick-name'), pyxb.binding.datatypes.string, scope=Contact))
 
-Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'full-name'), pyxb.binding.datatypes.string, scope=Name))
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'gender'), pyxb.binding.datatypes.string, scope=Contact))
 
-Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'given-name'), pyxb.binding.datatypes.string, scope=Name))
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'birthday'), pyxb.binding.datatypes.string, scope=Contact))
 
-Name._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'middle-names'), pyxb.binding.datatypes.string, scope=Name))
-Name._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'given-name')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'middle-names')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-name')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'full-name')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'initials')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'prefix')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Name._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'suffix')), min_occurs=1, max_occurs=1)
-    )
-Name._ContentModel = pyxb.binding.content.ParticleModel(Name._GroupModel, min_occurs=1, max_occurs=1)
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'spouse-name'), pyxb.binding.datatypes.string, scope=Contact))
 
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'picture'), pyxb.binding.datatypes.string, scope=Contact))
 
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'name'), Name, scope=Contact))
 
-SMTPContact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'smtp-address'), pyxb.binding.datatypes.string, scope=SMTPContact))
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'free-busy-url'), pyxb.binding.datatypes.string, scope=Contact))
 
-SMTPContact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'display-name'), pyxb.binding.datatypes.string, scope=SMTPContact))
-SMTPContact._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(SMTPContact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'display-name')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(SMTPContact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'smtp-address')), min_occurs=1, max_occurs=1)
-    )
-SMTPContact._ContentModel = pyxb.binding.content.ParticleModel(SMTPContact._GroupModel, min_occurs=1, max_occurs=1)
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'organization'), pyxb.binding.datatypes.string, scope=Contact))
 
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'language'), pyxb.binding.datatypes.string, scope=Contact))
 
-CTD_ANON._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(pyxb.binding.content.Wildcard(process_contents=pyxb.binding.content.Wildcard.PC_skip, namespace_constraint=pyxb.binding.content.Wildcard.NC_any), min_occurs=0L, max_occurs=None)
-    )
-CTD_ANON._ContentModel = pyxb.binding.content.ParticleModel(CTD_ANON._GroupModel, min_occurs=1, max_occurs=1)
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'web-page'), pyxb.binding.datatypes.string, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'phone'), PhoneNumber, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'job-title'), pyxb.binding.datatypes.string, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'im-address'), pyxb.binding.datatypes.string, scope=Contact))
 
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'email'), SMTPContact, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'department'), pyxb.binding.datatypes.string, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'address'), Address, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'office-location'), pyxb.binding.datatypes.string, scope=Contact))
+
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'preferred-address'), pyxb.binding.datatypes.string, scope=Contact))
 
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'children'), pyxb.binding.datatypes.string, scope=Contact))
 
-CTD_ANON_._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'request-response'), pyxb.binding.datatypes.string, scope=CTD_ANON_))
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'profession'), pyxb.binding.datatypes.string, scope=Contact))
 
-CTD_ANON_._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'status'), pyxb.binding.datatypes.string, scope=CTD_ANON_))
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'latitude'), pyxb.binding.datatypes.float, scope=Contact))
 
-CTD_ANON_._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'role'), pyxb.binding.datatypes.string, scope=CTD_ANON_))
-CTD_ANON_._GroupModel_ = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(CTD_ANON_._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'display-name')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(CTD_ANON_._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'smtp-address')), min_occurs=1, max_occurs=1)
+Contact._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'longitude'), pyxb.binding.datatypes.float, scope=Contact))
+Contact._GroupModel_ = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creation-date')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'sensitivity')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1)
     )
-CTD_ANON_._GroupModel_2 = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(CTD_ANON_._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'status')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(CTD_ANON_._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'request-response')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(CTD_ANON_._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'role')), min_occurs=1, max_occurs=1)
+Contact._GroupModel_2 = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'name')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'free-busy-url')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'organization')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'web-page')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'im-address')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'department')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'office-location')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'profession')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'job-title')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'manager-name')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'assistant')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'nick-name')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'spouse-name')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'birthday')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'anniversary')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'picture')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'children')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'gender')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'language')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'phone')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'email')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'address')), min_occurs=0L, max_occurs=None),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'preferred-address')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'latitude')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'longitude')), min_occurs=0L, max_occurs=1)
     )
-CTD_ANON_._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(CTD_ANON_._GroupModel_, min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(CTD_ANON_._GroupModel_2, min_occurs=1, max_occurs=1)
+Contact._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(Contact._GroupModel_, min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(Contact._GroupModel_2, min_occurs=1, max_occurs=1)
     )
-CTD_ANON_._ContentModel = pyxb.binding.content.ParticleModel(CTD_ANON_._GroupModel, min_occurs=1, max_occurs=1)
+Contact._ContentModel = pyxb.binding.content.ParticleModel(Contact._GroupModel, min_occurs=1, max_occurs=1)
 
 
 
-Note._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'background-color'), Color, scope=Note))
+CTD_ANON._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'role'), pyxb.binding.datatypes.string, scope=CTD_ANON))
+
+CTD_ANON._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'status'), pyxb.binding.datatypes.string, scope=CTD_ANON))
+
+CTD_ANON._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'request-response'), pyxb.binding.datatypes.string, scope=CTD_ANON))
+CTD_ANON._GroupModel_ = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(CTD_ANON._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'display-name')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(CTD_ANON._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'smtp-address')), min_occurs=1, max_occurs=1)
+    )
+CTD_ANON._GroupModel_2 = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(CTD_ANON._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'status')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(CTD_ANON._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'request-response')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(CTD_ANON._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'role')), min_occurs=1, max_occurs=1)
+    )
+CTD_ANON._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(CTD_ANON._GroupModel_, min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(CTD_ANON._GroupModel_2, min_occurs=1, max_occurs=1)
+    )
+CTD_ANON._ContentModel = pyxb.binding.content.ParticleModel(CTD_ANON._GroupModel, min_occurs=1, max_occurs=1)
+
+
 
 Note._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'foreground-color'), Color, scope=Note))
 
 Note._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'summary'), pyxb.binding.datatypes.string, scope=Note))
+
+Note._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'background-color'), Color, scope=Note))
 Note._GroupModel_ = pyxb.binding.content.GroupSequence(
     pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(Note._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=1, max_occurs=1),
@@ -1662,40 +1730,6 @@ Note._GroupModel = pyxb.binding.content.GroupSequence(
 Note._ContentModel = pyxb.binding.content.ParticleModel(Note._GroupModel, min_occurs=1, max_occurs=1)
 
 
-
-PhoneNumber._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'number'), pyxb.binding.datatypes.string, scope=PhoneNumber))
-
-PhoneNumber._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'type'), pyxb.binding.datatypes.string, scope=PhoneNumber))
-PhoneNumber._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(PhoneNumber._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'type')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(PhoneNumber._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'number')), min_occurs=1, max_occurs=1)
-    )
-PhoneNumber._ContentModel = pyxb.binding.content.ParticleModel(PhoneNumber._GroupModel, min_occurs=1, max_occurs=1)
-
-
-
-Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'type'), pyxb.binding.datatypes.string, scope=Address))
-
-Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'postal-code'), pyxb.binding.datatypes.string, scope=Address))
-
-Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'street'), pyxb.binding.datatypes.string, scope=Address))
-
-Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'locality'), pyxb.binding.datatypes.string, scope=Address))
-
-Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'country'), pyxb.binding.datatypes.string, scope=Address))
-
-Address._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'region'), pyxb.binding.datatypes.string, scope=Address))
-Address._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'type')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'street')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'locality')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'region')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'postal-code')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Address._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'country')), min_occurs=1, max_occurs=1)
-    )
-Address._ContentModel = pyxb.binding.content.ParticleModel(Address._GroupModel, min_occurs=1, max_occurs=1)
-
-
 DailyRecurrence._GroupModel = pyxb.binding.content.GroupSequence(
     pyxb.binding.content.ParticleModel(DailyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(DailyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'rangetype')), min_occurs=1, max_occurs=1),
@@ -1704,10 +1738,18 @@ DailyRecurrence._GroupModel = pyxb.binding.content.GroupSequence(
 DailyRecurrence._ContentModel = pyxb.binding.content.ParticleModel(DailyRecurrence._GroupModel, min_occurs=1, max_occurs=1)
 
 
+WeeklyRecurrence._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(WeeklyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(WeeklyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'rangetype')), min_occurs=1, max_occurs=1),
+    pyxb.binding.content.ParticleModel(WeeklyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'exclusion')), min_occurs=0L, max_occurs=None)
+    )
+WeeklyRecurrence._ContentModel = pyxb.binding.content.ParticleModel(WeeklyRecurrence._GroupModel, min_occurs=1, max_occurs=1)
+
 
-MonthlyRecurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'day'), pyxb.binding.datatypes.string, scope=MonthlyRecurrence))
 
 MonthlyRecurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'daynumber'), pyxb.binding.datatypes.string, scope=MonthlyRecurrence))
+
+MonthlyRecurrence._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'day'), pyxb.binding.datatypes.string, scope=MonthlyRecurrence))
 MonthlyRecurrence._GroupModel_ = pyxb.binding.content.GroupSequence(
     pyxb.binding.content.ParticleModel(MonthlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
     pyxb.binding.content.ParticleModel(MonthlyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'rangetype')), min_occurs=1, max_occurs=1),
@@ -1725,60 +1767,18 @@ MonthlyRecurrence._GroupModel = pyxb.binding.content.GroupSequence(
 MonthlyRecurrence._ContentModel = pyxb.binding.content.ParticleModel(MonthlyRecurrence._GroupModel, min_occurs=1, max_occurs=1)
 
 
-WeeklyRecurrence._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(WeeklyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'interval')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(WeeklyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'rangetype')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(WeeklyRecurrence._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'exclusion')), min_occurs=0L, max_occurs=None)
+CTD_ANON_2._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(pyxb.binding.content.Wildcard(process_contents=pyxb.binding.content.Wildcard.PC_skip, namespace_constraint=pyxb.binding.content.Wildcard.NC_any), min_occurs=0L, max_occurs=None)
     )
-WeeklyRecurrence._ContentModel = pyxb.binding.content.ParticleModel(WeeklyRecurrence._GroupModel, min_occurs=1, max_occurs=1)
-
-
-
-Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'start-date'), pyxb.binding.datatypes.dateTime, scope=Task))
-
-Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'due-date'), pyxb.binding.datatypes.dateTime, scope=Task))
+CTD_ANON_2._ContentModel = pyxb.binding.content.ParticleModel(CTD_ANON_2._GroupModel, min_occurs=1, max_occurs=1)
 
-Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'parent'), pyxb.binding.datatypes.string, scope=Task))
 
-Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'priority'), pyxb.binding.datatypes.int, scope=Task))
 
-Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'completed'), pyxb.binding.datatypes.int, scope=Task))
+PhoneNumber._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'number'), pyxb.binding.datatypes.string, scope=PhoneNumber))
 
-Task._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'status'), pyxb.binding.datatypes.string, scope=Task))
-Task._GroupModel_2 = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'uid')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'body')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'categories')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creation-date')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'last-modification-date')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'sensitivity')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'inline-attachment')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'link-attachment')), min_occurs=0L, max_occurs=None),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'product-id')), min_occurs=1, max_occurs=1)
-    )
-Task._GroupModel_3 = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'summary')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'location')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'creator')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'organizer')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'alarm')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'recurrence')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'attendee')), min_occurs=1, max_occurs=1)
-    )
-Task._GroupModel_ = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Task._GroupModel_2, min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._GroupModel_3, min_occurs=1, max_occurs=1)
-    )
-Task._GroupModel_4 = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'priority')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'completed')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'status')), min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'start-date')), min_occurs=0L, max_occurs=1L),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'due-date')), min_occurs=0L, max_occurs=1L),
-    pyxb.binding.content.ParticleModel(Task._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'parent')), min_occurs=1, max_occurs=1)
-    )
-Task._GroupModel = pyxb.binding.content.GroupSequence(
-    pyxb.binding.content.ParticleModel(Task._GroupModel_, min_occurs=1, max_occurs=1),
-    pyxb.binding.content.ParticleModel(Task._GroupModel_4, min_occurs=1, max_occurs=1)
+PhoneNumber._AddElement(pyxb.binding.basis.element(pyxb.namespace.ExpandedName(Namespace, u'type'), pyxb.binding.datatypes.string, scope=PhoneNumber))
+PhoneNumber._GroupModel = pyxb.binding.content.GroupSequence(
+    pyxb.binding.content.ParticleModel(PhoneNumber._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'type')), min_occurs=0L, max_occurs=1),
+    pyxb.binding.content.ParticleModel(PhoneNumber._UseForTag(pyxb.namespace.ExpandedName(Namespace, u'number')), min_occurs=1, max_occurs=1)
     )
-Task._ContentModel = pyxb.binding.content.ParticleModel(Task._GroupModel, min_occurs=1, max_occurs=1)
+PhoneNumber._ContentModel = pyxb.binding.content.ParticleModel(PhoneNumber._GroupModel, min_occurs=1, max_occurs=1)


commit b5cd74cebdeabf5fdc193b16b60bd4a0bb7cea2b
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Sun Oct 23 17:29:03 2011 +0100

    A couple of changes are included in this commit:
    
      - Tags with no content can be closed immediately <br /> style.
      - Leave no complexType definitions unnamed, or they end up as
        anonymous types. These anonymous types would otherwise be
        generated in a fashion that would ultimately become exclusive
        to one particular set of generated bindings.
    
        This moves a set of complexType definitions to the global
        space, and names them.
    
      - Replace empty default attribute values with minOccurs="0".
      - Apply consistent ordering of defined attributes;
    
          (name, type[, minOccurs[, maxOccurs]][, default][, fixed])
    
      - At the very least the phone number seems to be required in
        PhoneNumber abstract complexType definition.
    
      - Reverse order of display_name and smtp_address name element
        definitions in the SMTPContact complexType definition, as
        these logically become positioned arguments, while
        display_name is not mandatory and smtp_address is.

diff --git a/schemas/base.xsd b/schemas/base.xsd
index b41cfe8..18b0a9f 100644
--- a/schemas/base.xsd
+++ b/schemas/base.xsd
@@ -6,38 +6,63 @@
 
     <xs:complexType name="XMLBase" abstract="true">
         <xs:sequence>
-            <xs:element name="uid" type="UID"/>
-            <xs:element name="body" type="xs:string" default=""/>
-            <xs:element name="categories" type="Category" default=""/>
-            <xs:element name="creation-date" type="xs:dateTime"/>
-            <xs:element name="last-modification-date" type="xs:dateTime"/>
-            <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"
-                name="link-attachment" type="xs:string"/>
-            <xs:element name="product-id" type="xs:string" default=""/>
+            <!--
+                Mandatory elements
+            //-->
+            <xs:element name="uid" type="UID" />
+            <xs:element name="product-id" type="xs:string" />
+            <xs:element name="creation-date" type="xs:dateTime" />
+            <xs:element name="last-modification-date" type="xs:dateTime" />
+
+            <!--
+                Elements that do not require to be set by a client application,
+                as a default is provided.
+            //-->
+            <xs:element name="sensitivity" type="Sensitivity" default="public" />
+
+            <!--
+                Optional elements
+            //-->
+            <xs:element name="body" type="xs:string" minOccurs="0" />
+            <xs:element name="categories" type="Category" minOccurs="0" />
+            <xs:element name="inline-attachment" type="xs:string" minOccurs="0" maxOccurs="unbounded" />
+            <xs:element name="link-attachment" type="xs:string" minOccurs="0" maxOccurs="unbounded" />
         </xs:sequence>
-        <xs:attribute name="version" type="xs:double" default="1.0"/>
+
+        <!--
+            Version of the XML and bindings generated with this XSD.
+
+            Note: Does not seem to pass through to generated XML from PyXB
+            bindings.
+        //-->
+        <xs:attribute name="version" type="xs:string" fixed="3.0dev1" />
+
     </xs:complexType>
 
-     <xs:simpleType name="UID">
+    <xs:simpleType name="UID">
+        <!--
+            Note^1 that a UID restriction that is too short increases the risk of
+            duplicate UIDs.
+
+            Note^2 that we may also want to restrict the contents of the UID to
+            allow only alphanumeric characters.
+        //-->
         <xs:restriction base="xs:string">
-            <xs:minLength value="1"/>
-            <xs:whiteSpace value="collapse"/>
+            <xs:minLength value="1" />
+            <xs:whiteSpace value="collapse" />
         </xs:restriction>
     </xs:simpleType>
 
     <xs:simpleType name="Category">
         <xs:restriction base="xs:string">
-            <xs:pattern value="(\w+(,\w+)+)?"/>
+            <xs:pattern value="(\w+(,\w+)+)?" />
         </xs:restriction>
     </xs:simpleType>
 
     <xs:simpleType name="Color">
         <xs:restriction base="xs:string">
-            <xs:length value="7"/>
-            <xs:pattern value="#([a-f;0-9]){6}"/>
+            <xs:length value="7" />
+            <xs:pattern value="#([a-f;0-9]){6}" />
         </xs:restriction>
     </xs:simpleType>
 
@@ -51,10 +76,17 @@
 
     <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:element name="smtp-address" type="xs:string" />
+            <xs:element name="display-name" type="xs:string" minOccurs="0" />
         </xs:sequence>
     </xs:complexType>
 
-    <xs:attribute name="version" type="xs:float"/>
+    <!--
+        Version of the XML and bindings generated with this XSD.
+
+        Note: Does not seem to pass through to generated XML from PyXB
+        bindings.
+    //-->
+    <xs:attribute name="version" type="xs:string" fixed="3.0dev1" />
+
 </xs:schema>
\ No newline at end of file
diff --git a/schemas/contact.xsd b/schemas/contact.xsd
index dcac506..1b7c8fe 100644
--- a/schemas/contact.xsd
+++ b/schemas/contact.xsd
@@ -12,40 +12,31 @@
         <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" minOccurs="0" />
+                    <xs:element name="free-busy-url" type="xs:string" minOccurs="0" />
+                    <xs:element name="organization" type="xs:string" minOccurs="0" />
+                    <xs:element name="web-page" type="xs:string" minOccurs="0" />
+                    <xs:element name="im-address" type="xs:string" minOccurs="0" />
+                    <xs:element name="department" type="xs:string" minOccurs="0" />
+                    <xs:element name="office-location" type="xs:string" minOccurs="0" />
+                    <xs:element name="profession" type="xs:string" minOccurs="0" />
+                    <xs:element name="job-title" type="xs:string" minOccurs="0" />
+                    <xs:element name="manager-name" type="xs:string" minOccurs="0" />
+                    <xs:element name="assistant" type="xs:string" minOccurs="0" />
+                    <xs:element name="nick-name" type="xs:string" minOccurs="0" />
+                    <xs:element name="spouse-name" type="xs:string" minOccurs="0" />
+                    <xs:element name="birthday" type="xs:string" minOccurs="0" />
+                    <xs:element name="anniversary" type="xs:string" minOccurs="0" />
+                    <xs:element name="picture" type="xs:string" minOccurs="0" />
+                    <xs:element name="children" type="xs:string" minOccurs="0" />
+                    <xs:element name="gender" type="xs:string" minOccurs="0" />
+                    <xs:element name="language" type="xs:string" minOccurs="0" />
+                    <xs:element name="phone" type="PhoneNumber" minOccurs="0" maxOccurs="unbounded" />
+                    <xs:element name="email" type="SMTPContact" minOccurs="0" maxOccurs="unbounded" />
+                    <xs:element name="address" type="Address" minOccurs="0" maxOccurs="unbounded" />
+                    <xs:element name="preferred-address" type="xs:string" minOccurs="0" />
+                    <xs:element name="latitude" type="xs:float" minOccurs="0" />
+                    <xs:element name="longitude" type="xs:float" minOccurs="0" />
                 </xs:sequence>
             </xs:extension>
         </xs:complexContent>
@@ -53,29 +44,39 @@
 
     <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:element name="given-name" type="xs:string" minOccurs="0" />
+            <xs:element name="middle-names" type="xs:string" minOccurs="0" />
+            <xs:element name="last-name" type="xs:string" minOccurs="0" />
+            <xs:element name="full-name" type="xs:string" minOccurs="0" />
+            <xs:element name="initials" type="xs:string" minOccurs="0" />
+            <xs:element name="prefix" type="xs:string" minOccurs="0" />
+            <xs:element name="suffix" type="xs:string" minOccurs="0" />
         </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:element name="type" type="xs:string" minOccurs="0" />
+            <xs:element name="number" type="xs:string" />
         </xs:sequence>
     </xs:complexType>
+
     <xs:complexType name="Address">
+        <!--
+            'type' is a reserved keyword... can we use 'label' instead, perhaps?
+
+            Note: I have not actually experienced any trouble with this yet.
+        //-->
         <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:element name="type" type="xs:string" default="home" />
+            <xs:element name="street" type="xs:string" minOccurs="0" />
+            <xs:element name="postal-code" type="xs:string" minOccurs="0" />
+            <!--
+                Is locality supposed to mean city?
+            //-->
+            <xs:element name="locality" type="xs:string" minOccurs="0" />
+            <xs:element name="region" type="xs:string" minOccurs="0" />
+            <xs:element name="country" type="xs:string" minOccurs="0" />
         </xs:sequence>
     </xs:complexType>
 </xs:schema>
\ No newline at end of file
diff --git a/schemas/incidence.xsd b/schemas/incidence.xsd
index 904f4ad..86436af 100644
--- a/schemas/incidence.xsd
+++ b/schemas/incidence.xsd
@@ -12,73 +12,53 @@
                 <xs:sequence>
                     <xs:element name="summary" type="xs:string" />
                     <xs:element name="location" type="xs:string" />
-                    <xs:element name="creator" type="SMTPContact">
+                    <xs:element name="creator" type="SMTPContact" />
+                    <xs:element name="organizer" type="SMTPContact" />
+                    <xs:element name="alarm" type="xs:string" />
+                    <xs:element name="recurrence" type="Recurrence" />
+                    <xs:element name="attendee" type="Attendee" />
+                </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:complexType name="Attendee" abstract="true">
+        <xs:complexContent>
+            <xs:extension base="SMTPContact">
+                <xs:sequence>
+                    <xs:element name="status" type="xs:string" />
+                    <xs:element name="request-response" type="xs:string" />
+                    <xs:element name="role" type="xs:string" />
                 </xs:sequence>
             </xs:extension>
         </xs:complexContent>
     </xs:complexType>
 
-    <xs:simpleType name="NewSimpleType">
+    <xs:simpleType name="Cycle">
         <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:enumeration value="daily" />
+            <xs:enumeration value="weekly" />
+            <xs:enumeration value="monthly" />
+            <xs:enumeration value="yearly" />
         </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:element name="interval" type="xs:string" />
+            <xs:element name="exclusion" type="xs:string" maxOccurs="unbounded" minOccurs="0" />
+            <xs:element name="rangetype" type="RecurrenceType" />
         </xs:sequence>
     </xs:complexType>
 
+    <xs:complexType name="RecurrenceType" abstract="true">
+        <xs:attribute name="type" type="xs:string" />
+    </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:attribute name="cycle" type="xs:string" fixed="daily" use="required" />
             </xs:extension>
         </xs:complexContent>
     </xs:complexType>
@@ -86,9 +66,7 @@
     <xs:complexType name="WeeklyRecurrence">
         <xs:complexContent>
             <xs:extension base="Recurrence">
-                <xs:attribute name="cycle" type="xs:string" fixed="weekly"
-                    use="required">
-                </xs:attribute>
+                <xs:attribute name="cycle" type="xs:string" fixed="weekly" use="required" />
             </xs:extension>
         </xs:complexContent>
     </xs:complexType>
@@ -104,11 +82,8 @@
                     <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:attribute name="cycle" type="xs:string" fixed="monthly" use="required" />
+                <xs:attribute name="type" type="xs:string" use="required" />
             </xs:extension>
         </xs:complexContent>
     </xs:complexType>
@@ -117,29 +92,18 @@
         <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:element name="interval" type="xs:string" />
+                    <xs:element name="day" type="xs:string" />
+                    <xs:element name="daynumber" type="xs:string" />
+                    <xs:element name="month" type="xs:string" />
                 </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 name="cycle" type="xs:string" fixed="yearly" use="required" />
+                <xs:attribute name="type" type="xs:string" use="required">
+                    <xs:restriction base="xs:string">
+                        <xs:enumeration value="monthday" />
+                        <xs:enumeration value="yearday" />
+                        <xs:enumeration value="weekday" />
+                    </xs:restriction>
                 </xs:attribute>
             </xs:extension>
         </xs:complexContent>


commit bfecbd1fa7e248ccb6feea5d254b408c52358bc7
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Sun Oct 23 15:52:28 2011 +0100

    Wrap generated raw classes

diff --git a/pykolab/format.py b/pykolab/format.py
index 1229081..459e803 100644
--- a/pykolab/format.py
+++ b/pykolab/format.py
@@ -1,5 +1,31 @@
 from pykolab.raw.format import *
 
+import pyxb.namespace
 import pyxb.utils.domutils
 
 pyxb.utils.domutils.BindingDOMSupport.SetDefaultNamespace(Namespace)
+
+__all__ = [
+        "Contact",
+        "Event",
+        "Incidence",
+        "Note",
+        "Task",
+
+        "SMTPContact"
+    ]
+
+# The following are class name overrides allowing the XML generated to use
+# lowercase tag names.
+class Contact(Contact):
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'contact')
+
+class Event(Event):
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'event')
+    pass
+
+class Note(Note):
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'note')
+
+class Task(Task):
+    _ExpandedName = pyxb.namespace.ExpandedName(Namespace, u'task')


commit 31c82ab54deb598bae19e974bac6d0967b29b995
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Sun Oct 23 12:42:40 2011 +0100

    No newline at the end of this file

diff --git a/pykolab/format.py b/pykolab/format.py
index 4e3d2ee..1229081 100644
--- a/pykolab/format.py
+++ b/pykolab/format.py
@@ -2,4 +2,4 @@ from pykolab.raw.format import *
 
 import pyxb.utils.domutils
 
-pyxb.utils.domutils.BindingDOMSupport.SetDefaultNamespace(Namespace)
\ No newline at end of file
+pyxb.utils.domutils.BindingDOMSupport.SetDefaultNamespace(Namespace)


commit 9ff90bc2ca3fd622ec6fa3a05b96b6029e99d5c1
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Sun Oct 23 12:42:07 2011 +0100

    Fix deleting the correct file when generating raw bindings with PyXB

diff --git a/Makefile.am b/Makefile.am
index 2634a9c..a48fcd1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,7 +33,7 @@ rpm: srpm
 	@rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz
 
 bindings:
-	@rm -rf pykolab/format.py*
+	@rm -rf pykolab/raw/format.py*
 	@pyxbgen --module-prefix=pykolab -u schemas/base.xsd -u schemas/contact.xsd -u schemas/event.xsd -u schemas/incidence.xsd schemas/note.xsd schemas/task.xsd -m format -r
 
 clean:


commit b097740ca06d6a880f7b5744622d9b9939e8141a
Merge: 8da5db1 c326eec
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Sun Oct 23 12:33:33 2011 +0100

    Merge branch 'master' into python/master



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