Changeset 1988

Show
Ignore:
Timestamp:
12/17/08 15:53:02
Author:
douglm
Message:

Updated version of ical4j

Further changes to support draft 06 of CalDAV sched

This update requires schema changes to support some new scheduling properties

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build.xml

    r1953 r1988  
    104104 
    105105  <target name="init" > 
    106     <property name="org.bedework.qs.build.synchml" value="yes" /> 
     106    <property name="org.bedework.qs.build.synchml" value="no" /> 
    107107 
    108108    <!-- Overriding this when invoking ant allows different user property 
    …… 
    340340    </ant> 
    341341 
    342     <ant antfile="${org.bedework.project.synchml}/build.xml" inheritall="false" 
    343          target="javadoc" > 
    344       <property name="destdir" 
    345                 location="${org.bedework.projectdocs.home}/synchml/api" /> 
    346     </ant> 
     342    <if> 
     343      <isset property="org.bedework.qs.build.synchml"/> 
     344      <then> 
     345        <ant antfile="${org.bedework.project.synchml}/build.xml" inheritall="false" 
     346             target="javadoc" > 
     347          <property name="destdir" 
     348                    location="${org.bedework.projectdocs.home}/synchml/api" /> 
     349        </ant> 
     350      </then> 
     351    </if> 
    347352 
    348353    <ant antfile="${org.bedework.project.webdav}/build.xml" inheritall="false" 

  • trunk/build/buildfilters.xml

    r1937 r1988  
    9696    <filter token="CALFILE-NAME" 
    9797            value="${propval.app.calfile.name}" /> --> 
    98     <filter token="ADMIN-URI" 
    99             value="${org.bedework.global.public.admin.uri}" /> 
    100     <filter token="PUBEVENTS-URI" 
    101             value="${org.bedework.global.public.calendar.uri}" /> 
    102     <filter token="PERSONAL-URI" 
    103             value="${org.bedework.global.personal.calendar.uri}" /> 
    10498 
    10599    <!--      Shell script settings            --> 

  • trunk/config/bwbuild/default/cal.options.xml

    r1937 r1988  
    2323        <portalPlatform>your-portal</portalPlatform> 
    2424         --> 
     25 
     26        <!-- uris to cross link apps - of dubious usefulness --> 
     27        <publicAdminUri>/caladmin</publicAdminUri> 
     28        <publicCalendarUri>/cal</publicCalendarUri> 
     29        <personalCalendarUri>/ucal</personalCalendarUri> 
    2530 
    2631        <module> 

  • trunk/config/bwbuild/default/cal.properties

    r1956 r1988  
    3939# build/platforms/<platform>War.xml 
    4040org.bedework.global.deploy.platform=tomcat5 
    41  
    42 # uris to cross link apps - of dubious usefulness 
    43 org.bedework.global.public.admin.uri=/caladmin 
    44 org.bedework.global.public.calendar.uri=/cal 
    45 org.bedework.global.personal.calendar.uri=/ucal 
    4641# 
    4742# ------------------------------------------------------------------------ 

  • trunk/config/configs/democal.options.xml

    r1941 r1988  
    2323        <portalPlatform>your-portal</portalPlatform> 
    2424         --> 
     25 
     26        <!-- uris to cross link apps - of dubious usefulness --> 
     27        <publicAdminUri>/caladmin</publicAdminUri> 
     28        <publicCalendarUri>/cal</publicCalendarUri> 
     29        <personalCalendarUri>/ucal</personalCalendarUri> 
    2530 
    2631        <module> 

  • trunk/deployment/appjars.xml

    r1968 r1988  
    196196 
    197197      <getJar lib="${org.bedework.app.lib}" 
    198               name="ical4j" version="head" /> 
     198              name="ical4j" version="head-20081217" /> 
    199199 
    200200      <getJar lib="${org.bedework.app.lib}"