Changeset 2097

Show
Ignore:
Timestamp:
03/05/09 19:26:39
Author:
douglm
Message:

Fix up acl evaluation to handle principals correctly.

Change to the restore process to make bedework admin group principals

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/config/bwbuild/default/cal.options.xml

    r2067 r2097  
    4040          <userPrincipalRoot>/principals/users</userPrincipalRoot> 
    4141          <groupPrincipalRoot>/principals/groups</groupPrincipalRoot> 
     42          <bwadmingroupPrincipalRoot>/principals/groups/bwadmin</bwadmingroupPrincipalRoot> 
    4243          <resourcePrincipalRoot>/principals/resources</resourcePrincipalRoot> 
    4344          <venuePrincipalRoot>/principals/locations</venuePrincipalRoot> 

  • trunk/config/bwbuild/jboss/democal.options.xml

    r2063 r2097  
    3636        <timezonesUri>http://localhost:8080/tzsvr</timezonesUri> 
    3737 
     38        <systemRoots  classname="org.bedework.calfacade.configs.SystemRoots" > 
     39          <principalRoot>/principals</principalRoot> 
     40          <userPrincipalRoot>/principals/users</userPrincipalRoot> 
     41          <groupPrincipalRoot>/principals/groups</groupPrincipalRoot> 
     42          <bwadmingroupPrincipalRoot>/principals/groups/bwadmin</bwadmingroupPrincipalRoot> 
     43          <resourcePrincipalRoot>/principals/resources</resourcePrincipalRoot> 
     44          <venuePrincipalRoot>/principals/locations</venuePrincipalRoot> 
     45          <ticketPrincipalRoot>/principals/tickets</ticketPrincipalRoot> 
     46          <hostPrincipalRoot>/principals/hosts</hostPrincipalRoot> 
     47        </systemRoots> 
     48 
    3849        <module> 
    3950          <!-- A dummy module with no directory. --> 
    4051          <dir-config classname="org.bedework.calfacade.configs.DirConfigProperties"> 
    41             <principalRoot>/principals</principalRoot> 
    42             <userPrincipalRoot>/principals/users</userPrincipalRoot> 
    43             <groupPrincipalRoot>/principals/groups</groupPrincipalRoot> 
    44             <resourcePrincipalRoot>/principals/resources</resourcePrincipalRoot> 
    45             <venuePrincipalRoot>/principals/locations</venuePrincipalRoot> 
    46             <ticketPrincipalRoot>/principals/tickets</ticketPrincipalRoot> 
    47             <hostPrincipalRoot>/principals/hosts</hostPrincipalRoot> 
    48  
    4952            <!-- List domains at your site separated by commas. 
    5053                    A single leading wildcard "*" is allowed. 
    …… 
    6568          <!-- An example of how we might configure an ldap directory module. --> 
    6669          <user-ldap-group classname="org.bedework.calfacade.configs.LdapConfigProperties"> 
    67             <principalRoot>/principals</principalRoot> 
    68             <userPrincipalRoot>/principals/users</userPrincipalRoot> 
    69             <groupPrincipalRoot>/principals/groups</groupPrincipalRoot> 
    70             <resourcePrincipalRoot>/principals/resources</resourcePrincipalRoot> 
    71             <venuePrincipalRoot>/principals/locations</venuePrincipalRoot> 
    72             <ticketPrincipalRoot>/principals/tickets</ticketPrincipalRoot> 
    73             <hostPrincipalRoot>/principals/hosts</hostPrincipalRoot> 
    74  
    7570            <domains>mysite.edu</domains> 
    7671            <defaultDomain>mysite.edu</defaultDomain> 

  • trunk/config/bwbuild/liferay5/cal.options.xml

    r2023 r2097  
    3333        <personalCardDAVUri>http://localhost:8080/ucarddav</personalCardDAVUri> 
    3434 
     35        <!-- Timezone server locations --> 
     36        <timezonesUri>http://localhost:8080/tzsvr</timezonesUri> 
     37 
     38        <systemRoots  classname="org.bedework.calfacade.configs.SystemRoots" > 
     39          <principalRoot>/principals</principalRoot> 
     40          <userPrincipalRoot>/principals/users</userPrincipalRoot> 
     41          <groupPrincipalRoot>/principals/groups</groupPrincipalRoot> 
     42          <bwadmingroupPrincipalRoot>/principals/groups/bwadmin</bwadmingroupPrincipalRoot> 
     43          <resourcePrincipalRoot>/principals/resources</resourcePrincipalRoot> 
     44          <venuePrincipalRoot>/principals/locations</venuePrincipalRoot> 
     45          <ticketPrincipalRoot>/principals/tickets</ticketPrincipalRoot> 
     46          <hostPrincipalRoot>/principals/hosts</hostPrincipalRoot> 
     47        </systemRoots> 
     48 
    3549        <module> 
    3650          <!-- A dummy module with no directory. --> 
    3751          <dir-config classname="org.bedework.calfacade.configs.DirConfigProperties"> 
    38             <principalRoot>/principals</principalRoot> 
    39             <userPrincipalRoot>/principals/users</userPrincipalRoot> 
    40             <groupPrincipalRoot>/principals/groups</groupPrincipalRoot> 
    41             <resourcePrincipalRoot>/principals/resources</resourcePrincipalRoot> 
    42             <venuePrincipalRoot>/principals/locations</venuePrincipalRoot> 
    43             <ticketPrincipalRoot>/principals/tickets</ticketPrincipalRoot> 
    44             <hostPrincipalRoot>/principals/hosts</hostPrincipalRoot> 
    45  
    4652            <!-- List domains at your site separated by commas. 
    4753                    A single leading wildcard "*" is allowed. 
    …… 
    6268          <!-- An example of how we might configure an ldap directory module. --> 
    6369          <user-ldap-group classname="org.bedework.calfacade.configs.LdapConfigProperties"> 
    64             <principalRoot>/principals</principalRoot> 
    65             <userPrincipalRoot>/principals/users</userPrincipalRoot> 
    66             <groupPrincipalRoot>/principals/groups</groupPrincipalRoot> 
    67             <resourcePrincipalRoot>/principals/resources</resourcePrincipalRoot> 
    68             <venuePrincipalRoot>/principals/locations</venuePrincipalRoot> 
    69             <ticketPrincipalRoot>/principals/tickets</ticketPrincipalRoot> 
    70             <hostPrincipalRoot>/principals/hosts</hostPrincipalRoot> 
    71  
    7270            <domains>mysite.edu</domains> 
    7371            <defaultDomain>mysite.edu</defaultDomain>