Index: releases/bedework-3.7/build/buildTools/buildjar.xml
===================================================================
--- releases/bedework-3.7/build/buildTools/buildjar.xml (revision 3107)
+++ releases/bedework-3.7/build/buildTools/buildjar.xml (revision 3115)
@@ -71,4 +71,20 @@
 
     <noisyMsg message="build.jar.file=${build.jar.file}" />
+    
+    <if>
+      <isset property="build.jar.dependency"/>
+      <then>
+        <dirname file="${build.jar.dependency}"
+                 property="dependency.dirname" />
+        <basename file="${build.jar.dependency}"
+                  property="dependency.basename" />
+        <fileset dir="${dependency.dirname}" id="dependency.fileset">
+          <include name="${dependency.basename}"/>
+        </fileset>
+      </then>
+      <else>
+        <fileset refid="empty.fileset" id="dependency.fileset"/>
+      </else>
+    </if>      
 
     <uptodate property="build.jar.uptodate"
@@ -77,4 +93,5 @@
       <srcfiles refid="buildjar.generated.java.sources" />
       <srcfiles refid="buildjar.resource.files"/>
+      <srcfiles refid="dependency.fileset"/>
     </uptodate>
 
Index: releases/bedework-3.7/build/buildTools/deftasks.xml
===================================================================
--- releases/bedework-3.7/build/buildTools/deftasks.xml (revision 3107)
+++ releases/bedework-3.7/build/buildTools/deftasks.xml (revision 3115)
@@ -61,5 +61,5 @@
 
       <property name="org.bedework.libcache.dir"
-                location="${project.home}/libcache"/>
+                location="${bedework.home}/libcache"/>
       
       <if>
@@ -90,4 +90,5 @@
     <attribute name="module-base"/>
     <attribute name="jar-file"/>
+    <attribute name="jar-dependency" default=""/>
     <attribute name="generated-sources" default=""/>
     <attribute name="property-resources" default=""/>
@@ -125,4 +126,13 @@
         <include name="**/*.class"/>
       </patternset>
+
+      <if>
+        <not>
+          <equals arg1="@{jar-dependency}" arg2="" />
+        </not>
+        <then>
+          <property name="build.jar.dependency" value="@{jar-dependency}" />
+        </then>
+      </if>
 
       <ant antfile="${buildjar}" inheritRefs="true" target="build" >
Index: releases/bedework-3.7/build/buildTools/wsimport.xml
===================================================================
--- releases/bedework-3.7/build/buildTools/wsimport.xml (revision 3107)
+++ releases/bedework-3.7/build/buildTools/wsimport.xml (revision 3115)
@@ -24,95 +24,128 @@
   <macrodef name="wsimport">
     <attribute name="wsdl"/>
-    <attribute name="sourcedestdir"/>
+    <attribute name="module-base"/>
+    <attribute name="jar-file"/>
     <attribute name="bindingsdir" default="" />
     <sequential>
       <taskdef resource="net/sf/antcontrib/antcontrib.properties" />
-  
-      <!--
-      <getJar name="jaxws-tools" version="2.2" /> 
-      <getJar name="jaxb-xjc" version="2.2" /> 
-      <getJar name="jaxws-rt" version="2.2" /> 
-      -->
-      <property name="wsimport.lib" 
-                location="${org.bedework.temp.dir}/wsimportlib" />
-      <delete dir="${wsimport.lib}" />
-      <mkdir dir="${wsimport.lib}" />
       
-      <getJar lib="${wsimport.lib}"
-              libcache="${org.bedework.libcache.dir}"
-              name="jaxws-tools" version="2.1.4" /> 
-      <getJar lib="${wsimport.lib}"
-              libcache="${org.bedework.libcache.dir}"
-              name="jaxb-xjc" version="2.1.7" /> 
-      <getJar lib="${wsimport.lib}"
-              libcache="${org.bedework.libcache.dir}"
-              name="jaxb-impl" version="2.1.8" /> 
-      <getJar lib="${wsimport.lib}"
-              libcache="${org.bedework.libcache.dir}"
-              name="jaxws-rt" version="2.1.4" /> 
-      <getJar lib="${wsimport.lib}"
-              libcache="${org.bedework.libcache.dir}"
-              name="streambuffer" version="1.0" /> 
-      <getJar lib="${wsimport.lib}"
-              libcache="${org.bedework.libcache.dir}"
-              name="stax-ex" version="2.2.1" /> 
-  
-      <path id="wsimport.classpath">
-        <fileset dir="${ant.home}/lib">
-          <include name="jax*.jar"/>
-        </fileset>
-        <!--
-        <pathelement location="${wsimport.lib}/jaxws-tools-2.2.jar"/>
-        <pathelement location="${wsimport.lib}/jaxb-xjc-2.2.jar"/>
-        <pathelement location="${wsimport.lib}/jaxws-rt-2.2.jar"/>
-        -->
-        <pathelement location="${wsimport.lib}/jaxws-tools-2.1.4.jar"/>
-        <pathelement location="${wsimport.lib}/jaxb-xjc-2.1.7.jar"/>
-        <pathelement location="${wsimport.lib}/jaxb-impl-2.1.8.jar"/>
-        <pathelement location="${wsimport.lib}/jaxws-rt-2.1.4.jar"/>
-        <pathelement location="${wsimport.lib}/tools-1.6.0_21.jar" />
-        <pathelement location="${wsimport.lib}/streambuffer-1.0.jar" />
-        <pathelement location="${wsimport.lib}/stax-ex-2.2.1.jar" />
-        <fileset dir="${ant.home}/lib">
-          <include name="**/*.jar"/>
-        </fileset>
-        <!--
-        <fileset dir="${org.bedework.appserver.dir}/lib/endorsed" >
-          <include name="**/*.jar"/>
-        </fileset>
-        -->
-      </path>
+      <property name="sourcedestdir" location="@{module-base}/src" />
+
       
-      <debugCpid idpar="wsimport.classpath" />
-  
-      <taskdef name="wsimport" classname="com.sun.tools.ws.ant.WsImport">
-        <classpath refid="wsimport.classpath" />
-      </taskdef>
-      
-      <!-- We don't want the generated classes but there doesn't appear to be a
-           way to suppress generation -->
-      <property name="wsimport.dest" 
-                location="${org.bedework.temp.dir}/wsclasses" />
-      <mkdir dir="${wsimport.dest}" />
+      <dirname property="org.bedework.wsdl.dir" file="@{wsdl}"/>
 
       <if>
-        <equals arg1="@{bindingsdir}" arg2="" />
+        <available file="${sourcedestdir}" type="dir" />
         <then>
-          <wsimport keep="true"
-                    sourcedestdir="@{sourcedestdir}"
-                    destdir="${wsimport.dest}"
-                    wsdl="@{wsdl}" 
-                    xendorsed="true" >
-          </wsimport>
+          <uptodate property="org.bedework.wsimport.uptodate"
+                    targetfile="@{jar-file}" >
+            <srcfiles dir="${org.bedework.wsdl.dir}" />
+          </uptodate>
+        </then>
+      </if>
+
+      <if>
+        <isset property="org.bedework.wsimport.uptodate"/>
+        <then>
+          <noisyMsg message="**** @{jar.file} is up to date" />
         </then>
         <else>
-          <wsimport keep="true"
-                    sourcedestdir="@{sourcedestdir}"
-                    destdir="${wsimport.dest}"
-                    wsdl="@{wsdl}" 
-                    xendorsed="true" >
-            <binding dir="@{bindingsdir}" includes="*.xml">
-            </binding>
-          </wsimport>
+          <noisyMsg message="**** @{jar.file} needs rebuilding" />
+
+          <delete dir="${sourcedestdir}" />
+          <mkdir dir="${sourcedestdir}" />
+      
+          <!--
+          <getJar name="jaxws-tools" version="2.2" /> 
+          <getJar name="jaxb-xjc" version="2.2" /> 
+          <getJar name="jaxws-rt" version="2.2" /> 
+          -->
+          <property name="wsimport.lib" 
+                    location="${org.bedework.temp.dir}/wsimportlib" />
+          <delete dir="${wsimport.lib}" />
+          <mkdir dir="${wsimport.lib}" />
+          
+          <getJar lib="${wsimport.lib}"
+                  libcache="${org.bedework.libcache.dir}"
+                  name="jaxws-tools" version="2.1.4" /> 
+          <getJar lib="${wsimport.lib}"
+                  libcache="${org.bedework.libcache.dir}"
+                  name="jaxb-xjc" version="2.1.7" /> 
+          <getJar lib="${wsimport.lib}"
+                  libcache="${org.bedework.libcache.dir}"
+                  name="jaxb-impl" version="2.1.8" /> 
+          <getJar lib="${wsimport.lib}"
+                  libcache="${org.bedework.libcache.dir}"
+                  name="jaxws-rt" version="2.1.4" /> 
+          <getJar lib="${wsimport.lib}"
+                  libcache="${org.bedework.libcache.dir}"
+                  name="streambuffer" version="1.0" /> 
+          <getJar lib="${wsimport.lib}"
+                  libcache="${org.bedework.libcache.dir}"
+                  name="stax-ex" version="2.2.1" /> 
+      
+          <path id="wsimport.classpath">
+            <fileset dir="${ant.home}/lib">
+              <include name="jax*.jar"/>
+            </fileset>
+            <!--
+            <pathelement location="${wsimport.lib}/jaxws-tools-2.2.jar"/>
+            <pathelement location="${wsimport.lib}/jaxb-xjc-2.2.jar"/>
+            <pathelement location="${wsimport.lib}/jaxws-rt-2.2.jar"/>
+            -->
+            <pathelement location="${wsimport.lib}/jaxws-tools-2.1.4.jar"/>
+            <pathelement location="${wsimport.lib}/jaxb-xjc-2.1.7.jar"/>
+            <pathelement location="${wsimport.lib}/jaxb-impl-2.1.8.jar"/>
+            <pathelement location="${wsimport.lib}/jaxws-rt-2.1.4.jar"/>
+            <pathelement location="${wsimport.lib}/tools-1.6.0_21.jar" />
+            <pathelement location="${wsimport.lib}/streambuffer-1.0.jar" />
+            <pathelement location="${wsimport.lib}/stax-ex-2.2.1.jar" />
+            <fileset dir="${ant.home}/lib">
+              <include name="**/*.jar"/>
+            </fileset>
+            <!--
+            <fileset dir="${org.bedework.appserver.dir}/lib/endorsed" >
+              <include name="**/*.jar"/>
+            </fileset>
+            -->
+          </path>
+          
+          <debugCpid idpar="wsimport.classpath" />
+      
+          <taskdef name="wsimport" classname="com.sun.tools.ws.ant.WsImport">
+            <classpath refid="wsimport.classpath" />
+          </taskdef>
+          
+          <!-- We don't want the generated classes but there doesn't appear to be a
+               way to suppress generation -->
+          <property name="wsimport.dest" 
+                    location="${org.bedework.temp.dir}/wsclasses" />
+          <mkdir dir="${wsimport.dest}" />
+    
+          <if>
+            <equals arg1="@{bindingsdir}" arg2="" />
+            <then>
+              <wsimport keep="true"
+                        sourcedestdir="${sourcedestdir}"
+                        destdir="${wsimport.dest}"
+                        wsdl="@{wsdl}" 
+                        xendorsed="true" >
+              </wsimport>
+            </then>
+            <else>
+              <wsimport keep="true"
+                        sourcedestdir="${sourcedestdir}"
+                        destdir="${wsimport.dest}"
+                        wsdl="@{wsdl}" 
+                        xendorsed="true" >
+                <binding dir="@{bindingsdir}" includes="*.xml">
+                </binding>
+              </wsimport>
+            </else>
+          </if>
+          
+
+          <build-jar module-base="@{module-base}" 
+                     jar-file="@{jar-file}" />
         </else>
       </if>
