Merged BRANCHES/DEV/DAVEW/LDAP to HEAD

14587: Added new node service method getNodesWithoutParentAssocsOfType to public-services-security-context.xml (or at least my best guess at it!)
   14586: Use US spelling of synchronization in filenames for consistency
   14585: Lower the default user registry sync frequency to daily instead of hourly. Now users and groups are pulled over incrementally on login of missing users.
   14583: Unit test for ChainingUserRegistrySynchronizer
   14571: Migration patch for existing authorities previously held in users store
      - Uses AuthorityService to recreate authorities in spaces store with new structure
   14555: Authority service changes for LDAP sync improvements
      - Moved sys:authorities container to spaces store
      - All authorities now stored directly under sys:authorities
      - Authorities can now be looked up directly by node service
      - Secondary child associations used to model group relationships
      - 'Root' groups for UI navigation determined dynamically by node service query
      - cm:member association used to relate both authority containers and persons to other authorities
      - New cm:inZone association relates persons and authority containers to synchronization 'zones' stored under sys:zones
      - Look up of authority zone and all authorities in a zone to enable multi-zone LDAP sync
   14524: Dev branch for finishing LDAP zones and upgrade impact

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14588 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2009-06-08 16:16:32 +00:00
parent 8c84d09566
commit 916774a1fe
4 changed files with 18 additions and 11 deletions

View File

@@ -675,7 +675,11 @@ public class AccessControlWebService extends AbstractWebService implements Acces
for (NewAuthority newAuthority : newAuthorites)
{
AuthorityType authorityType = AuthorityType.valueOf(newAuthority.getAuthorityType());
String authority = this.authorityService.createAuthority(authorityType, parentAuthority, newAuthority.getName());
String authority = this.authorityService.createAuthority(authorityType, newAuthority.getName());
if (parentAuthority != null)
{
this.authorityService.addAuthority(parentAuthority, authority);
}
result[index] = authority;
index++;
}