Changeset 1023

Show
Ignore:
Timestamp:
09/26/06 18:52:23
Author:
douglm
Message:

A number of changes - mostly caldav - as a result of interoperability tests

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build.xml

    r1020 r1023  
    445445                       target="${org.bedework.project.calendarapi}" /> 
    446446    <copy-to-dependent this="${org.bedework.project.davutil}" 
     447                       target="${org.bedework.project.freebusy}" /> 
     448    <copy-to-dependent this="${org.bedework.project.davutil}" 
    447449                       target="${org.bedework.project.webapps}" /> 
    448450    <copy-to-dependent this="${org.bedework.project.davutil}" 

  • trunk/config/configs/freebusy/democal.properties

    r1005 r1023  
    1919 
    2020# Define the names of the applications we want to build 
    21 org.bedework.install.app.names=bwconfig,CalAdmin,Events,SoEDept,UserCal,Bexchangecaldav,Dominocaldav,Googlecaldav,Pubcaldav,Usercaldav,dumpres,restoreFrom2p3px,FBagg 
     21org.bedework.install.app.names=bwconfig,CalAdmin,Events,SoEDept,UserCal,Bexchangecaldav,Dominocaldav,Googlecaldav,Pubcaldav,Usercaldav,caldavTest,dumpres,restoreFrom2p3px,FBagg 
    2222# 
    2323# -------------------------------------------------------------------- 
    …… 
    347347org.bedework.app.FBagg.ear.name=fbagg 
    348348org.bedework.app.FBagg.context.root=/fbagg 
    349 org.bedework.app.FBagg.root=/fbagg 
     349org.bedework.app.FBagg.root=http://localhost:8080/fbagg 
    350350org.bedework.app.FBagg.resources.dir=/webapps/ROOT/fbagg 
    351351org.bedework.app.FBagg.deploy.dir=/webapps 
    …… 
    357357org.bedework.app.FBagg.publicadmin=false 
    358358org.bedework.app.FBagg.cal.suite=MainCampus 
     359 
     360# 
     361# -------------------------------------------------------------------- 
     362# 
     363# CalDAV test 
     364# 
     365 
     366org.bedework.app.caldavTest.project=caldavTest 
     367org.bedework.app.caldavTest.type=caldavTest 
     368org.bedework.app.caldavTest.sou.dir=caldavTest 
     369org.bedework.app.caldavTest.shellscr.name=bwruntest 
     370org.bedework.app.caldavTest.batscr.name=bwruntest.bat 
     371org.bedework.app.caldavTest.zip.name=caldavTest 
     372org.bedework.app.caldavTest.description=Bedework CalDAV test utility 
     373org.bedework.app.caldavTest.version=3.2 
     374 
    359375 
    360376# 

  • trunk/deployment/freebusyAggregator/webapp/resources/demoskins/MainCampus/default/default/default.xsl

    r952 r1023  
    409409          <td rowspan="2" id="logos"> 
    410410            <h4>participants</h4> 
     411            <a href="http://www.apple.com"> 
     412              <img src="http://www.rpi.edu/dept/cct/apps/bedeworkLuwak2/images/freebusy/logos/appleIcal.png" width="100" height="88" alt="Apple" border="0"/> 
     413            </a> 
    411414            <a href="http://www.bedework.org"> 
    412415              <img src="http://www.rpi.edu/dept/cct/apps/bedeworkLuwak2/images/freebusy/logos/bedework.png" width="100" height="88" alt="Bedework" border="0"/>