Index: releases/bedework-3.7/build/quickstart/windows/bw.bat
===================================================================
--- releases/bedework-3.7/build/quickstart/windows/bw.bat (revision 3099)
+++ releases/bedework-3.7/build/quickstart/windows/bw.bat (revision 3115)
@@ -28,4 +28,11 @@
 SET offline=
 SET quickstart=
+
+SET ant_listener=
+SET ant_xmllogfile=
+SET ant_logger=
+
+SET ant_loglevel="-quiet"
+SET bw_loglevel=""
 
 :: Projects we will build
@@ -72,4 +79,40 @@
   
 
+:: ----------------------- Log level       
+
+:log-silent
+  SET ant_loglevel="-quiet"
+  SET bw_loglevel="-Dorg.bedework.build.silent=true"
+  SHIFT
+  GOTO branch
+
+:log-quiet
+  SET ant_loglevel="-quiet"
+  SET bw_loglevel=""
+  SHIFT
+  GOTO branch
+
+:log-inform
+  SET ant_loglevel=""
+  SET bw_loglevel="-Dorg.bedework.build.inform=true"
+  SHIFT
+  GOTO branch
+
+:log-verbose
+  SET ant_loglevel="-verbose"
+  SET bw_loglevel="-Dorg.bedework.build.inform=true -Dorg.bedework.build.noisy=true"
+  SHIFT
+  GOTO branch
+
+:ant-debug
+  SET ant_loglevel="-debug"
+  SHIFT
+  GOTO branch
+
+:build-debug
+  SET bw_loglevel="-Dorg.bedework.build.inform=true -Dorg.bedework.build.noisy=true -Dorg.bedework.build.debug=true "
+  SHIFT
+  GOTO branch
+      
 :: PROJECTS
 
@@ -213,4 +256,12 @@
 IF "%1" == "-reindex" GOTO reindex
 IF "%1" == "-zoneinfo" GOTO zoneinfo
+
+IF "%1" == "-log-silent" GOTO log-silent
+IF "%1" == "-log-quiet" GOTO log-quiet
+IF "%1" == "-log-inform" GOTO log-inform
+IF "%1" == "-log-verbose" GOTO log-verbose
+IF "%1" == "-ant-debug" GOTO ant-debug
+IF "%1" == "-build-debug" GOTO build-debug
+
 IF "%1" == "-carddav" GOTO carddav 
 IF "%1" == "-caldav" GOTO caldav
Index: releases/bedework-3.7/resources/exsynchwsdefs/iCalendar-bw-extensions.xsd
===================================================================
--- trunk/resources/exsynchwsdefs/iCalendar-bw-extensions.xsd (revision 3055)
+++ releases/bedework-3.7/resources/exsynchwsdefs/iCalendar-bw-extensions.xsd (revision 3115)
@@ -6,28 +6,48 @@
            elementFormDefault="qualified">
 
+  <xs:include schemaLocation="iCalendar-valtypes.xsd" />
+            
+  <!-- ===================== Properties =================================  -->
+  <xs:include schemaLocation="iCalendar-props.xsd" />
+          
+  <!-- =====================================================================
+       3.2 Property parameter definitions
+       ===================================================================== -->
+  
+  <!-- Bedework x-parameters -->
+  <xs:element name="x-bedework-uid" type="xcal:XBedeworkUidParamType" 
+              substitutionGroup="xcal:baseParameter" />
+              
+  <xs:complexType name="XBedeworkUidParamType">
+    <xs:complexContent mixed="false">
+      <xs:extension base="xcal:TextParameterType"/>
+    </xs:complexContent>
+  </xs:complexType>
+
   <!-- =====================================================================
        3.7 Calendar Properties
        ===================================================================== -->  
-            
-  <!-- ===================== Properties =================================  -->
-  <xs:include schemaLocation="iCalendar-props.xsd" />
+
+  <xs:element name="x-bedework-cost" 
+              type="xcal:XBedeworkCostPropType"
+              substitutionGroup="xcal:baseProperty" />
 
   <xs:element name="x-bedework-exsynch-endtzid" 
-              type="xcal:x-bw-exsynch-endtzidPropType"
-              substitutionGroup="xcal:base-property" />
+              type="xcal:XBedeworkExsynchEndtzidPropType"
+              substitutionGroup="xcal:baseProperty" />
 
   <xs:element name="x-bedework-exsynch-lastmod" 
-              type="xcal:x-bw-exsynch-lastmodPropType"
-              substitutionGroup="xcal:base-property" />
+              type="xcal:XBedeworkExsynchLastmodPropType"
+              substitutionGroup="xcal:baseProperty" />
 
   <xs:element name="x-bedework-exsynch-organizer" 
-              type="xcal:organizerPropType"
-              substitutionGroup="xcal:base-property" />
+              type="xcal:OrganizerPropType"
+              substitutionGroup="xcal:baseProperty" />
 
   <xs:element name="x-bedework-exsynch-starttzid" 
-              type="xcal:x-bw-exsynch-starttzidPropType"
-              substitutionGroup="xcal:base-property" />
+              type="xcal:XBedeworkExsynchStarttzidPropType"
+              substitutionGroup="xcal:baseProperty" />
   
-  <xs:complexType name="x-bw-exsynch-endtzidPropType">
+  <xs:complexType name="XBedeworkCostPropType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:TextPropertyType"/>
@@ -35,5 +55,5 @@
   </xs:complexType>
   
-  <xs:complexType name="x-bw-exsynch-lastmodPropType">
+  <xs:complexType name="XBedeworkExsynchEndtzidPropType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:TextPropertyType"/>
@@ -41,5 +61,11 @@
   </xs:complexType>
   
-  <xs:complexType name="x-bw-exsynch-starttzidPropType">
+  <xs:complexType name="XBedeworkExsynchLastmodPropType">
+    <xs:complexContent mixed="false">
+      <xs:extension base="xcal:TextPropertyType"/>
+    </xs:complexContent>
+  </xs:complexType>
+  
+  <xs:complexType name="XBedeworkExsynchStarttzidPropType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:TextPropertyType"/>
Index: releases/bedework-3.7/resources/exsynchwsdefs/iCalendar-link-extension.xsd
===================================================================
---  (revision )
+++ releases/bedework-3.7/resources/exsynchwsdefs/iCalendar-link-extension.xsd (revision 3115)
@@ -1,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+           xmlns:xcal="urn:ietf:params:xml:ns:icalendar-2.0" 
+           targetNamespace="urn:ietf:params:xml:ns:icalendar-2.0" 
+           elementFormDefault="qualified">
+
+<!--Definition for the LINK extension property for icalendar -->
+
+  <xs:include schemaLocation="iCalendar-valtypes.xsd" />
+            
+  <!-- ===================== Properties =================================  -->
+  <xs:include schemaLocation="iCalendar-params.xsd" />
+            
+  <!-- ===================== Properties =================================  -->
+  <xs:include schemaLocation="iCalendar-props.xsd" />
+          
+  <!-- =====================================================================
+       3.2 Property parameter definitions
+       ===================================================================== -->
+
+  <!-- REL defines the type of relationship and may be a predefined value as
+       below or a URI which is globally unique and understood within the context
+       of its use.
+       
+       The standard relation types are:
+             "PARENT"    ; Parent relationship - Default
+             "CHILD"     ; Child relationship
+             "SIBLING"   ; Sibling relationship
+   -->
+   
+  <xs:element name="rel" type="xcal:TextParameterType" 
+              substitutionGroup="xcal:baseParameter" />
+ 
+  <!-- =====================================================================
+       3.7 Calendar Properties
+       ===================================================================== -->  
+  
+  <xs:complexType name="LinkPropType">
+    <xs:complexContent mixed="false">
+      <xs:extension base="xcal:BasePropertyType">
+        <xs:choice> 
+          <xs:element ref="xcal:uri"/>
+          <xs:element name="uid" type="xs:string"/>
+          <xs:element name="reference" type="xs:string"/>
+        </xs:choice>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:element name="link" 
+              type="xcal:LinkPropType"
+              substitutionGroup="xcal:baseProperty" />
+</xs:schema>
Index: releases/bedework-3.7/resources/exsynchwsdefs/iCalendar-ms-extensions.xsd
===================================================================
--- trunk/resources/exsynchwsdefs/iCalendar-ms-extensions.xsd (revision 3055)
+++ releases/bedework-3.7/resources/exsynchwsdefs/iCalendar-ms-extensions.xsd (revision 3115)
@@ -14,12 +14,12 @@
 
   <xs:element name="x-microsoft-cdo-busystatus" 
-              type="xcal:x-ms-cdo-busystatusPropType"
-              substitutionGroup="xcal:base-property" />
+              type="xcal:XMicrosoftCdoBusystatusPropType"
+              substitutionGroup="xcal:baseProperty" />
 
   <xs:element name="x-microsoft-cdo-intendedstatus" 
-              type="xcal:x-ms-cdo-intendedstatusPropType"
-              substitutionGroup="xcal:base-property" />
+              type="xcal:XMicrosoftCdoIntendedstatusPropType"
+              substitutionGroup="xcal:baseProperty" />
   
-  <xs:complexType name="x-ms-cdo-busystatusPropType">
+  <xs:complexType name="XMicrosoftCdoBusystatusPropType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:TextPropertyType"/>
@@ -27,5 +27,5 @@
   </xs:complexType>
   
-  <xs:complexType name="x-ms-cdo-intendedstatusPropType">
+  <xs:complexType name="XMicrosoftCdoIntendedstatusPropType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:TextPropertyType"/>
Index: releases/bedework-3.7/resources/exsynchwsdefs/iCalendar-params.xsd
===================================================================
--- trunk/resources/exsynchwsdefs/iCalendar-params.xsd (revision 3046)
+++ releases/bedework-3.7/resources/exsynchwsdefs/iCalendar-params.xsd (revision 3115)
@@ -12,49 +12,128 @@
        3.2 Property parameter definitions
        ===================================================================== -->
-       
+
+  <xs:complexType name="BaseParameterType" abstract="true" >
+  </xs:complexType>
+
+  <xs:element name="baseParameter" type="xcal:BaseParameterType" />
+
   <xs:complexType name="ArrayOfParameters">
-    <xs:choice maxOccurs="unbounded">
-      <xs:element name="altrep" type="xcal:altrepParamType" />
-      <xs:element name="cn" type="xcal:cnParamType" />
-      <xs:element name="cutype" type="xcal:cutypeParamType" />
-      <xs:element name="delegated-from" type="xcal:delegated-fromParamType" />
-      <xs:element name="delegated-to" type="xcal:delegated-toParamType" />
-      <xs:element name="dir" type="xcal:dirParamType" />
-      <xs:element name="encoding" type="xcal:encodingParamType" />
-      <xs:element name="fmttype" type="xcal:fmttypeParamType" />
-      <xs:element name="fbtype" type="xcal:fbtypeParamType" />
-      <xs:element name="language" type="xcal:languageParamType" />
-      <xs:element name="member" type="xcal:memberParamType" />
-      <xs:element name="partstat" type="xcal:partstatParamType" />
-      <xs:element name="range" type="xcal:rangeParamType" />
-      <xs:element name="related" type="xcal:relatedParamType" />
-      <xs:element name="reltype" type="xcal:reltypeParamType" />
-      <xs:element name="role" type="xcal:roleParamType" />
-      <xs:element name="rsvp" type="xcal:rsvpParamType" />
-      <xs:element name="sent-by" type="xcal:sent-byParamType" />
-      <xs:element name="tzid" type="xcal:tzidParamType" />
-    </xs:choice>
-  </xs:complexType>
-  
-  <xs:complexType name="cal-addressListParamType">
     <xs:sequence>
-      <xs:element ref="xcal:cal-address" maxOccurs="unbounded"/>
+      <xs:element ref="xcal:baseParameter" maxOccurs="unbounded"/>
     </xs:sequence>
