Index: trunk/config/bwbuild/jboss-postgresql/build.properties
===================================================================
--- trunk/config/bwbuild/jboss-postgresql/build.properties (revision 3045)
+++ trunk/config/bwbuild/jboss-postgresql/build.properties (revision 3055)
@@ -19,8 +19,14 @@
 org.bedework.version=3.6
 org.bedework.access.version=3.6
+org.bedework.bwtools.version=3.6
 org.bedework.caldav.version=3.6
+org.bedework.caldavtest.version=3.6
 org.bedework.calendarapi.version=3.6
 org.bedework.davutil.version=3.6
+org.bedework.dumprestore.version=3.6
+org.bedework.indexer.version=3.6
 org.bedework.rpiutil.version=3.6
+org.bedework.testsuite.version=3.6
+org.bedework.webapps.version=3.6
 org.bedework.webdav.version=3.6
 
Index: trunk/deployment/caldavTest/shellscr/appjars.xml
===================================================================
--- trunk/deployment/caldavTest/shellscr/appjars.xml (revision 2618)
+++ trunk/deployment/caldavTest/shellscr/appjars.xml (revision 3055)
@@ -12,5 +12,5 @@
       <getJar lib="${org.bedework.temp.extrajars.dir}"
               libcache="${org.bedework.libcache.dir}"
-              name="caldavtest" version="3.6"
+              name="caldavtest" version="${org.bedework.caldavtest.version}"
               projecthome="${bw.project.home}/projects/caldavTest" />
     </sequential>
Index: trunk/deployment/dumprestore/shellscr/appjars.xml
===================================================================
--- trunk/deployment/dumprestore/shellscr/appjars.xml (revision 2791)
+++ trunk/deployment/dumprestore/shellscr/appjars.xml (revision 3055)
@@ -12,15 +12,15 @@
       <getJar lib="${org.bedework.temp.extrajars.dir}"
               libcache="${org.bedework.libcache.dir}"
-              name="bw-cdvutil" version="3.6"
+              name="bw-cdvutil" version="${org.bedework.caldav.version}"
               projecthome="${bw.project.home}/projects/caldav" />
 
       <getJar lib="${org.bedework.temp.extrajars.dir}"
               libcache="${org.bedework.libcache.dir}"
-              name="bw-indexer" version="3.6"
+              name="bw-indexer" version="${org.bedework.indexer.version}"
               projecthome="${bw.project.home}/projects/indexer" />
 
       <getJar lib="${org.bedework.temp.extrajars.dir}"
               libcache="${org.bedework.libcache.dir}"
-              name="bw-dumpres" version="3.6"
+              name="bw-dumpres" version="${org.bedework.dumprestore.version}"
               projecthome="${bw.project.home}/projects/dumprestore" />
     </sequential>
Index: trunk/deployment/feeder/webapp/appjars.xml
===================================================================
--- trunk/deployment/feeder/webapp/appjars.xml (revision 2618)
+++ trunk/deployment/feeder/webapp/appjars.xml (revision 3055)
@@ -12,10 +12,10 @@
       <getJar lib="${org.bedework.temp.extrajars.dir}"
               libcache="${org.bedework.libcache.dir}"
-              name="bw-cdvutil" version="3.6"
+              name="bw-cdvutil" version="${org.bedework.caldav.version}"
               projecthome="${bw.project.home}/projects/caldav" />
 
       <getJar lib="${org.bedework.temp.extrajars.dir}"
               libcache="${org.bedework.libcache.dir}"
-              name="bw-webcommon" version="3.6"
+              name="bw-webcommon" version="${org.bedework.webapps.version}"
               projecthome="${bw.project.home}/projects/webapps" />
     </sequential>
Index: trunk/deployment/genkeys/shellscr/appjars.xml
===================================================================
--- trunk/deployment/genkeys/shellscr/appjars.xml (revision 3001)
+++ trunk/deployment/genkeys/shellscr/appjars.xml (revision 3055)
@@ -10,11 +10,4 @@
       <mkdir dir="${org.bedework.temp.extrajars.dir}" />
 
-    	<!--
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-              name="bw-cdvutil" version="3.6"
-              projecthome="${bw.project.home}/projects/caldav" />
-
--->
     </sequential>
  </macrodef>
Index: trunk/deployment/indexer/shellscr/appjars.xml
===================================================================
--- trunk/deployment/indexer/shellscr/appjars.xml (revision 2342)
+++ trunk/deployment/indexer/shellscr/appjars.xml (revision 3055)
@@ -12,10 +12,10 @@
       <getJar lib="${org.bedework.temp.extrajars.dir}"
               libcache="${org.bedework.libcache.dir}"
