inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

MOB-1022: Fix migration issue for AuthorityDefaultZonesPatch (AuthorityMigrationPatch will already have added default zones to everything)

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14805 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrew Hind
2009-06-19 12:51:13 +00:00
parent 371d6eadb6
commit 7b1fdf1d2f
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
source/java/org/alfresco/repo/admin/patch/impl/AuthorityDefaultZonesPatch.java
View File

@@ -111,7 +111,7 @@ public class AuthorityDefaultZonesPatch extends AbstractPatch
defaultZones.add(AuthorityService.ZONE_AUTH_ALFRESCO); defaultZones.add(AuthorityService.ZONE_AUTH_ALFRESCO);
List<Action> personActions = new ArrayList<Action>(1); List<Action> personActions = new ArrayList<Action>(1);
personActions.add(new Action(null, defaultZones, ActionType.ADD)); personActions.add(new Action(null, defaultZones, ActionType.SET));
setZones(AuthorityType.USER, personActions); setZones(AuthorityType.USER, personActions);
@@ -137,20 +137,20 @@ public class AuthorityDefaultZonesPatch extends AbstractPatch
List<Action> groupActions = new ArrayList<Action>(stores.size() * 4 + sites.size() * 5 + 1); List<Action> groupActions = new ArrayList<Action>(stores.size() * 4 + sites.size() * 5 + 1);
for (AVMStoreDescriptor store : stores) for (AVMStoreDescriptor store : stores)
{ {
groupActions.add(new Action("GROUP_"+store.getName()+"-ContentManager", wcmZones, ActionType.ADD)); groupActions.add(new Action("GROUP_"+store.getName()+"-ContentManager", wcmZones, ActionType.SET));
groupActions.add(new Action("GROUP_"+store.getName()+"-ContentPublisher", wcmZones, ActionType.ADD)); groupActions.add(new Action("GROUP_"+store.getName()+"-ContentPublisher", wcmZones, ActionType.SET));
groupActions.add(new Action("GROUP_"+store.getName()+"-ContentContributor", wcmZones, ActionType.ADD)); groupActions.add(new Action("GROUP_"+store.getName()+"-ContentContributor", wcmZones, ActionType.SET));
groupActions.add(new Action("GROUP_"+store.getName()+"-ContentReviewer", wcmZones, ActionType.ADD)); groupActions.add(new Action("GROUP_"+store.getName()+"-ContentReviewer", wcmZones, ActionType.SET));
} }
for (SiteInfo site : sites) for (SiteInfo site : sites)
{ {
groupActions.add(new Action("GROUP_site_" + site.getShortName(), shareZones, ActionType.ADD)); groupActions.add(new Action("GROUP_site_" + site.getShortName(), shareZones, ActionType.SET));
groupActions.add(new Action("GROUP_site_" + site.getShortName()+"_SiteManager", shareZones, ActionType.ADD)); groupActions.add(new Action("GROUP_site_" + site.getShortName()+"_SiteManager", shareZones, ActionType.SET));
groupActions.add(new Action("GROUP_site_" + site.getShortName()+"_SiteCollaborator", shareZones, ActionType.ADD)); groupActions.add(new Action("GROUP_site_" + site.getShortName()+"_SiteCollaborator", shareZones, ActionType.SET));
groupActions.add(new Action("GROUP_site_" + site.getShortName()+"_SiteContributor", shareZones, ActionType.ADD)); groupActions.add(new Action("GROUP_site_" + site.getShortName()+"_SiteContributor", shareZones, ActionType.SET));
groupActions.add(new Action("GROUP_site_" + site.getShortName()+"_SiteConsumer", shareZones, ActionType.ADD)); groupActions.add(new Action("GROUP_site_" + site.getShortName()+"_SiteConsumer", shareZones, ActionType.SET));
} }
groupActions.add(new Action(null, defaultZones, ActionType.ADD)); groupActions.add(new Action(null, defaultZones, ActionType.SET));
setZones(AuthorityType.GROUP, groupActions); setZones(AuthorityType.GROUP, groupActions);
@@ -159,9 +159,9 @@ public class AuthorityDefaultZonesPatch extends AbstractPatch
private void setZones(AuthorityType authorityType, List<Action> actions) private void setZones(AuthorityType authorityType, List<Action> actions)
{ {
//hibernateSessionHelper.mark(); hibernateSessionHelper.mark();
Set<String> authorities = authorityService.getAllAuthorities(authorityType); Set<String> authorities = authorityService.getAllAuthorities(authorityType);
//hibernateSessionHelper.reset(); hibernateSessionHelper.reset();
for (String authority : authorities) for (String authority : authorities)
{ {
for (Action action : actions) for (Action action : actions)
@@ -180,9 +180,10 @@ public class AuthorityDefaultZonesPatch extends AbstractPatch
break; break;
} }
} }
//hibernateSessionHelper.reset(); hibernateSessionHelper.reset();
} }
} }
private void fixAuthority(ActionType actionType, Set<String> zones, String authority) private void fixAuthority(ActionType actionType, Set<String> zones, String authority)
{ {