+  </xs:complexType>
+         
+  <!-- =====================================================================
+       Define all the standard properties. By using a substitutionGroup we
+       make it easy to extend the list of parameters. As an example see 
+       the parameters defined in iCalendar-caldavsched-extensions.xsd
+       ===================================================================== -->  
+
+  <xs:element name="altrep" type="xcal:AltrepParamType"
+              substitutionGroup="xcal:baseParameter" />
+  <xs:element name="cn" type="xcal:CnParamType"
+              substitutionGroup="xcal:baseParameter" />
+  <xs:element name="cutype" type="xcal:CutypeParamType"
+              substitutionGroup="xcal:baseParameter" />
+  <xs:element name="delegated-from" type="xcal:DelegatedFromParamType"
+              substitutionGroup="xcal:baseParameter" />
+  <xs:element name="delegated-to" type="xcal:DelegatedToParamType"
+              substitutionGroup="xcal:baseParameter" />
+  <xs:element name="dir" type="xcal:DirParamType"
+              substitutionGroup="xcal:baseParameter" />
+  <xs:element name="encoding" type="xcal:EncodingParamType"
+              substitutionGroup="xcal:baseParameter" />
+  <xs:element name="fmttype" type="xcal:FmttypeParamType"
+              substitutionGroup="xcal:baseParameter" />
+  <xs:element name="fbtype" type="xcal:FbtypeParamType"
+              substitutionGroup="xcal:baseParameter" />
+  <xs:element name="language" type="xcal:LanguageParamType"
+              substitutionGroup="xcal:baseParameter" />
+  <xs:element name="member" type="xcal:MemberParamType"
+              substitutionGroup="xcal:baseParameter" />
+  <xs:element name="partstat" type="xcal:PartstatParamType"
+              substitutionGroup="xcal:baseParameter" />
+  <xs:element name="range" type="xcal:RangeParamType"
+              substitutionGroup="xcal:baseParameter" />
+  <xs:element name="related" type="xcal:RelatedParamType"
+              substitutionGroup="xcal:baseParameter" />
+  <xs:element name="reltype" type="xcal:ReltypeParamType"
+              substitutionGroup="xcal:baseParameter" />
+  <xs:element name="role" type="xcal:RoleParamType"
+              substitutionGroup="xcal:baseParameter" />
+  <xs:element name="rsvp" type="xcal:RsvpParamType"
+              substitutionGroup="xcal:baseParameter" />
+  <xs:element name="sent-by" type="xcal:SentByParamType"
+              substitutionGroup="xcal:baseParameter" />
+  <xs:element name="tzid" type="xcal:TzidParamType"
+              substitutionGroup="xcal:baseParameter" />
+              
+  
+  <!-- Scheduling parameters for attendee or organizer -->
+  <xs:element name="schedule-agent" type="xcal:ScheduleAgentParamType"
+              substitutionGroup="xcal:baseParameter" />
+  <xs:element name="schedule-force-send" type="xcal:ScheduleForceSendParamType"
+              substitutionGroup="xcal:baseParameter" />
+  <xs:element name="schedule-status" type="xcal:ScheduleStatusParamType"
+              substitutionGroup="xcal:baseParameter" />
+  
+  <!-- Parameters that take a simple text value -->
+  <xs:complexType name="TextParameterType" >
+    <xs:complexContent mixed="false">
+      <xs:extension base="xcal:BaseParameterType">
+        <xs:sequence> 
+          <xs:element ref="xcal:text" />
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  
+  <!-- Parameters that take a uri value -->
+  <xs:complexType name="UriParameterType" >
+    <xs:complexContent mixed="false">
+      <xs:extension base="xcal:BaseParameterType">
+        <xs:sequence>
+          <xs:element ref="xcal:uri"/>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  
+  <xs:complexType name="CalAddressListParamType">
+    <xs:complexContent mixed="false">
+      <xs:extension base="xcal:BaseParameterType">
+        <xs:sequence>
+          <xs:element ref="xcal:cal-address" maxOccurs="unbounded"/>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  
+  <xs:complexType name="CalAddressParamType">
+    <xs:complexContent mixed="false">
+      <xs:extension base="xcal:BaseParameterType">
+        <xs:sequence>
+          <xs:element ref="xcal:cal-address" />
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
   </xs:complexType>
  
   <!-- 3.2.1 Alternate Text Representation -->
-  <xs:complexType name="altrepParamType">
-    <xs:sequence>
-      <xs:element ref="xcal:uri"/>
-    </xs:sequence>
+  <xs:complexType name="AltrepParamType">
+    <xs:complexContent mixed="false">
+      <xs:extension base="xcal:UriParameterType"/>
+    </xs:complexContent>
   </xs:complexType>
   
   <!-- 3.2.2 Common Name -->
-  <xs:simpleType name="cnParamType">
-    <xs:restriction base="xs:string"/>
-  </xs:simpleType>
+  <xs:complexType name="CnParamType">
+    <xs:complexContent mixed="false">
+      <xs:extension base="xcal:TextParameterType"/>
+    </xs:complexContent>
+  </xs:complexType>
   
   <!-- 3.2.3 Calendar User Type -->
-  <xs:simpleType name="cutypeParamType">
+  <xs:simpleType name="CutypeValueType">
     <xs:restriction base="xs:token">
       <xs:enumeration value="INDIVIDUAL"/>
@@ -66,27 +145,36 @@
   </xs:simpleType>
   
+  <xs:complexType name="CutypeParamType">
+    <xs:complexContent mixed="false">
+      <xs:extension base="xcal:TextParameterType"/>
+    </xs:complexContent>
+  </xs:complexType>
+  
   <!-- 3.2.4 Delegators -->
-  <xs:complexType name="delegated-fromParamType">
-    <xs:complexContent mixed="false">
-      <xs:extension base="xcal:cal-addressListParamType"/>
+  <xs:complexType name="DelegatedFromParamType">
+    <xs:complexContent mixed="false">
+      <xs:extension base="xcal:CalAddressListParamType">
+      </xs:extension>
     </xs:complexContent>
   </xs:complexType>
 
   <!-- 3.2.5 Delegatees -->
-  <xs:complexType name="delegated-toParamType">
-    <xs:complexContent mixed="false">
-      <xs:extension base="xcal:cal-addressListParamType"/>
+  <xs:complexType name="DelegatedToParamType">
+    <xs:complexContent mixed="false">
+      <xs:extension base="xcal:CalAddressListParamType">
+      </xs:extension>
     </xs:complexContent>
   </xs:complexType>
   
   <!-- 3.2.6 Directory Entry Reference -->
-  <xs:complexType name="dirParamType">
-    <xs:sequence>
-      <xs:element ref="xcal:uri"/>
-    </xs:sequence>
+  <xs:complexType name="DirParamType">
+    <xs:complexContent mixed="false">
+      <xs:extension base="xcal:UriParameterType"/>
+    </xs:complexContent>
   </xs:complexType>
   
   <!-- 3.2.7 Inline Encoding -->
-  <xs:simpleType name="encodingParamType">
+
+  <xs:simpleType name="EncodingValueType">
     <xs:restriction base="xs:token">
       <xs:enumeration value="8BIT"/>
@@ -95,11 +183,19 @@
   </xs:simpleType>
   
+  <xs:complexType name="EncodingParamType">
+    <xs:complexContent mixed="false">
+      <xs:extension base="xcal:TextParameterType"/>
+    </xs:complexContent>
+  </xs:complexType>
+
   <!-- 3.2.8 Format Type -->
-  <xs:simpleType name="fmttypeParamType">
-    <xs:restriction base="xs:string"/>
-  </xs:simpleType>
+  <xs:complexType name="FmttypeParamType">
+    <xs:complexContent mixed="false">
+      <xs:extension base="xcal:TextParameterType"/>
+    </xs:complexContent>
+  </xs:complexType>
   
   <!-- 3.2.9 Free/Busy Time Type -->
-  <xs:simpleType name="fbtypeParamType">
+  <xs:simpleType name="FbtypeValueType">
     <xs:restriction base="xs:token">
       <xs:enumeration value="FREE"/>
@@ -110,22 +206,31 @@
   </xs:simpleType>
   
+  <xs:complexType name="FbtypeParamType">
+    <xs:complexContent mixed="false">
+      <xs:extension base="xcal:TextParameterType"/>
+    </xs:complexContent>
+  </xs:complexType>
+  
   <!-- 3.2.10 Language -->
-  <xs:simpleType name="languageParamType">
-    <xs:restriction base="xs:string"/>
-  </xs:simpleType>
+  <xs:complexType name="LanguageParamType">
+    <xs:complexContent mixed="false">
+      <xs:extension base="xcal:TextParameterType"/>
+    </xs:complexContent>
+  </xs:complexType>
   
   <!-- 3.2.11 Group or List Membership -->
-  <xs:complexType name="memberParamType">
-    <xs:complexContent mixed="false">
-      <xs:extension base="xcal:cal-addressListParamType"/>
+  <xs:complexType name="MemberParamType">
+    <xs:complexContent mixed="false">
+      <xs:extension base="xcal:CalAddressListParamType">
+      </xs:extension>
     </xs:complexContent>
   </xs:complexType>
   
   <!-- 3.2.12 Participation Status -->
-  <xs:simpleType name="partstatParamType">
-    <xs:union memberTypes="xcal:type-partstat-event xcal:type-partstat-todo xcal:type-partstat-jour"/>
-  </xs:simpleType>
-  
-  <xs:simpleType name="type-partstat-event">
+  <xs:simpleType name="PartstatValueType">
+    <xs:union memberTypes="xcal:TypePartstatEvent xcal:TypePartstatTodo xcal:TypePartstatJour"/>
+  </xs:simpleType>
+  
+  <xs:simpleType name="TypePartstatEvent">
     <xs:restriction base="xs:token">
       <xs:enumeration value="NEEDS-ACTION"/>
@@ -137,5 +242,5 @@
   </xs:simpleType>
   
-  <xs:simpleType name="type-partstat-todo">
+  <xs:simpleType name="TypePartstatTodo">
     <xs:restriction base="xs:token">
       <xs:enumeration value="NEEDS-ACTION"/>
@@ -149,5 +254,5 @@
   </xs:simpleType>
   
-  <xs:simpleType name="type-partstat-jour">
+  <xs:simpleType name="TypePartstatJour">
     <xs:restriction base="xs:token">
       <xs:enumeration value="NEEDS-ACTION"/>
@@ -157,6 +262,12 @@
   </xs:simpleType>
   
+  <xs:complexType name="PartstatParamType">
+    <xs:complexContent mixed="false">
+      <xs:extension base="xcal:TextParameterType"/>
+    </xs:complexContent>
+  </xs:complexType>
+  
   <!-- 3.2.13 Recurrence Identifier Range -->
-  <xs:simpleType name="rangeParamType">
+  <xs:simpleType name="RangeValueType">
     <xs:restriction base="xs:token">
       <xs:enumeration value="THISANDFUTURE"/>
@@ -164,6 +275,16 @@
   </xs:simpleType>
   
+  <xs:complexType name="RangeParamType">
+    <xs:complexContent mixed="false">
+      <xs:extension base="xcal:BaseParameterType">
+        <xs:sequence>
+          <xs:element name="text" type="xcal:RangeValueType"/>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  
   <!-- 3.2.14 Alarm Trigger Relationship -->
-  <xs:simpleType name="relatedParamType">
+  <xs:simpleType name="RelatedValueType">
     <xs:restriction base="xs:token">
       <xs:enumeration value="START"/>
@@ -172,6 +293,12 @@
   </xs:simpleType>
   
+  <xs:complexType name="RelatedParamType">
+    <xs:complexContent mixed="false">
+      <xs:extension base="xcal:TextParameterType"/>
+    </xs:complexContent>
+  </xs:complexType>
+  
   <!-- 3.2.15 Relationship Type -->
-  <xs:simpleType name="reltypeParamType">
+  <xs:simpleType name="ReltypeValueType">
     <xs:restriction base="xs:token">
       <xs:enumeration value="PARENT"/>
@@ -181,6 +308,12 @@
   </xs:simpleType>
   
+  <xs:complexType name="ReltypeParamType">
+    <xs:complexContent mixed="false">
+      <xs:extension base="xcal:TextParameterType"/>
+    </xs:complexContent>
+  </xs:complexType>
+  
   <!-- 3.2.16 Participation Role -->