-              name="bw-cdvutil" version="3.6"
+              name="bw-cdvutil" version="${org.bedework.caldav.version}"
               projecthome="${bw.project.home}/projects/caldav" />
 
       <getJar lib="${org.bedework.temp.extrajars.dir}"
               libcache="${org.bedework.libcache.dir}"
-              name="bw-indexer" version="3.6"
+              name="bw-indexer" version="${org.bedework.indexer.version}"
               projecthome="${bw.project.home}/projects/indexer" />
     </sequential>
Index: trunk/deployment/inoutsched/shellscr/appjars.xml
===================================================================
--- trunk/deployment/inoutsched/shellscr/appjars.xml (revision 2859)
+++ trunk/deployment/inoutsched/shellscr/appjars.xml (revision 3055)
@@ -12,15 +12,15 @@
       <getJar lib="${org.bedework.temp.extrajars.dir}"
               libcache="${org.bedework.libcache.dir}"
-              name="bw-cdvutil" version="3.6"
+              name="bw-cdvutil" version="${org.bedework.caldav.version}"
               projecthome="${bw.project.home}/projects/caldav" />
 
       <getJar lib="${org.bedework.temp.extrajars.dir}"
               libcache="${org.bedework.libcache.dir}"
-              name="bw-inoutsched" version="3.6"
+              name="bw-inoutsched" version="${org.bedework.calendarapi.version}"
               projecthome="${bw.project.home}/projects/calendarapi" />
 
       <getJar lib="${org.bedework.temp.extrajars.dir}"
               libcache="${org.bedework.libcache.dir}"
-              name="bw-webdavserver" version="3.6"
+              name="bw-webdavserver" version="${org.bedework.webdav.version}"
               projecthome="${bw.project.home}/projects/webdav" />
     </sequential>
Index: trunk/deployment/monitor/shellscr/appjars.xml
===================================================================
--- trunk/deployment/monitor/shellscr/appjars.xml (revision 2787)
+++ trunk/deployment/monitor/shellscr/appjars.xml (revision 3055)
@@ -10,11 +10,4 @@
       <mkdir dir="${org.bedework.temp.extrajars.dir}" />
 
-    	<!--
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-              name="bw-cdvutil" version="3.6"
-              projecthome="${bw.project.home}/projects/caldav" />
-
--->
     </sequential>
  </macrodef>
Index: trunk/deployment/publiccaldav/webapp/appjars.xml
===================================================================
--- trunk/deployment/publiccaldav/webapp/appjars.xml (revision 3037)
+++ trunk/deployment/publiccaldav/webapp/appjars.xml (revision 3055)
@@ -12,5 +12,5 @@
       <getJar lib="${org.bedework.temp.extrajars.dir}"
               libcache="${org.bedework.libcache.dir}"
-              name="bw-caldav" version="3.6"
+              name="bw-caldav" version="${org.bedework.caldav.version}"
               projecthome="${bw.project.home}/projects/caldavimpl" />
 
Index: trunk/deployment/publiccalws/webapp/appjars.xml
===================================================================
--- trunk/deployment/publiccalws/webapp/appjars.xml (revision 2999)
+++ trunk/deployment/publiccalws/webapp/appjars.xml (revision 3055)
@@ -12,20 +12,20 @@
       <getJar lib="${org.bedework.temp.extrajars.dir}"
               libcache="${org.bedework.libcache.dir}"
-              name="bw-caldav" version="3.6"
+              name="bw-caldav" version="${org.bedework.caldav.version}"
               projecthome="${bw.project.home}/projects/caldavimpl" />
 
       <getJar lib="${org.bedework.temp.extrajars.dir}"
               libcache="${org.bedework.libcache.dir}"
-              name="bw-cdvutil" version="3.6"
+              name="bw-cdvutil" version="${org.bedework.caldav.version}"
               projecthome="${bw.project.home}/projects/caldav" />
 
       <getJar lib="${org.bedework.temp.extrajars.dir}"
               libcache="${org.bedework.libcache.dir}"
-              name="bw-cdvserver" version="3.6"
+              name="bw-cdvserver" version="${org.bedework.caldav.version}"
               projecthome="${bw.project.home}/projects/caldav" />
 
       <getJar lib="${org.bedework.temp.extrajars.dir}"
               libcache="${org.bedework.libcache.dir}"
-              name="bw-webdavserver" version="3.6"
+              name="bw-webdavserver" version="${org.bedework.webdav.version}"
               projecthome="${bw.project.home}/projects/webdav" />
     </sequential>
Index: trunk/deployment/sysevlog/shellscr/appjars.xml
===================================================================
--- trunk/deployment/sysevlog/shellscr/appjars.xml (revision 2342)
+++ trunk/deployment/sysevlog/shellscr/appjars.xml (revision 3055)
@@ -12,11 +12,13 @@
       <getJar lib="${org.bedework.temp.extrajars.dir}"
               libcache="${org.bedework.libcache.dir}"
