Changeset 869

Show
Ignore:
Timestamp:
07/26/06 13:43:44
Author:
douglm
Message:

Updated projects: calendar3, caldav
Added new svc factory class to allow removal of implementation jars from classpath of other projects.
Split out bedework implementation class from caldav server package.
Fixed some build bugs.

A new property needs to be added to the caldav configurations. Once again from democal.properties the following were added:

to Pubcaldav:
org.bedework.app.Pubcaldav.interface.jar=bw-caldav

to Usercaldav
org.bedework.app.Usercaldav.interface.jar=bw-caldav

Also two changed
org.bedework.app.Pubcaldav.sysintfimpl=org.bedework.caldav.bwserver.BwSysIntfImpl?
and
org.bedework.app.Usercaldav.sysintfimpl=org.bedework.caldav.bwserver.BwSysIntfImpl?

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/calendar3/bldfiles/buildwar.xml

    r868 r869  
    373373 
    374374  <target name="bexchange-stuff" if="org.bedework.build.caldav.bexchange"> 
    375     <copy todir="${app.dest.lib}" file="${org.bedework.caldavbexchange.jar}" /> 
    376  
    377375    <copy tofile="${app.dest.properties}/timezones.xml" 
    378376          file="${org.bedework.resources.base}/bwtimezones.xml" /> 
    …… 
    380378 
    381379  <target name="domino-stuff" if="org.bedework.build.caldav.domino"> 
    382     <copy todir="${app.dest.lib}" file="${org.bedework.caldavdomino.jar}" /> 
    383  
    384380    <copy tofile="${app.dest.properties}/timezones.xml" 
    385381          file="${org.bedework.resources.base}/bwtimezones.xml" /> 
    …… 
    392388      </fileset> 
    393389    </copy> 
    394  
    395     <copy todir="${app.dest.lib}" file="${org.bedework.caldavgoogle.jar}" /> 
    396390 
    397391    <copy tofile="${app.dest.properties}/timezones.xml" 

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

    r868 r869  
    184184# Public Caldav Server 
    185185# 
    186 org.bedework.build.caldav=yes 
    187186org.bedework.app.Pubcaldav.project=caldav 
     187org.bedework.app.Pubcaldav.interface.jar=bw-caldav 
    188188org.bedework.app.Pubcaldav.type=publiccaldav 
    189189org.bedework.app.Pubcaldav.war.name=pubcaldav 
    …… 
    199199org.bedework.app.Pubcaldav.run.as.user=public-user 
    200200org.bedework.app.Pubcaldav.logprefix=PubCalDav 
    201 org.bedework.app.Pubcaldav.sysintfimpl=edu.rpi.cct.uwcal.caldav.BwSysIntfImpl 
     201org.bedework.app.Pubcaldav.sysintfimpl=org.bedework.caldav.bwserver.BwSysIntfImpl 
    202202 
    203203# 
    …… 
    206206# Personal Caldav Server 
    207207# 
    208 org.bedework.build.caldav=yes 
    209208org.bedework.app.Usercaldav.project=caldav 
     209org.bedework.app.Pubcaldav.interface.jar=bw-caldav 
    210210org.bedework.app.Usercaldav.type=usercaldav 
    211211org.bedework.app.Usercaldav.war.name=ucaldav 
    …… 
    224224org.bedework.app.Usercaldav.publicadmin=false 
    225225org.bedework.app.Usercaldav.logprefix=UserCalDav 
    226 org.bedework.app.Usercaldav.sysintfimpl=edu.rpi.cct.uwcal.caldav.BwSysIntfImpl 
     226org.bedework.app.Usercaldav.sysintfimpl=org.bedework.caldav.bwserver.BwSysIntfImpl 
    227227 
    228228#