-  <xs:simpleType name="roleParamType">
+  <xs:simpleType name="RoleValueType">
     <xs:restriction base="xs:token">
       <xs:enumeration value="CHAIR"/>
@@ -191,6 +324,12 @@
   </xs:simpleType>
   
+  <xs:complexType name="RoleParamType">
+    <xs:complexContent mixed="false">
+      <xs:extension base="xcal:TextParameterType"/>
+    </xs:complexContent>
+  </xs:complexType>
+  
   <!-- 3.2.17 RSVP Expectation -->
-  <xs:simpleType name="rsvpParamType">
+  <xs:simpleType name="RsvpValueType">
     <xs:restriction base="xs:token">
       <xs:enumeration value="TRUE"/>
@@ -199,14 +338,58 @@
   </xs:simpleType>
   
+  <xs:complexType name="RsvpParamType">
+    <xs:complexContent mixed="false">
+      <xs:extension base="xcal:TextParameterType"/>
+    </xs:complexContent>
+  </xs:complexType>
+  
   <!-- 3.2.18 Sent By -->
-  <xs:complexType name="sent-byParamType">
-    <xs:sequence>
-      <xs:element ref="xcal:cal-address"/>
-    </xs:sequence>
+  <xs:complexType name="SentByParamType">
+    <xs:complexContent mixed="false">
+      <xs:extension base="xcal:CalAddressParamType">
+      </xs:extension>
+    </xs:complexContent>
   </xs:complexType>
   
   <!-- 3.2.19 Time Zone Identifier -->
-  <xs:simpleType name="tzidParamType">
-    <xs:restriction base="xs:string"/>
-  </xs:simpleType>
+  <xs:complexType name="TzidParamType">
+    <xs:complexContent mixed="false">
+      <xs:extension base="xcal:TextParameterType"/>
+    </xs:complexContent>
+  </xs:complexType>
+  
+  <!-- Scheduling parameters - Defined by CalDAV scheduling -->
+  
+  <xs:simpleType name="ScheduleAgentValueType">
+    <xs:restriction base="xs:token">
+      <xs:enumeration value="SERVER"/>
+      <xs:enumeration value="CLIENT"/>
+      <xs:enumeration value="NONE"/>
+    </xs:restriction>
+  </xs:simpleType>
+  
+  <xs:complexType name="ScheduleAgentParamType">
+    <xs:complexContent mixed="false">
+      <xs:extension base="xcal:TextParameterType"/>
+    </xs:complexContent>
+  </xs:complexType>
+  
+  <xs:simpleType name="ScheduleForceSendValueType">
+    <xs:restriction base="xs:token">
+      <xs:enumeration value="REQUEST"/>
+      <xs:enumeration value="REPLY"/>
+    </xs:restriction>
+  </xs:simpleType>
+  
+  <xs:complexType name="ScheduleForceSendParamType">
+    <xs:complexContent mixed="false">
+      <xs:extension base="xcal:TextParameterType"/>
+    </xs:complexContent>
+  </xs:complexType>
+  
+  <xs:complexType name="ScheduleStatusParamType">
+    <xs:complexContent mixed="false">
+      <xs:extension base="xcal:TextParameterType"/>
+    </xs:complexContent>
+  </xs:complexType>
 </xs:schema>
Index: releases/bedework-3.7/resources/exsynchwsdefs/iCalendar-props.xsd
===================================================================
--- trunk/resources/exsynchwsdefs/iCalendar-props.xsd (revision 3055)
+++ releases/bedework-3.7/resources/exsynchwsdefs/iCalendar-props.xsd (revision 3115)
@@ -13,112 +13,14 @@
   <!-- ===================== Parameters =================================  -->
   <xs:include schemaLocation="iCalendar-params.xsd" />
-            
-  <!-- ===================== Extensions =================================  -->
-  <xs:include schemaLocation="iCalendar-bw-extensions.xsd" />
-  <xs:include schemaLocation="iCalendar-ms-extensions.xsd" />
-
-  <xs:complexType name="ArrayOfProperties">
-    <xs:sequence>
-      <xs:element ref="xcal:base-property" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-  
-  <xs:element name="base-property" type="xcal:BasePropertyType" />
-  
-  <xs:element name="calscale" type="xcal:calscalePropType"
-              substitutionGroup="xcal:base-property" />
-  <xs:element name="method" type="xcal:methodPropType"
-              substitutionGroup="xcal:base-property" />
-  <xs:element name="prodid" type="xcal:prodidPropType"
-              substitutionGroup="xcal:base-property" />
-  <xs:element name="version" type="xcal:versionPropType"
-              substitutionGroup="xcal:base-property" />
-  <xs:element name="attach" type="xcal:attachPropType"
-              substitutionGroup="xcal:base-property" />
-  <xs:element name="categories" type="xcal:categoriesPropType"
-              substitutionGroup="xcal:base-property" />
-  <xs:element name="class" type="xcal:classPropType"
-              substitutionGroup="xcal:base-property" />
-  <xs:element name="comment" type="xcal:commentPropType"
-              substitutionGroup="xcal:base-property" />
-  <xs:element name="description" type="xcal:descriptionPropType"
-              substitutionGroup="xcal:base-property" />
-  <xs:element name="geo" type="xcal:geoPropType"
-              substitutionGroup="xcal:base-property" />
-  <xs:element name="location" type="xcal:locationPropType"
-              substitutionGroup="xcal:base-property" />
-  <xs:element name="percent-complete" type="xcal:percent-completePropType"
-              substitutionGroup="xcal:base-property" />
-  <xs:element name="priority" type="xcal:priorityPropType"
-              substitutionGroup="xcal:base-property" />
-  <xs:element name="resources" type="xcal:resourcesPropType"
-              substitutionGroup="xcal:base-property" />
-  <xs:element name="status" type="xcal:statusPropType"
-              substitutionGroup="xcal:base-property" />
-  <xs:element name="summary" type="xcal:summaryPropType"
-              substitutionGroup="xcal:base-property" />
-  <xs:element name="completed" type="xcal:completedPropType"
-              substitutionGroup="xcal:base-property" />
-  <xs:element name="dtend" type="xcal:dtendPropType"
-              substitutionGroup="xcal:base-property" />
-  <xs:element name="dtstart" type="xcal:dtstartPropType"
-              substitutionGroup="xcal:base-property" />
-  <xs:element name="due" type="xcal:duePropType"
-              substitutionGroup="xcal:base-property" />
-  <xs:element name="duration" type="xcal:durationPropType"
-              substitutionGroup="xcal:base-property" />
-  <xs:element name="freebusy" type="xcal:freebusyPropType"
-              substitutionGroup="xcal:base-property" />
-  <xs:element name="transp" type="xcal:transpPropType"
-              substitutionGroup="xcal:base-property" />
-  <xs:element name="tzid" type="xcal:tzidPropType"
-              substitutionGroup="xcal:base-property" />
-  <xs:element name="tzname" type="xcal:tznamePropType"
-              substitutionGroup="xcal:base-property" />
-  <xs:element name="tzoffsetfrom" type="xcal:tzoffsetfromPropType"
-              substitutionGroup="xcal:base-property" />
-  <xs:element name="tzoffsetto" type="xcal:tzoffsettoPropType"
-              substitutionGroup="xcal:base-property" />
-  <xs:element name="tzurl" type="xcal:tzurlPropType"
-              substitutionGroup="xcal:base-property" />
-  <xs:element name="attendee" type="xcal:attendeePropType"
-              substitutionGroup="xcal:base-property" />
-  <xs:element name="contact" type="xcal:contactPropType"
-              substitutionGroup="xcal:base-property" />
-  <xs:element name="organizer" type="xcal:organizerPropType"
-              substitutionGroup="xcal:base-property" />
-  <xs:element name="recurrence-id" type="xcal:recurrence-idPropType"
-              substitutionGroup="xcal:base-property" />
-  <xs:element name="url" type="xcal:urlPropType"
-              substitutionGroup="xcal:base-property" />
-  <xs:element name="uid" type="xcal:uidPropType"
-              substitutionGroup="xcal:base-property" />
-  <xs:element name="exdate" type="xcal:exdatePropType"
-              substitutionGroup="xcal:base-property" />
-  <xs:element name="rdate" type="xcal:rdatePropType"
-              substitutionGroup="xcal:base-property" />
-  <xs:element name="related-to" type="xcal:related-toPropType"
-              substitutionGroup="xcal:base-property" />
-  <xs:element name="exrule" type="xcal:exrulePropType"
-              substitutionGroup="xcal:base-property" /> 
-  <xs:element name="rrule" type="xcal:rrulePropType"
-              substitutionGroup="xcal:base-property" /> 
-  <xs:element name="action" type="xcal:actionPropType"
-              substitutionGroup="xcal:base-property" />
-  <xs:element name="repeat" type="xcal:repeatPropType"
-              substitutionGroup="xcal:base-property" />
-  <xs:element name="trigger" type="xcal:triggerPropType"
-              substitutionGroup="xcal:base-property" />
-  <xs:element name="created" type="xcal:createdPropType"
-              substitutionGroup="xcal:base-property" />
-  <xs:element name="dtstamp" type="xcal:dtstampPropType"
-              substitutionGroup="xcal:base-property" />
-  <xs:element name="last-modified" type="xcal:last-modifiedPropType"
-              substitutionGroup="xcal:base-property" />
-  <xs:element name="sequence" type="xcal:request-statusPropType"
-              substitutionGroup="xcal:base-property" />
-  <xs:element name="request-status" type="xcal:request-statusPropType"
-              substitutionGroup="xcal:base-property" />
-
+
+  <!-- =====================================================================
+        BasePropertyType 
+        All properties are based off this type which defines a property as 
+        nothing more than a list of parameters. 
+        
+        We make no attempt to define valid parameters for each property as this
+        would complicate the schema significantly. Consumers can ignore 
+        property parameters they do not understand or expect. 
+       ===================================================================== -->  
   <xs:complexType name="BasePropertyType" abstract="true" >
     <xs:sequence>
@@ -127,4 +29,159 @@
   </xs:complexType>
 