-              name="bw-cdvutil" version="3.6"
+              name="bw-cdvutil" version="${org.bedework.caldav.version}"
               projecthome="${bw.project.home}/projects/caldav" />
 
+    	<!--
       <getJar lib="${org.bedework.temp.extrajars.dir}"
               libcache="${org.bedework.libcache.dir}"
               name="bw-crawler" version="3.6"
               projecthome="${bw.project.home}/projects/bwcrawler" />
+    	-->
     </sequential>
  </macrodef>
Index: trunk/deployment/testsuite/shellscr/appjars.xml
===================================================================
--- trunk/deployment/testsuite/shellscr/appjars.xml (revision 2618)
+++ trunk/deployment/testsuite/shellscr/appjars.xml (revision 3055)
@@ -16,15 +16,15 @@
       <getJar lib="${org.bedework.temp.extrajars.dir}"
               libcache="${org.bedework.libcache.dir}"
-              name="bw-cdvutil" version="3.6"
+              name="bw-cdvutil" version="${org.bedework.caldav.version}"
               projecthome="${bw.project.home}/projects/caldav" />
 
       <getJar lib="${org.bedework.temp.extrajars.dir}"
               libcache="${org.bedework.libcache.dir}"
-              name="bw-appcommon" version="3.6"
+              name="bw-appcommon" version="${org.bedework.webapps.version}"
               projecthome="${bw.project.home}/projects/webapps" />
 
       <getJar lib="${org.bedework.temp.extrajars.dir}"
               libcache="${org.bedework.libcache.dir}"
-              name="bw-testsuite" version="3.6"
+              name="bw-testsuite" version="${org.bedework.testsuite.version}"
               projecthome="${bw.project.home}/projects/testsuite" />
     </sequential>
Index: trunk/deployment/usercaldav/webapp/appjars.xml
===================================================================
--- trunk/deployment/usercaldav/webapp/appjars.xml (revision 3037)
+++ trunk/deployment/usercaldav/webapp/appjars.xml (revision 3055)
@@ -12,5 +12,5 @@
       <getJar lib="${org.bedework.temp.extrajars.dir}"
               libcache="${org.bedework.libcache.dir}"
-              name="bw-caldav" version="3.6"
+              name="bw-caldav" version="${org.bedework.caldav.version}"
               projecthome="${bw.project.home}/projects/caldavimpl" />
 
Index: trunk/deployment/usercalws/webapp/appjars.xml
===================================================================
--- trunk/deployment/usercalws/webapp/appjars.xml (revision 2999)
+++ trunk/deployment/usercalws/webapp/appjars.xml (revision 3055)
@@ -12,20 +12,20 @@
       <getJar lib="${org.bedework.temp.extrajars.dir}"
               libcache="${org.bedework.libcache.dir}"
-              name="bw-caldav" version="3.6"
+              name="bw-caldav" version="${org.bedework.caldav.version}"
               projecthome="${bw.project.home}/projects/caldavimpl" />
 
       <getJar lib="${org.bedework.temp.extrajars.dir}"
               libcache="${org.bedework.libcache.dir}"
-              name="bw-cdvutil" version="3.6"
+              name="bw-cdvutil" version="${org.bedework.caldav.version}"
               projecthome="${bw.project.home}/projects/caldav" />
 
       <getJar lib="${org.bedework.temp.extrajars.dir}"
               libcache="${org.bedework.libcache.dir}"
-              name="bw-cdvserver" version="3.6"
+              name="bw-cdvserver" version="${org.bedework.caldav.version}"
               projecthome="${bw.project.home}/projects/caldav" />
 
       <getJar lib="${org.bedework.temp.extrajars.dir}"
               libcache="${org.bedework.libcache.dir}"
-              name="bw-webdavserver" version="3.6"
+              name="bw-webdavserver" version="${org.bedework.webdav.version}"
               projecthome="${bw.project.home}/projects/webdav" />
     </sequential>
Index: trunk/deployment/webconfig/webapp/appjars.xml
===================================================================
--- trunk/deployment/webconfig/webapp/appjars.xml (revision 2618)
+++ trunk/deployment/webconfig/webapp/appjars.xml (revision 3055)
@@ -12,10 +12,10 @@
       <getJar lib="${org.bedework.temp.extrajars.dir}"
               libcache="${org.bedework.libcache.dir}"
-              name="bw-webconfig" version="3.6"
+              name="bw-webconfig" version="${org.bedework.webapps.version}"
               projecthome="${bw.project.home}/projects/webapps" />
 
       <getJar lib="${org.bedework.temp.extrajars.dir}"
               libcache="${org.bedework.libcache.dir}"
