Changeset 3045

Show
Ignore:
Timestamp:
11/10/10 22:37:50
Author:
douglm
Message:

More versions in build.properties files.

More debugging in subscription refresh code.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/config/bwbuild/default/build.properties

    r3037 r3045  
    1818# Version we are building and including 
    1919org.bedework.version=3.6 
     20org.bedework.access.version=3.6 
    2021org.bedework.caldav.version=3.6 
     22org.bedework.calendarapi.version=3.6 
     23org.bedework.davutil.version=3.6 
     24org.bedework.rpiutil.version=3.6 
    2125org.bedework.webdav.version=3.6 
    2226 
  • trunk/config/bwbuild/jboss-h2/build.properties

    r3037 r3045  
    1818# Version we are building and including 
    1919org.bedework.version=3.6 
     20org.bedework.access.version=3.6 
    2021org.bedework.caldav.version=3.6 
     22org.bedework.calendarapi.version=3.6 
     23org.bedework.davutil.version=3.6 
     24org.bedework.rpiutil.version=3.6 
    2125org.bedework.webdav.version=3.6 
    2226 
  • trunk/config/bwbuild/jboss-mysql/build.properties

    r3037 r3045  
    1818# Version we are building and including 
    1919org.bedework.version=3.6 
     20org.bedework.access.version=3.6 
    2021org.bedework.caldav.version=3.6 
     22org.bedework.calendarapi.version=3.6 
     23org.bedework.davutil.version=3.6 
     24org.bedework.rpiutil.version=3.6 
    2125org.bedework.webdav.version=3.6 
    2226 
  • trunk/config/bwbuild/jboss-postgresql/build.properties

    r3037 r3045  
    1818# Version we are building and including 
    1919org.bedework.version=3.6 
     20org.bedework.access.version=3.6 
    2021org.bedework.caldav.version=3.6 
     22org.bedework.calendarapi.version=3.6 
     23org.bedework.davutil.version=3.6 
     24org.bedework.rpiutil.version=3.6 
    2125org.bedework.webdav.version=3.6 
    2226 
  • trunk/deployment/webadmin/webapp/appjars.xml

    r2618 r3045  
    1010      <mkdir dir="${org.bedework.temp.extrajars.dir}" /> 
    1111 
     12      <!-- ======================== This project =========================== --> 
     13       
    1214      <getJar lib="${org.bedework.temp.extrajars.dir}" 
    1315              libcache="${org.bedework.libcache.dir}" 
    14               name="bw-cdvutil" version="3.6
    15               projecthome="${bw.project.home}/projects/caldav" /> 
     16              name="bw-webcommon" version="${org.bedework.webapps.version}
     17              projecthome="${bw.project.home}/projects/webapps" /> 
    1618 
     19      <!-- ======================= Other projects ========================== --> 
     20       
    1721      <getJar lib="${org.bedework.temp.extrajars.dir}" 
    1822              libcache="${org.bedework.libcache.dir}" 
    19               name="bw-webcommon" version="3.6" 
    20               projecthome="${bw.project.home}/projects/webapps" /> 
     23              name="rpiaccess" version="${org.bedework.access.version}"  
     24              projecthome="${bw.project.home}/projects/access" /> 
     25       
     26      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     27              libcache="${org.bedework.libcache.dir}" 
     28              name="bw-cdvutil" version="${org.bedework.caldav.version}"  
     29              projecthome="${bw.project.home}/projects/caldav" /> 
     30       
     31      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     32              libcache="${org.bedework.libcache.dir}" 
     33              name="bw-annotations" version="${org.bedework.calendarapi.version}"  
     34              projecthome="${bw.project.home}/projects/calendarapi" /> 
     35      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     36              libcache="${org.bedework.libcache.dir}" 
     37              name="bw-apiutil" version="${org.bedework.calendarapi.version}"  
     38              projecthome="${bw.project.home}/projects/calendarapi" /> 
     39      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     40              libcache="${org.bedework.libcache.dir}" 
     41              name="bw-calfacade" version="${org.bedework.calendarapi.version}"  
     42              projecthome="${bw.project.home}/projects/calendarapi" /> 
     43      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     44              libcache="${org.bedework.libcache.dir}" 
     45              name="bw-calsvci" version="${org.bedework.calendarapi.version}"  
     46              projecthome="${bw.project.home}/projects/calendarapi" /> 
     47      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     48              libcache="${org.bedework.libcache.dir}" 
     49              name="bw-client" version="${org.bedework.calendarapi.version}"  
     50              projecthome="${bw.project.home}/projects/calendarapi" /> 
     51      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     52              libcache="${org.bedework.libcache.dir}" 
     53              name="bw-icalendar" version="${org.bedework.calendarapi.version}"  
     54              projecthome="${bw.project.home}/projects/calendarapi" /> 
     55      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     56              libcache="${org.bedework.libcache.dir}" 
     57              name="bw-sysevents" version="${org.bedework.calendarapi.version}"  
     58              projecthome="${bw.project.home}/projects/calendarapi" /> 
     59       
     60      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     61              libcache="${org.bedework.libcache.dir}" 
     62              name="bw-davio" version="${org.bedework.davutil.version}"  
     63              projecthome="${bw.project.home}/projects/davutil" /> 
     64       
     65      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     66              libcache="${org.bedework.libcache.dir}" 
     67              name="rpiutil" version="${org.bedework.rpiutil.version}"  
     68              projecthome="${bw.project.home}/projects/rpiutil" /> 
     69       
     70      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     71              libcache="${org.bedework.libcache.dir}" 
     72              name="bw-webdavserver" version="${org.bedework.webdav.version}"  
     73              projecthome="${bw.project.home}/projects/webdav" /> 
     74 
     75      <!-- ========================== Libraries ============================ --> 
     76       
     77      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     78              libcache="${org.bedework.libcache.dir}" 
     79              name="gson" version="1.5" /> 
    2180    </sequential> 
    2281 </macrodef> 
  • trunk/deployment/webpublic/webapp/appjars.xml

    r2618 r3045  
    1010      <mkdir dir="${org.bedework.temp.extrajars.dir}" /> 
    1111 
     12      <!-- ======================== This project =========================== --> 
     13       
    1214      <getJar lib="${org.bedework.temp.extrajars.dir}" 
    1315              libcache="${org.bedework.libcache.dir}" 
    14               name="bw-cdvutil" version="3.6
    15               projecthome="${bw.project.home}/projects/caldav" /> 
     16              name="bw-webcommon" version="${org.bedework.webapps.version}
     17              projecthome="${bw.project.home}/projects/webapps" /> 
    1618 
     19      <!-- ======================= Other projects ========================== --> 
     20       
    1721      <getJar lib="${org.bedework.temp.extrajars.dir}" 
    1822              libcache="${org.bedework.libcache.dir}" 
    19               name="bw-webcommon" version="3.6" 
    20               projecthome="${bw.project.home}/projects/webapps" /> 
     23              name="rpiaccess" version="${org.bedework.access.version}"  
     24              projecthome="${bw.project.home}/projects/access" /> 
     25       
     26      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     27              libcache="${org.bedework.libcache.dir}" 
     28              name="bw-cdvutil" version="${org.bedework.caldav.version}"  
     29              projecthome="${bw.project.home}/projects/caldav" /> 
     30       
     31      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     32              libcache="${org.bedework.libcache.dir}" 
     33              name="bw-annotations" version="${org.bedework.calendarapi.version}"  
     34              projecthome="${bw.project.home}/projects/calendarapi" /> 
     35      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     36              libcache="${org.bedework.libcache.dir}" 
     37              name="bw-apiutil" version="${org.bedework.calendarapi.version}"  
     38              projecthome="${bw.project.home}/projects/calendarapi" /> 
     39      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     40              libcache="${org.bedework.libcache.dir}" 
     41              name="bw-calfacade" version="${org.bedework.calendarapi.version}"  
     42              projecthome="${bw.project.home}/projects/calendarapi" /> 
     43      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     44              libcache="${org.bedework.libcache.dir}" 
     45              name="bw-calsvci" version="${org.bedework.calendarapi.version}"  
     46              projecthome="${bw.project.home}/projects/calendarapi" /> 
     47      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     48              libcache="${org.bedework.libcache.dir}" 
     49              name="bw-client" version="${org.bedework.calendarapi.version}"  
     50              projecthome="${bw.project.home}/projects/calendarapi" /> 
     51      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     52              libcache="${org.bedework.libcache.dir}" 
     53              name="bw-icalendar" version="${org.bedework.calendarapi.version}"  
     54              projecthome="${bw.project.home}/projects/calendarapi" /> 
     55      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     56              libcache="${org.bedework.libcache.dir}" 
     57              name="bw-sysevents" version="${org.bedework.calendarapi.version}"  
     58              projecthome="${bw.project.home}/projects/calendarapi" /> 
     59       
     60      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     61              libcache="${org.bedework.libcache.dir}" 
     62              name="bw-davio" version="${org.bedework.davutil.version}"  
     63              projecthome="${bw.project.home}/projects/davutil" /> 
     64       
     65      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     66              libcache="${org.bedework.libcache.dir}" 
     67              name="rpiutil" version="${org.bedework.rpiutil.version}"  
     68              projecthome="${bw.project.home}/projects/rpiutil" /> 
     69       
     70      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     71              libcache="${org.bedework.libcache.dir}" 
     72              name="bw-webdavserver" version="${org.bedework.webdav.version}"  
     73              projecthome="${bw.project.home}/projects/webdav" /> 
     74 
     75      <!-- ========================== Libraries ============================ --> 
     76       
     77      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     78              libcache="${org.bedework.libcache.dir}" 
     79              name="gson" version="1.5" /> 
    2180    </sequential> 
    2281 </macrodef> 
  • trunk/deployment/websubmit/webapp/appjars.xml

    r2618 r3045  
    1010      <mkdir dir="${org.bedework.temp.extrajars.dir}" /> 
    1111 
     12      <!-- ======================== This project =========================== --> 
     13       
    1214      <getJar lib="${org.bedework.temp.extrajars.dir}" 
    1315              libcache="${org.bedework.libcache.dir}" 
    14               name="bw-cdvutil" version="3.6
    15               projecthome="${bw.project.home}/projects/caldav" /> 
     16              name="bw-webcommon" version="${org.bedework.webapps.version}
     17              projecthome="${bw.project.home}/projects/webapps" /> 
    1618 
     19      <!-- ======================= Other projects ========================== --> 
     20       
    1721      <getJar lib="${org.bedework.temp.extrajars.dir}" 
    1822              libcache="${org.bedework.libcache.dir}" 
    19               name="bw-webcommon" version="3.6" 
    20               projecthome="${bw.project.home}/projects/webapps" /> 
     23              name="rpiaccess" version="${org.bedework.access.version}"  
     24              projecthome="${bw.project.home}/projects/access" /> 
     25       
     26      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     27              libcache="${org.bedework.libcache.dir}" 
     28              name="bw-cdvutil" version="${org.bedework.caldav.version}"  
     29              projecthome="${bw.project.home}/projects/caldav" /> 
     30       
     31      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     32              libcache="${org.bedework.libcache.dir}" 
     33              name="bw-annotations" version="${org.bedework.calendarapi.version}"  
     34              projecthome="${bw.project.home}/projects/calendarapi" /> 
     35      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     36              libcache="${org.bedework.libcache.dir}" 
     37              name="bw-apiutil" version="${org.bedework.calendarapi.version}"  
     38              projecthome="${bw.project.home}/projects/calendarapi" /> 
     39      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     40              libcache="${org.bedework.libcache.dir}" 
     41              name="bw-calfacade" version="${org.bedework.calendarapi.version}"  
     42              projecthome="${bw.project.home}/projects/calendarapi" /> 
     43      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     44              libcache="${org.bedework.libcache.dir}" 
     45              name="bw-calsvci" version="${org.bedework.calendarapi.version}"  
     46              projecthome="${bw.project.home}/projects/calendarapi" /> 
     47      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     48              libcache="${org.bedework.libcache.dir}" 
     49              name="bw-client" version="${org.bedework.calendarapi.version}"  
     50              projecthome="${bw.project.home}/projects/calendarapi" /> 
     51      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     52              libcache="${org.bedework.libcache.dir}" 
     53              name="bw-icalendar" version="${org.bedework.calendarapi.version}"  
     54              projecthome="${bw.project.home}/projects/calendarapi" /> 
     55      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     56              libcache="${org.bedework.libcache.dir}" 
     57              name="bw-sysevents" version="${org.bedework.calendarapi.version}"  
     58              projecthome="${bw.project.home}/projects/calendarapi" /> 
     59       
     60      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     61              libcache="${org.bedework.libcache.dir}" 
     62              name="bw-davio" version="${org.bedework.davutil.version}"  
     63              projecthome="${bw.project.home}/projects/davutil" /> 
     64       
     65      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     66              libcache="${org.bedework.libcache.dir}" 
     67              name="rpiutil" version="${org.bedework.rpiutil.version}"  
     68              projecthome="${bw.project.home}/projects/rpiutil" /> 
     69       
     70      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     71              libcache="${org.bedework.libcache.dir}" 
     72              name="bw-webdavserver" version="${org.bedework.webdav.version}"  
     73              projecthome="${bw.project.home}/projects/webdav" /> 
     74 
     75      <!-- ========================== Libraries ============================ --> 
     76       
     77      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     78              libcache="${org.bedework.libcache.dir}" 
     79              name="gson" version="1.5" /> 
    2180    </sequential> 
    2281 </macrodef> 
  • trunk/deployment/webuser/webapp/appjars.xml

    r3042 r3045  
    1010      <mkdir dir="${org.bedework.temp.extrajars.dir}" /> 
    1111 
     12        <!-- ======================== This project =========================== --> 
     13         
    1214      <getJar lib="${org.bedework.temp.extrajars.dir}" 
    1315              libcache="${org.bedework.libcache.dir}" 
    14               name="bw-cdvutil" version="3.6
    15               projecthome="${bw.project.home}/projects/caldav" /> 
     16              name="bw-webcommon" version="${org.bedework.webapps.version}
     17              projecthome="${bw.project.home}/projects/webapps" /> 
    1618 
     19      <!-- ======================= Other projects ========================== --> 
     20         
    1721      <getJar lib="${org.bedework.temp.extrajars.dir}" 
    1822              libcache="${org.bedework.libcache.dir}" 
    19               name="bw-webcommon" version="3.6" 
    20               projecthome="${bw.project.home}/projects/webapps" /> 
     23              name="rpiaccess" version="${org.bedework.access.version}"  
     24              projecthome="${bw.project.home}/projects/access" /> 
     25         
     26      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     27              libcache="${org.bedework.libcache.dir}" 
     28              name="bw-cdvutil" version="${org.bedework.caldav.version}"  
     29              projecthome="${bw.project.home}/projects/caldav" /> 
     30         
     31      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     32              libcache="${org.bedework.libcache.dir}" 
     33              name="bw-annotations" version="${org.bedework.calendarapi.version}"  
     34              projecthome="${bw.project.home}/projects/calendarapi" /> 
     35      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     36              libcache="${org.bedework.libcache.dir}" 
     37              name="bw-apiutil" version="${org.bedework.calendarapi.version}"  
     38              projecthome="${bw.project.home}/projects/calendarapi" /> 
     39      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     40              libcache="${org.bedework.libcache.dir}" 
     41              name="bw-calfacade" version="${org.bedework.calendarapi.version}"  
     42              projecthome="${bw.project.home}/projects/calendarapi" /> 
     43      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     44              libcache="${org.bedework.libcache.dir}" 
     45              name="bw-calsvci" version="${org.bedework.calendarapi.version}"  
     46              projecthome="${bw.project.home}/projects/calendarapi" /> 
     47      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     48              libcache="${org.bedework.libcache.dir}" 
     49              name="bw-client" version="${org.bedework.calendarapi.version}"  
     50              projecthome="${bw.project.home}/projects/calendarapi" /> 
     51      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     52              libcache="${org.bedework.libcache.dir}" 
     53              name="bw-icalendar" version="${org.bedework.calendarapi.version}"  
     54              projecthome="${bw.project.home}/projects/calendarapi" /> 
     55      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     56              libcache="${org.bedework.libcache.dir}" 
     57              name="bw-sysevents" version="${org.bedework.calendarapi.version}"  
     58              projecthome="${bw.project.home}/projects/calendarapi" /> 
     59       
     60      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     61              libcache="${org.bedework.libcache.dir}" 
     62              name="bw-davio" version="${org.bedework.davutil.version}"  
     63              projecthome="${bw.project.home}/projects/davutil" /> 
     64         
     65      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     66              libcache="${org.bedework.libcache.dir}" 
     67              name="rpiutil" version="${org.bedework.rpiutil.version}"  
     68              projecthome="${bw.project.home}/projects/rpiutil" /> 
     69         
     70      <getJar lib="${org.bedework.temp.extrajars.dir}" 
     71              libcache="${org.bedework.libcache.dir}" 
     72              name="bw-webdavserver" version="${org.bedework.webdav.version}"  
     73              projecthome="${bw.project.home}/projects/webdav" /> 
     74 
     75      <!-- ========================== Libraries ============================ --> 
    2176         
    2277      <getJar lib="${org.bedework.temp.extrajars.dir}" 
  • trunk/resources/exsynchwsdefs/iCalendar-props.xsd

    r3041 r3045  
    5252      <xs:element name="rdate" type="xcal:rdatePropType" /> 
    5353      <xs:element name="related-to" type="xcal:related-toPropType" /> 
     54      <xs:element name="exrule" type="xcal:exrulePropType" />  
    5455      <xs:element name="rrule" type="xcal:rrulePropType" />  
    55       <xs:element name="rrule" type="xcal:exrulePropType" />  
    5656      <xs:element name="action" type="xcal:actionPropType" /> 
    5757      <xs:element name="repeat" type="xcal:repeatPropType" />