+  <xs:element name="baseProperty" type="xcal:BasePropertyType" />
+
+  <xs:complexType name="ArrayOfProperties">
+    <xs:sequence>
+      <xs:element ref="xcal:baseProperty" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+  
+  <!-- =====================================================================
+       Define all the standard properties. By using a substitutionGroup we
+       make it easy to extend the list of properties. As an example see 
+       the properties defined in iCalendar-ms-extensions.xsd
+       ===================================================================== -->  
+  <xs:element name="calscale" type="xcal:CalscalePropType"
+              substitutionGroup="xcal:baseProperty" />
+              
+  <xs:element name="method" type="xcal:MethodPropType"
+              substitutionGroup="xcal:baseProperty" />
+              
+  <xs:element name="prodid" type="xcal:ProdidPropType"
+              substitutionGroup="xcal:baseProperty" />
+              
+  <xs:element name="version" type="xcal:VersionPropType"
+              substitutionGroup="xcal:baseProperty" />
+              
+  <xs:element name="attach" type="xcal:AttachPropType"
+              substitutionGroup="xcal:baseProperty" />
+              
+  <xs:element name="categories" type="xcal:CategoriesPropType"
+              substitutionGroup="xcal:baseProperty" />
+              
+  <xs:element name="class" type="xcal:ClassPropType"
+              substitutionGroup="xcal:baseProperty" />
+              
+  <xs:element name="comment" type="xcal:CommentPropType"
+              substitutionGroup="xcal:baseProperty" />
+              
+  <xs:element name="description" type="xcal:DescriptionPropType"
+              substitutionGroup="xcal:baseProperty" />
+              
+  <xs:element name="geo" type="xcal:GeoPropType"
+              substitutionGroup="xcal:baseProperty" />
+              
+  <xs:element name="location" type="xcal:LocationPropType"
+              substitutionGroup="xcal:baseProperty" />
+              
+  <xs:element name="percent-complete" type="xcal:PercentCompletePropType"
+              substitutionGroup="xcal:baseProperty" />
+              
+  <xs:element name="priority" type="xcal:PriorityPropType"
+              substitutionGroup="xcal:baseProperty" />
+              
+  <xs:element name="resources" type="xcal:ResourcesPropType"
+              substitutionGroup="xcal:baseProperty" />
+              
+  <xs:element name="status" type="xcal:StatusPropType"
+              substitutionGroup="xcal:baseProperty" />
+              
+  <xs:element name="summary" type="xcal:SummaryPropType"
+              substitutionGroup="xcal:baseProperty" />
+              
+  <xs:element name="completed" type="xcal:CompletedPropType"
+              substitutionGroup="xcal:baseProperty" />
+              
+  <xs:element name="dtend" type="xcal:DtendPropType"
+              substitutionGroup="xcal:baseProperty" />
+              
+  <xs:element name="dtstart" type="xcal:DtstartPropType"
+              substitutionGroup="xcal:baseProperty" />
+              
+  <xs:element name="due" type="xcal:DuePropType"
+              substitutionGroup="xcal:baseProperty" />
+              
+  <xs:element name="duration" type="xcal:DurationPropType"
+              substitutionGroup="xcal:baseProperty" />
+              
+  <xs:element name="freebusy" type="xcal:FreebusyPropType"
+              substitutionGroup="xcal:baseProperty" />
+              
+  <xs:element name="transp" type="xcal:TranspPropType"
+              substitutionGroup="xcal:baseProperty" />
+              
+  <!-- Comment out tzid for the moment. It has the same name as the parameter
+       and this is causing me some issues
+  <xs:element name="tzid" type="xcal:TzidPropType"
+              substitutionGroup="xcal:baseProperty" /> -->
+  <xs:element name="tzname" type="xcal:TznamePropType"
+              substitutionGroup="xcal:baseProperty" />
+              
+  <xs:element name="tzoffsetfrom" type="xcal:TzoffsetfromPropType"
+              substitutionGroup="xcal:baseProperty" />
+              
+  <xs:element name="tzoffsetto" type="xcal:TzoffsettoPropType"
+              substitutionGroup="xcal:baseProperty" />
+              
+  <xs:element name="tzurl" type="xcal:TzurlPropType"
+              substitutionGroup="xcal:baseProperty" />
+              
+  <xs:element name="attendee" type="xcal:AttendeePropType"
+              substitutionGroup="xcal:baseProperty" />
+              
+  <xs:element name="contact" type="xcal:ContactPropType"
+              substitutionGroup="xcal:baseProperty" />
+              
+  <xs:element name="organizer" type="xcal:OrganizerPropType"
+              substitutionGroup="xcal:baseProperty" />
+              
+  <xs:element name="recurrence-id" type="xcal:RecurrenceIdPropType"
+              substitutionGroup="xcal:baseProperty" />
+              
+  <xs:element name="url" type="xcal:UrlPropType"
+              substitutionGroup="xcal:baseProperty" />
+              
+  <xs:element name="uid" type="xcal:UidPropType"
+              substitutionGroup="xcal:baseProperty" />
+              
+  <xs:element name="exdate" type="xcal:ExdatePropType"
+              substitutionGroup="xcal:baseProperty" />
+              
+  <xs:element name="rdate" type="xcal:RdatePropType"
+              substitutionGroup="xcal:baseProperty" />
+              
+  <xs:element name="related-to" type="xcal:RelatedToPropType"
+              substitutionGroup="xcal:baseProperty" />
+              
+  <xs:element name="exrule" type="xcal:ExrulePropType"
+              substitutionGroup="xcal:baseProperty" /> 
+              
+  <xs:element name="rrule" type="xcal:RrulePropType"
+              substitutionGroup="xcal:baseProperty" /> 
+              
+  <xs:element name="action" type="xcal:ActionPropType"
+              substitutionGroup="xcal:baseProperty" />
+              
+  <xs:element name="repeat" type="xcal:RepeatPropType"
+              substitutionGroup="xcal:baseProperty" />
+              
+  <xs:element name="trigger" type="xcal:TriggerPropType"
+              substitutionGroup="xcal:baseProperty" />
+              
+  <xs:element name="created" type="xcal:CreatedPropType"
+              substitutionGroup="xcal:baseProperty" />
+              
+  <xs:element name="dtstamp" type="xcal:DtstampPropType"
+              substitutionGroup="xcal:baseProperty" />
+              
+  <xs:element name="last-modified" type="xcal:LastModifiedPropType"
+              substitutionGroup="xcal:baseProperty" />
+              
+  <xs:element name="sequence" type="xcal:SequencePropType"
+              substitutionGroup="xcal:baseProperty" />
+              
+  <xs:element name="request-status" type="xcal:RequestStatusPropType"
+              substitutionGroup="xcal:baseProperty" />
+
   <!-- Properties that take a simple text value -->
   <xs:complexType name="TextPropertyType" >
@@ -158,5 +215,5 @@
     </xs:complexContent>
   </xs:complexType>
-
+ 
   <!-- Properties that take a simple integer value -->
   <xs:complexType name="IntegerPropertyType" >
@@ -164,5 +221,5 @@
       <xs:extension base="xcal:BasePropertyType">
         <xs:sequence>
-          <xs:element ref="xcal:integerType"/>
+          <xs:element ref="xcal:integer"/>
         </xs:sequence>
       </xs:extension>
@@ -198,4 +255,15 @@
         <xs:sequence>
           <xs:element ref="xcal:date-time"/>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <!-- Properties that take a utc-date-time value -->
+  <xs:complexType name="UtcDatetimePropertyType" >
+    <xs:complexContent mixed="false">
+      <xs:extension base="xcal:BasePropertyType">
+        <xs:sequence>
+          <xs:element ref="xcal:utc-date-time"/>
         </xs:sequence>
       </xs:extension>
@@ -222,12 +290,12 @@
       <xs:extension base="xcal:BasePropertyType">
         <xs:sequence>
-          <xs:element ref="xcal:recur"/>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  
+          <xs:element name="recur" type="xcal:RecurType"/>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+     
   <!-- 3.7.1 Calendar Scale -->
-  <xs:simpleType name="calscaleValueType">
+  <xs:simpleType name="CalscaleValueType">
     <xs:restriction base="xs:string">
       <xs:enumeration value="GREGORIAN"/>
@@ -235,9 +303,9 @@
   </xs:simpleType>
   
-  <xs:complexType name="calscalePropType">
-    <xs:complexContent mixed="false">
-      <xs:extension base="xcal:BasePropertyType">
-        <xs:sequence>
-          <xs:element name="text" type="xcal:calscaleValueType"/>
+  <xs:complexType name="CalscalePropType">
+    <xs:complexContent mixed="false">
+      <xs:extension base="xcal:BasePropertyType">
+        <xs:sequence>
+          <xs:element name="text" type="xcal:CalscaleValueType"/>
         </xs:sequence>
       </xs:extension>
@@ -246,5 +314,5 @@
   
   <!-- 3.7.2 Method -->
-  <xs:complexType name="methodPropType">
+  <xs:complexType name="MethodPropType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:TextPropertyType"/>
@@ -253,5 +321,5 @@
 
   <!-- 3.7.3 Product Identifier -->
-  <xs:complexType name="prodidPropType">
+  <xs:complexType name="ProdidPropType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:TextPropertyType"/>
@@ -260,5 +328,5 @@
 
   <!-- 3.7.4 Version -->
-  <xs:complexType name="versionPropType">
+  <xs:complexType name="VersionPropType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:TextPropertyType"/>
@@ -269,5 +337,5 @@
   <!-- 3.8.1 Descriptive Component Properties -->
   <!-- 3.8.1.1 Attachment -->
-  <xs:complexType name="attachPropType">
+  <xs:complexType name="AttachPropType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:BasePropertyType">
@@ -281,5 +349,5 @@
     
   <!-- 3.8.1.2 Categories -->
-  <xs:complexType name="categoriesPropType">
+  <xs:complexType name="CategoriesPropType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:TextListPropertyType"/>
@@ -289,5 +357,5 @@
   <!-- 3.8.1.3 Classification -->
   <!-- Would like something lie this but not extensible
-  <xs:simpleType name="classValueType">
+  <xs:simpleType name="ClassValueType">
     <xs:restriction base="xs:string">
       <xs:enumeration value="PUBLIC"/>
@@ -297,9 +365,9 @@
   </xs:simpleType>
    
-  <xs:complexType name="classPropType">
-    <xs:complexContent mixed="false">
-      <xs:extension base="xcal:BasePropertyType">
-        <xs:sequence>
-          <xs:element name="text" type="xcal:classValueType"/>
+  <xs:complexType name="ClassPropType">
+    <xs:complexContent mixed="false">
+      <xs:extension base="xcal:BasePropertyType">
+        <xs:sequence>
+          <xs:element name="text" type="xcal:ClassValueType"/>
         </xs:sequence>
       </xs:extension>
@@ -307,6 +375,13 @@
   </xs:complexType>
  -->
-  
-  <xs:complexType name="classPropType">
+  <xs:simpleType name="ClassValueType">
+    <xs:restriction base="xs:token">
+      <xs:enumeration value="PUBLIC"/>
+      <xs:enumeration value="PRIVATE"/>
+      <xs:enumeration value="CONFIDENTIAL"/>
+    </xs:restriction>
+  </xs:simpleType>
+  
+  <xs:complexType name="ClassPropType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:TextPropertyType"/>
@@ -315,5 +390,5 @@
     
   <!-- 3.8.1.4 Comment -->
-  <xs:complexType name="commentPropType">
+  <xs:complexType name="CommentPropType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:TextPropertyType"/>
@@ -322,5 +397,5 @@
     
   <!-- 3.8.1.5 Description -->
-  <xs:complexType name="descriptionPropType">
+  <xs:complexType name="DescriptionPropType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:TextPropertyType"/>
@@ -329,5 +404,5 @@
     
   <!-- 3.8.1.6 Geographic Position -->
-  <xs:complexType name="geoPropType">
+  <xs:complexType name="GeoPropType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:BasePropertyType">
@@ -344,5 +419,5 @@
   
   <!-- 3.8.1.7 Location -->
-  <xs:complexType name="locationPropType">
+  <xs:complexType name="LocationPropType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:TextPropertyType"/>
@@ -351,5 +426,5 @@
     
   <!-- 3.8.1.8 Percent Complete -->
-  <xs:complexType name="percent-completePropType">
+  <xs:complexType name="PercentCompletePropType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:IntegerPropertyType"/>
@@ -358,5 +433,5 @@
 
   <!-- 3.8.1.9 Priority -->
-  <xs:complexType name="priorityPropType">
+  <xs:complexType name="PriorityPropType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:IntegerPropertyType"/>
@@ -365,5 +440,5 @@
     
   <!-- 3.8.1.10 Resources -->
-  <xs:complexType name="resourcesPropType">
+  <xs:complexType name="ResourcesPropType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:TextListPropertyType"/>
@@ -372,6 +447,6 @@
 
   <!-- 3.8.1.11 Status -->
-  <xs:simpleType name="statusValueType">
-    <xs:restriction base="xs:string">
+  <xs:simpleType name="StatusValueType">
+    <xs:restriction base="xs:token">
       <xs:enumeration value="TENTATIVE"/> <!-- event -->
       <xs:enumeration value="CONFIRMED"/> <!-- event -->
@@ -385,16 +460,12 @@
   </xs:simpleType>
   
-  <xs:complexType name="statusPropType">
-    <xs:complexContent mixed="false">
-      <xs:extension base="xcal:BasePropertyType">
-        <xs:sequence>
-          <xs:element name="text" type="xcal:statusValueType"/>
-        </xs:sequence>
-      </xs:extension>
+  <xs:complexType name="StatusPropType">
+    <xs:complexContent mixed="false">
+      <xs:extension base="xcal:TextPropertyType"/>
     </xs:complexContent>
   </xs:complexType>
   
   <!-- 3.8.1.12 Summary -->
