Changeset 2955

Show
Ignore:
Timestamp:
07/20/10 11:46:17
Author:
douglm
Message:

Updates to handle vcard driven preferences

Add vcard to the libraries so we can process vcards from carddav
Update carddav options.
Change directory info to include new properties and link to it from the principal object
Add directory methods to get the information
Add a carddav client and provide a method to get the card for a principal
Fix to webdav - generating bad hrefs
Undo bad change to attendees.jsp

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build/platforms/jbossService.xml

    r2938 r2955  
    192192    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.backport-util-concurrent}"/> 
    193193    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.ical4j}"/> 
     194    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.ical4j-vcard}"/> 
    194195    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-codec}"/> 
    195196    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-digester}"/> 

  • trunk/build/platforms/jbossWar.xml

    r2929 r2955  
    238238    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.backport-util-concurrent}"/> 
    239239    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.ical4j}"/> 
     240    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.ical4j-vcard}"/> 
    240241    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-codec}"/> 
    241242    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-collections}"/> 

  • trunk/build/platforms/runnableService.xml

    r2929 r2955  
    8686    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.backport-util-concurrent}"/> 
    8787    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.ical4j}"/> 
     88    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.ical4j-vcard}"/> 
    8889    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-codec}"/> 
    8990    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-digester}"/> 

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

    r2877 r2955  
    3030 
    3131        <!-- CardDAV server locations --> 
    32         <publicCardDAVUri>http://localhost:8080/carddav</publicCardDAVUri> 
    33         <personalCardDAVUri>http://localhost:8080/ucarddav</personalCardDAVUri> 
     32        <publicCardDAVHost>localhost</publicCardDAVHost> 
     33        <publicCardDAVPort>8080</publicCardDAVPort> 
     34        <publicCardDAVContext>/pubcarddav</publicCardDAVContext> 
     35         
     36        <personalCardDAVHost>localhost</personalCardDAVHost> 
     37        <personalCardDAVPort>8080</personalCardDAVPort> 
     38        <personalCardDAVContext>/ucarddav</personalCardDAVContext> 
    3439 
    3540        <!-- Timezone server locations --> 
    3641        <timezonesUri>http://localhost:8080/tzsvr</timezonesUri> 
    3742 
    38         <systemRoots classname="org.bedework.calfacade.configs.SystemRoots" > 
     43        <systemRoots classname="org.bedework.calfacade.configs.SystemRoots" > 
    3944          <principalRoot>/principals</principalRoot> 
    4045          <userPrincipalRoot>/principals/users</userPrincipalRoot> 
    …… 
    4752        </systemRoots> 
    4853 
     54        <!-- To enable mapping of calendar addresses e.g. mailto:fred@example.org 
     55             on to principals we need to either do a directory lookup or have 
     56             some sort of pattern map.  
     57              
     58             Setting a caladdr prefix enables pattern mapping. By default  
     59             calendar addresses are users --> 
     60              
     61          <!--  
     62        <caladdrPrefixes classname="org.bedework.calfacade.configs.CalAddrPrefixes"> 
     63          <location>loc_</location> 
     64        </caladdrPrefixes>      
     65           --> 
     66         
    4967        <module> 
    5068          <!-- A dummy module with no directory. --> 

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

    r2938 r2955  
    4747            <pathPrefix>/principals/users</pathPrefix> 
    4848            <addressBook>true</addressBook> 
     49             
     50            <!-- The cardPathPrefix is used to manufacture a path to a card for  
     51                 the principal. If it is set we take the path 
     52                  
     53                 <principal-root>/<account> 
     54                  
     55                 and transform it to  
     56                  
     57                 <cardPathPrefix>/<account>.vcf 
     58                  
     59                 If it is not set we try the cardPathPrefixes supplied globally. 
     60                 If they are not supplied we don't give any path. The client will 
     61                 have to fall back to a query. 
     62                 --> 
     63            <cardPathPrefix>/public/people</cardPathPrefix> 
     64 
     65            <cardPathPrefixes>/public/people,loc_:/public/locations</cardPathPrefixes> 
    4966 
    5067            <className>org.bedework.carddav.server.dirHandlers.ldap.LdapPrincipalDirHandler</className> 
    …… 
    104121            <debug>true</debug> 
    105122          </group-principal-dirHandler> 
     123           
     124          <location-principal-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" > 
     125            <pathPrefix>/principals/locations</pathPrefix> 
     126            <addressBook>true</addressBook> 
     127            <cardPathPrefix>/public/locations</cardPathPrefix> 
     128 
     129            <className>org.bedework.carddav.server.dirHandlers.ldap.LdapPrincipalDirHandler</className> 
     130 
     131            <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory> 
     132            <providerUrl>ldap://localhost:10389/</providerUrl> 
     133 
     134            <baseDn>ou=locations,dc=bedework,dc=org</baseDn> 
     135 
     136            <queryLimit>1000</queryLimit> 
     137 
     138            <attrIds></attrIds> 
     139 
     140            <cardKind>location</cardKind> 
     141 
     142            <addressbookObjectClass>organizationalUnit</addressbookObjectClass> 
     143            <addressbookIdAttr>ou</addressbookIdAttr> 
     144 
     145            <addressbookEntryObjectClass>groupOfUniqueNames</addressbookEntryObjectClass> 
     146            <addressbookEntryIdAttr>cn</addressbookEntryIdAttr> 
     147 
     148            <principalIdAttr>cn</principalIdAttr> 
     149 
     150            <authDn>uid=admin,ou=system</authDn> 
     151            <authPw>secret</authPw> 
     152 
     153            <debug>true</debug> 
     154          </location-principal-dirHandler> 
    106155           
    107156          <!-- handle the user address book hierarchy --> 
    …… 
    163212            <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory> 
    164213            <providerUrl>ldap://localhost:10389/</providerUrl> 
    165             <baseDn>ou=locations,dc=bedework,dc=org</baseDn> 
     214            <baseDn>ou=locations,ou=public,dc=bedework,dc=org</baseDn> 
    166215 
    167216            <queryLimit>1000</queryLimit> 

  • trunk/deployment/appjars.xml

    r2929 r2955  
    219219 
    220220      <getJar lib="${org.bedework.app.lib}" 
     221              name="ical4j-vcard" version="0.9.3-SNAPSHOT" /> 
     222 
     223      <getJar lib="${org.bedework.app.lib}" 
    221224              name="portals-bridges-common" version="1.0" /> 
    222225