Changeset 2938

Show
Ignore:
Timestamp:
06/29/10 10:32:06
Author:
douglm
Message:

Skip a couple of jars in jbossService.xml

Add a carddav datasource definition to configurations and update properties appropriately

Fix up prefixing in caldav test so that it can be used to test carddav. Add some carddav tests

Comment out the javadocs group definitions for calendarapi - it was breaking.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build/platforms/jbossService.xml

    r2929 r2938  
    153153    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.ehcache}" /> 
    154154    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.hibernate}" /> 
     155        <!-- 
    155156    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.javassist}" /> 
    156157    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jgroups}" /> 
     158    --> 
    157159    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jta}" /> 
    158160    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-collections}"/> 

  • trunk/config/bwbuild/jboss-postgresql/cal.properties

    r2877 r2938  
    4747# much grief.  
    4848org.bedework.global.jboss.db.datasource.jndiname=/CalendarDS 
     49org.bedework.global.jboss.carddb.datasource.jndiname=/CardDS 
    4950 
    5051# Hibernate caching parameters 
    …… 
    145146# If set to true or yes will copy in the bedework db datasource def bedework-ds.xml 
    146147org.bedework.global.copy.bedeworkds.config=yes 
     148# 
     149# If set to true or yes will copy in the bedework card db datasource def bedework-ds.xml 
     150org.bedework.global.copy.bedeworkcardds.config=yes 
    147151 
    148152# ------------------------------------------------------------------------ 

  • trunk/config/bwbuild/jboss-postgresql/carddav.options.xml

    r2933 r2938  
    104104            <debug>true</debug> 
    105105          </group-principal-dirHandler> 
    106  
     106           
    107107          <!-- handle the user address book hierarchy --> 
     108           
     109          <user-dirHandler classname="org.bedework.carddav.util.DbDirHandlerConfig" > 
     110            <pathPrefix>/user</pathPrefix> 
     111             
     112            <className>org.bedework.carddav.server.dirHandlers.db.DbAddrBookDirHandler</className> 
     113 
     114            <queryLimit>1000</queryLimit> <!-- unimplemented --> 
     115           
     116            <!-- This is the access set at the root. I'll do this as XML soon --> 
     117            <rootAccess>WONyA WANyFyS </rootAccess> 
     118           
     119            <!-- This is the owner of the user root and user home --> 
     120            <rootOwner>/principals/users/root</rootOwner> 
     121             
     122            <debug>true</debug> 
     123          </user-dirHandler> 
     124 
     125          <!-- handle the user address book hierarchy 
     126               How it might be done with ldap  
    108127          <user-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" > 
    109128            <pathPrefix>/user</pathPrefix> 
    …… 
    132151            <debug>true</debug> 
    133152          </user-dirHandler> 
    134  
     153          --> 
     154  
    135155          <public-locations-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" > 
    136156            <pathPrefix>/public/locations</pathPrefix> 
    …… 
    207227          <directoryBrowsingDisallowed>false</directoryBrowsingDisallowed> 
    208228 
    209           <defaultAddressbook>address-book</defaultAddressbook> 
    210  
     229          <defaultAddressbook>addressbook</defaultAddressbook> 
     230 
     231          <!-- This will act as the root for the file system --> 
    211232          <addressBookHandlerPrefix>/user</addressBookHandlerPrefix> 
     233           
     234          <!-- Needed for access calculations --> 
     235          <userHomeRoot>/user</userHomeRoot> 
    212236 
    213237          <principalRoot>/principals</principalRoot> 
    …… 
    229253          <directoryBrowsingDisallowed>false</directoryBrowsingDisallowed> 
    230254 
    231           <defaultAddressbook>address-book</defaultAddressbook> 
     255          <defaultAddressbook>addressbook</defaultAddressbook> 
    232256 
    233257          <addressBookHandlerPrefix>/public</addressBookHandlerPrefix> 
     258           
     259          <!-- Needed for access calculations --> 
     260          <userHomeRoot>/user</userHomeRoot> 
    234261 
    235262          <principalRoot>/principals</principalRoot> 

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

    r2829 r2938  
    4242# much grief.  
    4343org.bedework.global.jboss.db.datasource.jndiname=/CalendarDS 
     44org.bedework.global.jboss.carddb.datasource.jndiname=/CardDS 
    4445 
    4546# Hibernate caching parameters 
    …… 
    154155# If set to true or yes will copy in the bedework db datasource def bedework-ds.xml 
    155156org.bedework.global.copy.bedeworkds.config=yes 
     157# 
     158# If set to true or yes will copy in the bedework card db datasource def bedework-ds.xml 
     159org.bedework.global.copy.bedeworkcardds.config=yes 
    156160 
    157161# ------------------------------------------------------------------------ 

  • trunk/deployment/caldavTest/shellscr/resources/bwruntest.sh

    r994 r2938  
    55# JAVA_HOME needs to be defined 
    66 
    7 cp=@CP@ 
     7cp=.:./classes:./resources 
     8 
     9for i in lib/* 
     10  do 
     11    cp=$cp:$i 
     12done 
    813 
    914RUNCMD="$JAVA_HOME/bin/java -cp $cp @CALDAVTEST-CLASS@"