-  <xs:complexType name="summaryPropType">
+  <xs:complexType name="SummaryPropType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:TextPropertyType"/>
@@ -404,5 +475,12 @@
   <!-- 3.8.2 Date and Time Component Properties -->
   <!-- 3.8.2.1 Date/Time Completed -->
-  <xs:complexType name="completedPropType">
+  <xs:complexType name="CompletedPropType">
+    <xs:complexContent mixed="false">
+      <xs:extension base="xcal:UtcDatetimePropertyType"/>
+    </xs:complexContent>
+  </xs:complexType>
+    
+  <!-- 3.8.2.2 Date/Time End -->
+  <xs:complexType name="DtendPropType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:DateDatetimePropertyType"/>
@@ -410,6 +488,6 @@
   </xs:complexType>
     
-  <!-- 3.8.2.2 Date/Time End -->
-  <xs:complexType name="dtendPropType">
+  <!-- 3.8.2.3 Date/Time Due -->
+  <xs:complexType name="DuePropType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:DateDatetimePropertyType"/>
@@ -417,6 +495,6 @@
   </xs:complexType>
     
-  <!-- 3.8.2.3 Date/Time Due -->
-  <xs:complexType name="duePropType">
+  <!-- 3.8.2.4 Date/Time Start -->
+  <xs:complexType name="DtstartPropType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:DateDatetimePropertyType"/>
@@ -424,13 +502,6 @@
   </xs:complexType>
     
-  <!-- 3.8.2.4 Date/Time Start -->
-  <xs:complexType name="dtstartPropType">
-    <xs:complexContent mixed="false">
-      <xs:extension base="xcal:DateDatetimePropertyType"/>
-    </xs:complexContent>
-  </xs:complexType>
-    
   <!-- 3.8.2.5 Duration -->
-  <xs:complexType name="durationPropType">
+  <xs:complexType name="DurationPropType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:BasePropertyType">
@@ -443,5 +514,5 @@
     
   <!-- 3.8.2.6 Free/Busy Time -->
-  <xs:complexType name="freebusyPropType">
+  <xs:complexType name="FreebusyPropType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:BasePropertyType">
@@ -454,6 +525,6 @@
     
   <!-- 3.8.2.7 Time Transparency -->
-  <xs:simpleType name="transpValueType">
-    <xs:restriction base="xs:string">
+  <xs:simpleType name="TranspValueType">
+    <xs:restriction base="xs:token">
       <xs:enumeration value="OPAQUE"/>
       <xs:enumeration value="TRANSPARENT"/>
@@ -461,11 +532,7 @@
   </xs:simpleType>
   
-  <xs:complexType name="transpPropType">
-    <xs:complexContent mixed="false">
-      <xs:extension base="xcal:BasePropertyType">
-        <xs:sequence>
-          <xs:element name="text" type="xcal:transpValueType"/>
-        </xs:sequence>
-      </xs:extension>
+  <xs:complexType name="TranspPropType">
+    <xs:complexContent mixed="false">
+      <xs:extension base="xcal:TextPropertyType"/>
     </xs:complexContent>
   </xs:complexType>
@@ -497,5 +564,5 @@
   <!-- 3.8.3 Time Zone Component Properties -->
   <!-- 3.8.3.1 Time Zone Identifier -->
-  <xs:complexType name="tzidPropType">
+  <xs:complexType name="TzidPropType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:TextPropertyType"/>
@@ -504,5 +571,5 @@
         
   <!-- 3.8.3.2 Time Zone Name -->
-  <xs:complexType name="tznamePropType">
+  <xs:complexType name="TznamePropType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:TextPropertyType"/>
@@ -511,5 +578,5 @@
     
   <!-- 3.8.3.3 Time Zone Offset From -->
-  <xs:complexType name="tzoffsetfromPropType">
+  <xs:complexType name="TzoffsetfromPropType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:UtcOffsetPropertyType"/>
@@ -518,5 +585,5 @@
     
   <!-- 3.8.3.4 Time Zone Offset To -->
-  <xs:complexType name="tzoffsettoPropType">
+  <xs:complexType name="TzoffsettoPropType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:UtcOffsetPropertyType"/>
@@ -525,5 +592,5 @@
     
   <!-- 3.8.3.5 Time Zone URL -->
-  <xs:complexType name="tzurlPropType">
+  <xs:complexType name="TzurlPropType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:UriPropertyType"/>
@@ -533,5 +600,5 @@
   <!-- 3.8.4 Relationship Component Properties -->
   <!-- 3.8.4.1 Attendee -->
-  <xs:complexType name="attendeePropType">
+  <xs:complexType name="AttendeePropType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:CalAddressPropertyType"/>
@@ -540,5 +607,5 @@
     
   <!-- 3.8.4.2 Contact -->
-  <xs:complexType name="contactPropType">
+  <xs:complexType name="ContactPropType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:TextPropertyType"/>
@@ -547,5 +614,5 @@
     
   <!-- 3.8.4.3 Organizer -->
-  <xs:complexType name="organizerPropType">
+  <xs:complexType name="OrganizerPropType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:CalAddressPropertyType"/>
@@ -554,5 +621,5 @@
     
   <!-- 3.8.4.4 Recurrence ID -->
-  <xs:complexType name="recurrence-idPropType">
+  <xs:complexType name="RecurrenceIdPropType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:DateDatetimePropertyType"/>
@@ -562,5 +629,5 @@
   <!-- 3.8.4.5 Related-To -->
   <!-- 3.8.4.6 Uniform Resource Locator -->
-  <xs:complexType name="urlPropType">
+  <xs:complexType name="UrlPropType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:UriPropertyType"/>
@@ -569,5 +636,5 @@
     
   <!-- 3.8.4.7 Unique Identifier -->
-  <xs:complexType name="uidPropType">
+  <xs:complexType name="UidPropType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:TextPropertyType"/>
@@ -577,5 +644,5 @@
   <!-- 3.8.5 Recurrence Component Properties -->
   <!-- 3.8.5.1 Exception Date/Times -->
-  <xs:complexType name="exdatePropType">
+  <xs:complexType name="ExdatePropType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:DateDatetimePropertyType"/>
@@ -584,5 +651,5 @@
     
   <!-- 3.8.5.2 Recurrence Date/Times -->
-  <xs:complexType name="rdatePropType">
+  <xs:complexType name="RdatePropType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:DateDatetimePropertyType"/>
@@ -590,5 +657,5 @@
   </xs:complexType>
     
-  <xs:complexType name="related-toPropType">
+  <xs:complexType name="RelatedToPropType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:TextPropertyType"/>
@@ -597,5 +664,5 @@
     
   <!-- 3.8.5.3 Recurrence Rule -->
-  <xs:complexType name="rrulePropType">
+  <xs:complexType name="RrulePropType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:RecurPropertyType"/>
@@ -604,5 +671,5 @@
     
   <!-- x.x.x.x Deprecated ExRule -->
-  <xs:complexType name="exrulePropType">
+  <xs:complexType name="ExrulePropType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:RecurPropertyType"/>
@@ -612,6 +679,6 @@
   <!-- 3.8.6 Alarm Component Properties -->
   <!-- 3.8.6.1 Action -->
-  <xs:simpleType name="actionValueType">
-    <xs:restriction base="xs:string">
+  <xs:simpleType name="ActionValueType">
+    <xs:restriction base="xs:token">
       <xs:enumeration value="AUDIO"/>
       <xs:enumeration value="DISPLAY"/>
@@ -620,16 +687,12 @@
   </xs:simpleType>
   
-  <xs:complexType name="actionPropType">
-    <xs:complexContent mixed="false">
-      <xs:extension base="xcal:BasePropertyType">
-        <xs:sequence>
-          <xs:element name="text" type="xcal:actionValueType"/>
-        </xs:sequence>
-      </xs:extension>
+  <xs:complexType name="ActionPropType">
+    <xs:complexContent mixed="false">
+      <xs:extension base="xcal:TextPropertyType"/>
     </xs:complexContent>
   </xs:complexType>
   
   <!-- 3.8.6.2 Repeat Count -->
-  <xs:complexType name="repeatPropType">
+  <xs:complexType name="RepeatPropType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:IntegerPropertyType"/>
@@ -638,5 +701,5 @@
   
   <!-- 3.8.6.3 Trigger -->
-  <xs:complexType name="triggerPropType">
+  <xs:complexType name="TriggerPropType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:BasePropertyType">
@@ -653,26 +716,26 @@
   <!-- 3.8.7 Change Management Component Properties -->
   <!-- 3.8.7.1 Date/Time Created -->
-  <xs:complexType name="createdPropType">
-    <xs:complexContent mixed="false">
-      <xs:extension base="xcal:DatetimePropertyType"/>
+  <xs:complexType name="CreatedPropType">
+    <xs:complexContent mixed="false">
+      <xs:extension base="xcal:UtcDatetimePropertyType"/>
     </xs:complexContent>
   </xs:complexType>
     
   <!-- 3.8.7.2 Date/Time Stamp -->
-  <xs:complexType name="dtstampPropType">
-    <xs:complexContent mixed="false">
-      <xs:extension base="xcal:DatetimePropertyType"/>
+  <xs:complexType name="DtstampPropType">
+    <xs:complexContent mixed="false">
+      <xs:extension base="xcal:UtcDatetimePropertyType"/>
     </xs:complexContent>
   </xs:complexType>
 
   <!-- 3.8.7.3 Last Modified -->
-  <xs:complexType name="last-modifiedPropType">
-    <xs:complexContent mixed="false">
-      <xs:extension base="xcal:DatetimePropertyType"/>
+  <xs:complexType name="LastModifiedPropType">
+    <xs:complexContent mixed="false">
+      <xs:extension base="xcal:UtcDatetimePropertyType"/>
     </xs:complexContent>
   </xs:complexType>
 
   <!-- 3.8.7.4 Sequence Number -->
-  <xs:complexType name="sequencePropType">
+  <xs:complexType name="SequencePropType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:IntegerPropertyType"/>
@@ -682,5 +745,5 @@
   <!-- 3.8.8 Miscellaneous Component Properties -->
   <!-- 3.8.8.3 Request Status -->
-  <xs:complexType name="request-statusPropType">
+  <xs:complexType name="RequestStatusPropType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:BasePropertyType">
Index: releases/bedework-3.7/resources/exsynchwsdefs/iCalendar-valtypes.xsd
===================================================================
--- trunk/resources/exsynchwsdefs/iCalendar-valtypes.xsd (revision 3063)
+++ releases/bedework-3.7/resources/exsynchwsdefs/iCalendar-valtypes.xsd (revision 3115)
@@ -15,7 +15,7 @@
   
 	<!-- 3.3.2 BOOLEAN -->
-	<xs:element name="boolean" type="xcal:booleanType" />
+	<xs:element name="boolean" type="xcal:BooleanType" />
   
-  <xs:simpleType name="booleanType">
+  <xs:simpleType name="BooleanType">
     <xs:restriction base="xs:token">
       <xs:enumeration value="TRUE"/>
@@ -25,9 +25,9 @@
   
 	<!-- 3.3.3 CAL-ADDRESS -->
-  <xs:simpleType name="cal-addressType">
+  <xs:simpleType name="CalAddressType">
     <xs:restriction base="xs:string"/>
   </xs:simpleType>
   
-  <xs:element name="cal-address" type="xcal:cal-addressType" />  
+  <xs:element name="cal-address" type="xcal:CalAddressType" />  
   
 	<!-- 3.3.4 DATE -->
@@ -36,4 +36,9 @@
 	<!-- 3.3.5 DATE-TIME -->
 	<xs:element name="date-time" type="xs:string"/>
+  
+  <!-- Patterns should allow us to restrict this 
+     e.g.     19980119T070000Z
+  -->
+  <xs:element name="utc-date-time" type="xs:string"/>
   
 	<!-- 3.3.6 DURATION 
@@ -44,5 +49,5 @@
   
 	<!-- 3.3.8 INTEGER -->
-	<xs:element name="integerType" type="xs:string"/>
+	<xs:element name="integer" type="xs:string"/>
   
 	<!-- 3.3.9 PERIOD -->
