Changeset 673

Show
Ignore:
Timestamp:
07/01/06 01:56:58
Author:
douglm
Message:

Fix more freebusy aggregator bugs

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/calendar3/bldfiles/buildwar.xml

    r663 r673  
    287287    <copy todir="${app.dest.lib}" file="${org.bedework.calsvc.jar}" /> 
    288288    <copy todir="${app.dest.lib}" file="${org.bedework.ical.jar}" /> 
     289    <copy todir="${app.dest.lib}" file="${org.bedework.caldavClientApi.jar}" /> 
    289290    <copy todir="${app.dest.lib}" file="${org.bedework.common.jar}" /> 
    290291    <copy todir="${app.dest.lib}" file="${org.bedework.davdefs.jar}" /> 
     292    <copy todir="${app.dest.lib}" file="${org.bedework.http.jar}" /> 
    291293    <copy todir="${app.dest.lib}" file="${org.bedework.appcommon.jar}" /> 
    292294    <copy todir="${app.dest.lib}" file="${org.bedework.webcommon.jar}" /> 
     295 
     296    <!-- free busy --> 
     297    <copy todir="${app.dest.lib}" file="${org.bedework.fbclient.jar}" /> 
     298    <copy todir="${app.dest.lib}" file="${org.bedework.fbaggregator.jar}" /> 
    293299 
    294300    <!-- Some more standard libs --> 
    295301    <copy todir="${app.dest.lib}" file="${log4j.jar}"/> 
    296302    <copy todir="${app.dest.lib}" file="${ical4j.jar}"/> 
     303    <copy todir="${app.dest.lib}" file="${commons-codec.jar}"/> 
    297304    <copy todir="${app.dest.lib}" file="${commons-collections.jar}"/> 
     305    <copy todir="${app.dest.lib}" file="${commons-httclient.jar}"/> 
    298306 
    299307    <!-- add the jdbcdriver if defined --> 

  • trunk/calendar3/bldfiles/globalDefs.xml

    r667 r673  
    101101    <property name="org.bedework.webtest.base" location="${org.bedework.calendar.dir}/webtest" /> 
    102102 
     103    <!-- This has to be here for now --> 
     104    <property name="org.bedework.fbwebclient.base" 
     105              location="${org.bedework.freebusy.dir}/webclient" /> 
     106 
    103107    <!-- ======================= Directory Names ======================= 
    104108        These properties generally define file and directory names (or 

  • trunk/calendar3/deployment/freebusyAggregator/webapp/build.xml

    r670 r673  
    22 
    33<!-- =================================================================== 
    4      Default public events web application deployer 
     4     Default free busy aggregator web application deployer 
    55     =================================================================== --> 
    66 
    7 <project name="bwpublic.deploy" default="deploy" > 
     7<project name="fbaggregator.deploy" default="deploy" > 
    88  <import file="${org.bedework.deployment.base}/deployprops.xml" /> 
    99  <echo message="XXXXXXXXXXXX  app.name=${propval.app.name}" /> 
    …… 
    1616    <dirname property="this.dir" file="${ant.file}"/> 
    1717 
    18     <property name="app.sou.dir" location="${org.bedework.webclient.base}" /> 
     18    <property name="app.sou.dir" location="${org.bedework.fbwebclient.base}" /> 
    1919 
    2020    <!-- Flag as struts --> 
    2121    <property name="org.bedework.strutsapp" value="true" /> 
    2222 
    23     <!-- Properties that differ from the personal client --> 
    2423    <property name="app.web.xml" 
    25               value="${app.sou.dir}/war/WEB-INF/publicweb.xml" /> 
     24              value="${app.sou.dir}/war/WEB-INF/web.xml" /> 
    2625 
    2726    <!-- This should be in the config stuff --> 

  • trunk/calendar3/webclient/war/WEB-INF/publicweb.xml

    r659 r673  
    1010         http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" 
    1111         version="2.4"> 
    12   <display-name>Bedwork public client</display-name> 
     12  <display-name>@DISPLAY-NAME@</display-name> 
    1313 
    1414  <context-param>