Changeset 1546

Show
Ignore:
Timestamp:
08/31/07 00:04:46
Author:
douglm
Message:

Some code to allow interaction with external caldav servers.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/config/configs/democal.options.xml

    r1544 r1546  
    114114        <usergroupsClass>org.bedework.calsvc.directory.UserGroupsLdapImpl</usergroupsClass> 
    115115        --> 
    116         <usergroupsClass>org.bedework.calcore.hibernate.GroupsDbImpl</usergroupsClass> 
     116        <usergroupsClass>org.bedework.calsvc.directory.GroupsDbImpl</usergroupsClass> 
    117117 
    118118        <directoryBrowsingDisallowed>@DIRECTORY-BROWSING-DISALLOWED@</directoryBrowsingDisallowed> 

  • trunk/deployment/webpublic/webapp/build.xml

    r1206 r1546  
    5050    <!-- First copy the resources into the server --> 
    5151 
    52     <delete dir="${org.bedework.appserver.dir}/${propval.app.resources.dir}.${propval.app.cal.suite}" /> 
    53     <copy todir="${org.bedework.appserver.dir}/${propval.app.resources.dir}.${propval.app.cal.suite}"> 
    54       <fileset dir="${app.resources.dir}/demoskins/${propval.app.cal.suite}" /> 
    55     </copy> 
     52    <if> 
     53      <not> 
     54        <isset property="org.bedework.global.noskins" /> 
     55      </not> 
     56      <then> 
     57        <delete dir="${org.bedework.appserver.dir}/${propval.app.resources.dir}.${propval.app.cal.suite}" /> 
     58        <copy todir="${org.bedework.appserver.dir}/${propval.app.resources.dir}.${propval.app.cal.suite}"> 
     59          <fileset dir="${app.resources.dir}/demoskins/${propval.app.cal.suite}" /> 
     60        </copy> 
     61      </then> 
     62    </if> 
    5663 
    5764    <!-- Deploy common resources -->