@@ -50,8 +55,7 @@
   
   <!-- 3.3.10 RECUR -->
-  <xs:element name="recur" type="xcal:recurType"/>
-  <xs:complexType name="recurType">
+  <xs:complexType name="RecurType">
     <xs:sequence>
-      <xs:element name="freq" type="xcal:freqRecurType"/>
+      <xs:element name="freq" type="xcal:FreqRecurType"/>
       <xs:sequence>
         <xs:choice>
@@ -66,13 +70,13 @@
       <xs:element name="byday" type="xs:string" maxOccurs="unbounded"/>
       <xs:element name="byyearday" type="xs:string" maxOccurs="unbounded"/>
-      <xs:element name="bymonthday" type="xcal:bymonthdayRecurType" maxOccurs="unbounded"/>
+      <xs:element name="bymonthday" type="xcal:BymonthdayRecurType" maxOccurs="unbounded"/>
       <xs:element name="byweekno" type="xs:string" maxOccurs="unbounded"/>
-      <xs:element name="bymonth" type="xcal:bymonthRecurType" maxOccurs="unbounded"/>
+      <xs:element name="bymonth" type="xcal:BymonthRecurType" maxOccurs="unbounded"/>
       <xs:element name="bysetpos" type="xs:integer" maxOccurs="unbounded"/>
-      <xs:element name="wkst" type="xcal:weekdayRecurType" />
+      <xs:element name="wkst" type="xcal:WeekdayRecurType" />
     </xs:sequence>
   </xs:complexType>
   
-	<xs:simpleType name="freqRecurType">
+	<xs:simpleType name="FreqRecurType">
 		<xs:restriction base="xs:token">
 			<xs:enumeration value="SECONDLY"/>
@@ -86,6 +90,7 @@
 	</xs:simpleType>
   
-  <xs:element name="until" type="xcal:untilRecurType"/>
-  <xs:complexType name="untilRecurType" >
+  <xs:element name="until" type="xcal:UntilRecurType"/>
+  
+  <xs:complexType name="UntilRecurType" >
     <xs:sequence>
       <xs:choice>
@@ -98,5 +103,5 @@
   <xs:element name="count" type="xs:integer"/>
   
-	<xs:simpleType name="weekdayRecurType">
+	<xs:simpleType name="WeekdayRecurType">
 		<xs:restriction base="xs:token">
 			<xs:enumeration value="SU"/>
@@ -110,5 +115,5 @@
 	</xs:simpleType>
   
-  <xs:simpleType name="bymonthdayRecurType">
+  <xs:simpleType name="BymonthdayRecurType">
     <xs:restriction base="xs:integer">
       <xs:minInclusive value="-31"/>
@@ -117,5 +122,5 @@
   </xs:simpleType>
   
-  <xs:simpleType name="bymonthRecurType">
+  <xs:simpleType name="BymonthRecurType">
     <xs:restriction base="xs:integer">
       <xs:minInclusive value="1"/>
@@ -131,16 +136,16 @@
   
 	<!-- 3.3.13 URI -->
-	<xs:simpleType name="uriType">
+	<xs:simpleType name="UriType">
     <xs:restriction base="xs:string"/>
   </xs:simpleType>
   
-  <xs:element name="uri" type="xcal:uriType" />  
+  <xs:element name="uri" type="xcal:UriType" />  
   
 	<!-- 3.3.14 UTC-OFFSET -->
-  <xs:simpleType name="utc-offsetType">
+  <xs:simpleType name="UtcOffsetType">
     <xs:restriction base="xs:string"/>
   </xs:simpleType>
   
-  <xs:element name="utc-offset" type="xcal:utc-offsetType" />  
+  <xs:element name="utc-offset" type="xcal:UtcOffsetType" />  
   
 </xs:schema>
Index: releases/bedework-3.7/resources/exsynchwsdefs/iCalendar-wscal-extensions.xsd
===================================================================
---  (revision )
+++ releases/bedework-3.7/resources/exsynchwsdefs/iCalendar-wscal-extensions.xsd (revision 3115)
@@ -1,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--OASIS WS-Calendar extensions to icalendar -->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+           xmlns:xcal="urn:ietf:params:xml:ns:icalendar-2.0" 
+           targetNamespace="urn:ietf:params:xml:ns:icalendar-2.0" 
+           elementFormDefault="qualified">
+
+  <xs:include schemaLocation="iCalendar-valtypes.xsd" />
+            
+  <!-- ===================== Properties =================================  -->
+  <xs:include schemaLocation="iCalendar-props.xsd" />
+            
+  <!-- ===================== Components =================================  -->
+  <xs:include schemaLocation="iCalendar.xsd" />
+          
+  <!-- =====================================================================
+       3.2 Property parameter definitions
+       ===================================================================== -->
+
+  <!-- Parameters that take a duration value -->
+  <xs:complexType name="DurationParameterType" >
+    <xs:complexContent mixed="false">
+      <xs:extension base="xcal:BaseParameterType">
+        <xs:sequence>
+          <xs:element ref="xcal:duration"/>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <!-- Gap is used in the LINK property -->
+  <xs:element name="gap" type="xcal:DurationParameterType" 
+              substitutionGroup="xcal:baseParameter" />
+
+  <!-- The following are used with attach -->
+  
+  <xs:element name="startbeforetolerance" type="xcal:DurationParameterType" 
+              substitutionGroup="xcal:baseParameter" />
+
+  <xs:element name="startaftertolerance" type="xcal:DurationParameterType" 
+              substitutionGroup="xcal:baseParameter" />
+
+  <xs:element name="endtbeforetolerance" type="xcal:DurationParameterType" 
+              substitutionGroup="xcal:baseParameter" />
+
+  <xs:element name="endaftertolerance" type="xcal:DurationParameterType" 
+              substitutionGroup="xcal:baseParameter" />
+
+  <xs:element name="durationlongtolerance" type="xcal:DurationParameterType" 
+              substitutionGroup="xcal:baseParameter" />
+
+  <xs:element name="durationshorttolerance" type="xcal:DurationParameterType" 
+              substitutionGroup="xcal:baseParameter" />
+
+  <xs:element name="granularity" type="xcal:DurationParameterType" 
+              substitutionGroup="xcal:baseParameter" />
+           
+  <!-- =====================================================================
+       3.4 Calendar Components
+       ===================================================================== -->  
+
+  <xs:complexType name="WsCalendarGluonType">
+    <xs:complexContent mixed="false">
+      <xs:extension base="xcal:BaseComponentType"/>
+    </xs:complexContent>
+  </xs:complexType>
+              
+  <xs:element name="x-wscalendar-gluon" type="xcal:WsCalendarGluonType"
+              substitutionGroup="xcal:baseComponent"/>
+
+  <!-- =====================================================================
+       3.7 Calendar Properties
+       ===================================================================== -->  
+
+  <xs:complexType name="WscalendarTypeType">
+    <xs:complexContent mixed="false">
+      <xs:extension base="xcal:TextPropertyType"/>
+    </xs:complexContent>
+  </xs:complexType>
+    
+  <xs:complexType name="WscalendarAttachType">
+    <xs:annotation>
+      <xs:documentation>types the content of the xCal attach element</xs:documentation>
+    </xs:annotation>
+    <xs:complexContent mixed="false">
+      <xs:extension base="xcal:BasePropertyType">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="artifact" block="">
+            <xs:complexType>
+              <xs:annotation>
+                <xs:documentation>The artifact is here for use in extending by other specifications, to to allow attributes from other namespaces to be added to ws-calendar-based schemas.</xs:documentation>
+              </xs:annotation>
+              <xs:complexContent>
+                <xs:restriction base="xs:anyType">
+                  <xs:anyAttribute namespace="##other" processContents="lax"/>
+                </xs:restriction>
+              </xs:complexContent>
+            </xs:complexType>
+          </xs:element>
+          <xs:element ref="xcal:uri"/>
+          <xs:element ref="xcal:text"/>
+        </xs:choice>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>  
+
+  <xs:element name="x-wscalendar-attach" 
+              type="xcal:WscalendarAttachType"
+              substitutionGroup="xcal:baseProperty" />
+
+  <xs:element name="x-wscalendar-type" 
+              type="xcal:WscalendarTypeType"
+              substitutionGroup="xcal:baseProperty" />
+</xs:schema>
Index: releases/bedework-3.7/resources/exsynchwsdefs/iCalendar.xsd
===================================================================
--- trunk/resources/exsynchwsdefs/iCalendar.xsd (revision 3037)
+++ releases/bedework-3.7/resources/exsynchwsdefs/iCalendar.xsd (revision 3115)
@@ -6,4 +6,13 @@
            targetNamespace="urn:ietf:params:xml:ns:icalendar-2.0" 
            elementFormDefault="qualified">
+            
+  <!-- ===================== Standard Extensions =======================  -->
+  <xs:include schemaLocation="iCalendar-link-extension.xsd" />
+            
+  <!-- ===================== Proprietary Extensions =======================  -->
+  <xs:include schemaLocation="iCalendar-bw-extensions.xsd" />
+  <xs:include schemaLocation="iCalendar-ms-extensions.xsd" />
+  <xs:include schemaLocation="iCalendar-wscal-extensions.xsd" />
+           
   <!-- =====================================================================
        3.4 Calendar Components
@@ -11,19 +20,6 @@
             
   <xs:include schemaLocation="iCalendar-props.xsd" />
-
-  <xs:complexType name="ArrayOfComponents">
-    <xs:choice maxOccurs="unbounded">
-      <xs:element name="vevent" type="xcal:veventType"/>
-      <xs:element name="vtodo" type="xcal:vtodoType"/>
-      <xs:element name="vjournal" type="xcal:vjournalType"/>
-      <xs:element name="vfreebusy" type="xcal:vfreebusyType"/>
-      <xs:element name="vtimezone" type="xcal:vtimezoneType"/>
-      <xs:element name="standard" type="xcal:standardType"/>
-      <xs:element name="daylight" type="xcal:daylightType"/>
-      <xs:element name="valarm" type="xcal:valarmType"/>
-    </xs:choice>
-  </xs:complexType>
           
-  <xs:complexType name="BaseComponentType">
+  <xs:complexType name="BaseComponentType" abstract="true" >
     <xs:sequence>
       <xs:element name="properties" type="xcal:ArrayOfProperties"/>
@@ -31,14 +27,46 @@
     </xs:sequence>
   </xs:complexType>
+
+  <xs:element name="baseComponent" type="xcal:BaseComponentType" />
+
+  <xs:complexType name="ArrayOfComponents">
+    <xs:sequence>
+      <xs:element ref="xcal:baseComponent" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:element name="vevent" type="xcal:VeventType"
+              substitutionGroup="xcal:baseComponent"/>
+              
+  <xs:element name="vtodo" type="xcal:VtodoType"
+              substitutionGroup="xcal:baseComponent"/>
+              
+  <xs:element name="vjournal" type="xcal:VjournalType"
+              substitutionGroup="xcal:baseComponent"/>
+              
+  <xs:element name="vfreebusy" type="xcal:VfreebusyType"
+              substitutionGroup="xcal:baseComponent"/>
+              
+  <xs:element name="vtimezone" type="xcal:VtimezoneType"
+              substitutionGroup="xcal:baseComponent"/>
+              
+  <xs:element name="standard" type="xcal:StandardType"
+              substitutionGroup="xcal:baseComponent"/>
+              
+  <xs:element name="daylight" type="xcal:DaylightType"
+              substitutionGroup="xcal:baseComponent"/>
+              
+  <xs:element name="valarm" type="xcal:ValarmType"
+              substitutionGroup="xcal:baseComponent"/>
   
 	<!-- 3.4 iCalendar Stream -->
-	<xs:complexType name="icalendarType">
+	<xs:complexType name="IcalendarType">
 		<xs:sequence>
-			<xs:element name="vcalendar" type="xcal:vcalendarType" maxOccurs="unbounded"/>
+			<xs:element name="vcalendar" type="xcal:VcalendarType" maxOccurs="unbounded"/>
 		</xs:sequence>
 	</xs:complexType>
   
 	<!-- 3.6 Calendar Components -->