-              name="bw-webcommon" version="3.6"
+              name="bw-webcommon" version="${org.bedework.webapps.version}"
               projecthome="${bw.project.home}/projects/webapps" />
     </sequential>
Index: trunk/resources/exsynchwsdefs/iCalendar-bw-extensions.xsd
===================================================================
---  (revision )
+++ trunk/resources/exsynchwsdefs/iCalendar-bw-extensions.xsd (revision 3055)
@@ -1,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Bedework 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">
+
+  <!-- =====================================================================
+       3.7 Calendar Properties
+       ===================================================================== -->  
+            
+  <!-- ===================== Properties =================================  -->
+  <xs:include schemaLocation="iCalendar-props.xsd" />
+
+  <xs:element name="x-bedework-exsynch-endtzid" 
+              type="xcal:x-bw-exsynch-endtzidPropType"
+              substitutionGroup="xcal:base-property" />
+
+  <xs:element name="x-bedework-exsynch-lastmod" 
+              type="xcal:x-bw-exsynch-lastmodPropType"
+              substitutionGroup="xcal:base-property" />
+
+  <xs:element name="x-bedework-exsynch-organizer" 
+              type="xcal:organizerPropType"
+              substitutionGroup="xcal:base-property" />
+
+  <xs:element name="x-bedework-exsynch-starttzid" 
+              type="xcal:x-bw-exsynch-starttzidPropType"
+              substitutionGroup="xcal:base-property" />
+  
+  <xs:complexType name="x-bw-exsynch-endtzidPropType">
+    <xs:complexContent mixed="false">
+      <xs:extension base="xcal:TextPropertyType"/>
+    </xs:complexContent>
+  </xs:complexType>
+  
+  <xs:complexType name="x-bw-exsynch-lastmodPropType">
+    <xs:complexContent mixed="false">
+      <xs:extension base="xcal:TextPropertyType"/>
+    </xs:complexContent>
+  </xs:complexType>
+  
+  <xs:complexType name="x-bw-exsynch-starttzidPropType">
+    <xs:complexContent mixed="false">
+      <xs:extension base="xcal:TextPropertyType"/>
+    </xs:complexContent>
+  </xs:complexType>
+</xs:schema>
Index: trunk/resources/exsynchwsdefs/iCalendar-ms-extensions.xsd
===================================================================
---  (revision )
+++ trunk/resources/exsynchwsdefs/iCalendar-ms-extensions.xsd (revision 3055)
@@ -1,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Bedework 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">
+
+  <!-- =====================================================================
+       3.7 Calendar Properties
+       ===================================================================== -->  
+            
+  <!-- ===================== Properties =================================  -->
+  <xs:include schemaLocation="iCalendar-props.xsd" />
+
+  <xs:element name="x-microsoft-cdo-busystatus" 
+              type="xcal:x-ms-cdo-busystatusPropType"
+              substitutionGroup="xcal:base-property" />
+
+  <xs:element name="x-microsoft-cdo-intendedstatus" 
+              type="xcal:x-ms-cdo-intendedstatusPropType"
+              substitutionGroup="xcal:base-property" />
+  
+  <xs:complexType name="x-ms-cdo-busystatusPropType">
+    <xs:complexContent mixed="false">
+      <xs:extension base="xcal:TextPropertyType"/>
+    </xs:complexContent>
+  </xs:complexType>
+  
+  <xs:complexType name="x-ms-cdo-intendedstatusPropType">
+    <xs:complexContent mixed="false">
+      <xs:extension base="xcal:TextPropertyType"/>
+    </xs:complexContent>
+  </xs:complexType>
+</xs:schema>
Index: trunk/resources/exsynchwsdefs/iCalendar-props.xsd
===================================================================
--- trunk/resources/exsynchwsdefs/iCalendar-props.xsd (revision 3053)
+++ trunk/resources/exsynchwsdefs/iCalendar-props.xsd (revision 3055)
@@ -13,4 +13,8 @@
   <!-- ===================== 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">
@@ -31,4 +35,6 @@
               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"
@@ -282,4 +288,5 @@
 
   <!-- 3.8.1.3 Classification -->
+  <!-- Would like something lie this but not extensible
   <xs:simpleType name="classValueType">
     <xs:restriction base="xs:string">
@@ -289,5 +296,5 @@
     </xs:restriction>
   </xs:simpleType>
-  
+   
   <xs:complexType name="classPropType">
     <xs:complexContent mixed="false">
@@ -299,5 +306,12 @@
     </xs:complexContent>
   </xs:complexType>
-  
+ -->
+  
+  <xs:complexType name="classPropType">
+    <xs:complexContent mixed="false">
+      <xs:extension base="xcal:TextPropertyType"/>
+    </xs:complexContent>
+  </xs:complexType>
+    
   <!-- 3.8.1.4 Comment -->
   <xs:complexType name="commentPropType">