-	<xs:complexType name="vcalendarType">
+	<xs:complexType name="VcalendarType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:BaseComponentType"/>
@@ -47,5 +75,5 @@
   
 	<!-- 3.6.1 Event Component -->
-  <xs:complexType name="veventType">
+  <xs:complexType name="VeventType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:BaseComponentType"/>
@@ -54,5 +82,5 @@
 
 	<!-- 3.6.2 To-do Component -->
-  <xs:complexType name="vtodoType">
+  <xs:complexType name="VtodoType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:BaseComponentType"/>
@@ -61,5 +89,5 @@
 
 	<!-- 3.6.3 Journal Component -->
-  <xs:complexType name="vjournalType">
+  <xs:complexType name="VjournalType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:BaseComponentType"/>
@@ -68,5 +96,5 @@
   
 	<!-- 3.6.4 Free/Busy Component -->
-  <xs:complexType name="vfreebusyType">
+  <xs:complexType name="VfreebusyType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:BaseComponentType"/>
@@ -75,5 +103,5 @@
 
 	<!-- 3.6.5 timezone -->
-  <xs:complexType name="vtimezoneType">
+  <xs:complexType name="VtimezoneType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:BaseComponentType"/>
@@ -81,5 +109,5 @@
   </xs:complexType>
 
-  <xs:complexType name="standardType">
+  <xs:complexType name="StandardType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:BaseComponentType"/>
@@ -87,5 +115,5 @@
   </xs:complexType>
 
-  <xs:complexType name="daylightType">
+  <xs:complexType name="DaylightType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:BaseComponentType"/>
@@ -94,5 +122,5 @@
 
 	<!-- 3.6.6 Alarm Component -->
-  <xs:complexType name="valarmType">
+  <xs:complexType name="ValarmType">
     <xs:complexContent mixed="false">
       <xs:extension base="xcal:BaseComponentType"/>
Index: releases/bedework-3.7/resources/exsynchwsdefs/patch-errors.xsd
===================================================================
---  (revision )
+++ releases/bedework-3.7/resources/exsynchwsdefs/patch-errors.xsd (revision 3115)
@@ -1,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This is the schema for the XML patch errors defined in RFC 5261
+-->
+
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            xmlns:tns="urn:ietf:params:xml:ns:patch-ops-error"
+            targetNamespace="urn:ietf:params:xml:ns:patch-ops-error"
+            elementFormDefault="qualified"
+            attributeFormDefault="unqualified">
+
+  <!-- This import brings in the XML language attribute xml:lang-->
+  <xsd:import namespace="http://www.w3.org/XML/1998/namespace"
+              schemaLocation="http://www.w3.org/2001/xml.xsd"/>
+
+  <!-- ROOT document element for signaling patch-ops errors -->
+  <xsd:element name="patch-ops-error">
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:any namespace="##any" processContents="lax"
+                 minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+      <xsd:anyAttribute processContents="lax"/>
+    </xsd:complexType>
+  </xsd:element>
+
+  <!-- patch-ops error elements:
+       not intended to be used as root documnet elements -->
+  <xsd:element name="invalid-attribute-value"
+               type="tns:patch-error"/>
+  <xsd:element name="invalid-character-set"
+               type="tns:patch-error-simple"/>
+  <xsd:element name="invalid-diff-format"
+               type="tns:patch-error-simple"/>
+  <xsd:element name="invalid-entity-declaration"
+               type="tns:patch-error"/>
+  <xsd:element name="invalid-namespace-prefix"
+               type="tns:patch-error"/>
+  <xsd:element name="invalid-namespace-uri"
+               type="tns:patch-error"/>
+  <xsd:element name="invalid-node-types"
+               type="tns:patch-error"/>
+  <xsd:element name="invalid-patch-directive"
+               type="tns:patch-error"/>
+  <xsd:element name="invalid-root-element-operation"
+               type="tns:patch-error"/>
+  <xsd:element name="invalid-xml-prolog-operation"
+               type="tns:patch-error"/>
+  <xsd:element name="invalid-whitespace-directive"
+               type="tns:patch-error"/>
+  <xsd:element name="unlocated-node"
+               type="tns:patch-error"/>
+  <xsd:element name="unsupported-id-function"
+               type="tns:patch-error"/>
+  <xsd:element name="unsupported-xml-id"
+               type="tns:patch-error"/>
+
+  <!-- simple patch-ops error type  -->
+  <xsd:complexType name="patch-error-simple">
+    <xsd:attribute name="phrase" type="xsd:string"/>
+    <xsd:attribute ref="xml:lang"/>
+    <xsd:anyAttribute processContents="lax"/>
+  </xsd:complexType>
+
+  <!-- error type which includes patch operation -->
+  <xsd:complexType name="patch-error">
+    <xsd:sequence>
+      <xsd:any namespace="##any" processContents="lax"/>
+    </xsd:sequence>
+    <xsd:attribute name="phrase" type="xsd:string"/>
+    <xsd:attribute ref="xml:lang"/>
+    <xsd:anyAttribute processContents="lax"/>
+  </xsd:complexType>
+</xsd:schema>
Index: releases/bedework-3.7/resources/exsynchwsdefs/patch.xsd
===================================================================
---  (revision )
+++ releases/bedework-3.7/resources/exsynchwsdefs/patch.xsd (revision 3115)
@@ -1,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE schema [
+  <!ENTITY ncname "\i\c*">
+  <!ENTITY qname  "(&ncname;:)?&ncname;">
+  <!ENTITY aname  "@&qname;">
+  <!ENTITY pos    "\[\d+\]">
+  <!ENTITY attr   "\[&aname;='(.)*'\]|\[&aname;=&quot;(.)*&quot;\]">
+  <!ENTITY valueq "\[(&qname;|\.)=&quot;(.)*&quot;\]">
+  <!ENTITY value  "\[(&qname;|\.)='(.)*'\]|&valueq;">
+  <!ENTITY cond   "&attr;|&value;|&pos;">
+  <!ENTITY step   "(&qname;|\*)(&cond;)*">
+  <!ENTITY piq    "processing-instruction\((&quot;&ncname;&quot;)\)">
+  <!ENTITY pi     "processing-instruction\(('&ncname;')?\)|&piq;">
+  <!ENTITY id     "id\(('&ncname;')?\)|id\((&quot;&ncname;&quot;)?\)">
+  <!ENTITY com    "comment\(\)">
+  <!ENTITY text   "text\(\)">
+  <!ENTITY nspa   "namespace::&ncname;">
+  <!ENTITY cnodes "(&text;(&pos;)?)|(&com;(&pos;)?)|((&pi;)(&pos;)?)">
+  <!ENTITY child  "&cnodes;|&step;">
+  <!ENTITY last   "(&child;|&aname;|&nspa;)">
+ ]>
+<!-- This is the schema for the XML patch operations defined in RFC 5261
+-->
+
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+            xmlns="urn:ietf:params:xml:ns:pidf-diff" 
+            targetNamespace="urn:ietf:params:xml:ns:pidf-diff" 
+            elementFormDefault="qualified">
+  <xsd:simpleType name="xpath">
+    <xsd:restriction base="xsd:string">
+      <xsd:pattern
+             value="(/)?((&id;)((/&step;)*(/&last;))?|(&step;/)*(&last;))"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  
+  <xsd:simpleType name="xpath-add">
+    <xsd:restriction base="xsd:string">
+      <xsd:pattern
+             value="(/)?((&id;)((/&step;)*(/&child;))?|(&step;/)*(&child;))"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  
+  <xsd:simpleType name="pos">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="before"/>
+      <xsd:enumeration value="after"/>
+      <xsd:enumeration value="prepend"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  
+  <xsd:simpleType name="type">
+    <xsd:restriction base="xsd:string">
+      <xsd:pattern value="&aname;|&nspa;"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  
+  <xsd:complexType name="add">
+    <xsd:complexContent mixed="true">
+      <xsd:restriction base="xsd:anyType">
+       <xsd:sequence>
+         <xsd:any processContents="lax" namespace="##any"
+                  minOccurs="0" maxOccurs="unbounded"/>
+       </xsd:sequence>
+       <xsd:attribute name="sel" type="xpath-add"
+                    use="required"/>
+       <xsd:attribute name="pos" type="pos"/>
+       <xsd:attribute name="type" type="type"/>
+     </xsd:restriction>
+    </xsd:complexContent>
+  </xsd:complexType>
+  
+  <xsd:complexType name="replace">
+    <xsd:complexContent mixed="true">
+      <xsd:restriction base="xsd:anyType">
+        <xsd:sequence>
+          <xsd:any processContents="lax" namespace="##any"
+                   minOccurs="0" maxOccurs="1"/>
+        </xsd:sequence>
+        <xsd:attribute name="sel" type="xpath" use="required"/>
+      </xsd:restriction>
+    </xsd:complexContent>
+  </xsd:complexType>
+  
+  <xsd:simpleType name="ws">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="before"/>
+      <xsd:enumeration value="after"/>
+      <xsd:enumeration value="both"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  
+  <xsd:complexType name="remove">
+    <xsd:attribute name="sel" type="xpath" use="required"/>
+    <xsd:attribute name="ws" type="ws"/>
+  </xsd:complexType>
+</xsd:schema>
+           
Index: releases/bedework-3.7/resources/exsynchwsdefs/wsmessages.xsd
===================================================================
--- trunk/resources/exsynchwsdefs/wsmessages.xsd (revision 3063)
+++ releases/bedework-3.7/resources/exsynchwsdefs/wsmessages.xsd (revision 3115)
@@ -3,5 +3,6 @@
         xmlns:tns="http://www.bedework.org/exsynch/wsmessages" 
         xmlns:xcal="urn:ietf:params:xml:ns:icalendar-2.0"
-        xmlns:xcup="urn:ietf:params:xml:ns:icalendar-upd-1.0" 
+        xmlns:p="urn:ietf:params:xml:ns:pidf-diff" 
+        xmlns:perr="urn:ietf:params:xml:ns:patch-ops-error" 
         targetNamespace="http://www.bedework.org/exsynch/wsmessages" 
         elementFormDefault="qualified">
@@ -9,7 +10,10 @@
   <import schemaLocation="iCalendar.xsd" 
           namespace="urn:ietf:params:xml:ns:icalendar-2.0" />
-        
-  <import schemaLocation="iCalendar-update.xsd" 
-          namespace="urn:ietf:params:xml:ns:icalendar-upd-1.0" />
+
+  <!-- The schemas for RFC 5261 patch operations and errors. -->        
+  <import schemaLocation="patch.xsd"  
+          namespace="urn:ietf:params:xml:ns:pidf-diff" />
+  <import schemaLocation="patch-errors.xsd" 
+          namespace="urn:ietf:params:xml:ns:patch-ops-error" />
           
   <!-- Schema for messages passed from exsynch processor to the remote service. -->
@@ -269,5 +273,5 @@
       <extension base="tns:base-synch-entity-request">
         <sequence>
-          <element name="icalendar" type="xcal:icalendarType" />
+          <element name="icalendar" type="xcal:IcalendarType" />
         </sequence>
       </extension>
@@ -313,5 +317,5 @@
     </annotation>
     <sequence>
-      <element name="icalendar" type="xcal:icalendarType" />
+      <element name="icalendar" type="xcal:IcalendarType" />
       <element name="status" type="tns:StatusType" />
       <element name="message" type="string" />
@@ -332,5 +336,9 @@
       <extension base="tns:base-synch-entity-request">
         <sequence>
-          <element ref="xcup:updates" />
+          <choice>
+            <element name="add" type="p:add" />
+            <element name="replace" type="p:replace" />
+            <element name="remove" type="p:remove" />
+          </choice>
         </sequence>
       </extension>
@@ -348,4 +356,5 @@
     <sequence>
       <element name="status" type="tns:StatusType" />
+      <element ref="perr:patch-ops-error" />
       <element name="message" type="string" />
     </sequence>