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

Merged V3.2 to HEAD

Browse Source 
16708: Fix for ETHREEOH-2247: "patch.authorityDefaultZonesPatch" patch is quite slow on DB with many users/groups - it does not output any progress indicator during the time that the server is apparently frozen during startup
    16712: Fix for ETHREEOH-2291: Atomic index property in contentModel.xml
    16799: Fix for ETHREEOH-2843:  lucene.indexer.minMergeDocs , lucene.indexer.mergeFactor and lucene.indexer.maxMergeDocs are never read / used


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17011 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrew Hind
2009-10-19 09:50:20 +00:00
parent 5b78c27360
commit 24a4251d8a
5 changed files with 164 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,7 +29,9 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
import org.alfresco.i18n.I18NUtil;
import org.alfresco.repo.admin.patch.AbstractPatch;
import org.alfresco.repo.admin.patch.PatchExecuter;
import org.alfresco.repo.domain.hibernate.HibernateSessionHelper;
import org.alfresco.service.cmr.avm.AVMService;
import org.alfresco.service.cmr.avm.AVMStoreDescriptor;
@@ -37,6 +39,8 @@ import org.alfresco.service.cmr.security.AuthorityService;
import org.alfresco.service.cmr.security.AuthorityType;
import org.alfresco.service.cmr.site.SiteInfo;
import org.alfresco.service.cmr.site.SiteService;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
/**
* Patch to assign users and groups to default zones
@@ -47,6 +51,9 @@ public class AuthorityDefaultZonesPatch extends AbstractPatch
{
/** Success message. */
private static final String MSG_SUCCESS = "patch.authorityDefaultZonesPatch.result";
private static final String MSG_UPDATE_USERS = "patch.authorityDefaultZonesPatch.users";
private static final String MSG_UPDATE_GROUPS = "patch.authorityDefaultZonesPatch.groups";
private static Log progress_logger = LogFactory.getLog(PatchExecuter.class);
/** The authority service. */
private AuthorityService authorityService;
@@ -97,14 +104,21 @@ public class AuthorityDefaultZonesPatch extends AbstractPatch
@Override
protected String applyInternal() throws Exception
{
setZonesForPeople();
setZonesForGroups();
int count = 0;
int total = authorityService.getAllAuthorities(AuthorityType.USER).size() + authorityService.getAllAuthorities(AuthorityType.GROUP).size();
reportProgress(total, count);
String msg = I18NUtil.getMessage(MSG_UPDATE_USERS);
progress_logger.info(msg);
count = setZonesForPeople(total, count);
msg = I18NUtil.getMessage(MSG_UPDATE_GROUPS);
progress_logger.info(msg);
setZonesForGroups(total, count);
return MSG_SUCCESS;
}
private void setZonesForPeople()
private int setZonesForPeople(int total, int start)
{
Set<String> defaultZones = new HashSet<String>(2, 1.0f);
defaultZones.add(AuthorityService.ZONE_APP_DEFAULT);
@@ -113,11 +127,11 @@ public class AuthorityDefaultZonesPatch extends AbstractPatch
List<Action> personActions = new ArrayList<Action>(1);
personActions.add(new Action(null, defaultZones, ActionType.SET));
setZones(AuthorityType.USER, personActions);
return setZones(AuthorityType.USER, personActions, total, start);
}
private void setZonesForGroups()
private int setZonesForGroups(int total, int start)
{
Set<String> defaultZones = new HashSet<String>(2, 1.0f);
defaultZones.add(AuthorityService.ZONE_APP_DEFAULT);
@@ -152,13 +166,13 @@ public class AuthorityDefaultZonesPatch extends AbstractPatch
}
groupActions.add(new Action(null, defaultZones, ActionType.SET));
setZones(AuthorityType.GROUP, groupActions);
return setZones(AuthorityType.GROUP, groupActions, total, start);
}
private void setZones(AuthorityType authorityType, List<Action> actions)
private int setZones(AuthorityType authorityType, List<Action> actions, int total, int start)
{
int count = start;
hibernateSessionHelper.mark();
Set<String> authorities = authorityService.getAllAuthorities(authorityType);
hibernateSessionHelper.reset();
@@ -181,7 +195,10 @@ public class AuthorityDefaultZonesPatch extends AbstractPatch
}
}
hibernateSessionHelper.reset();
count++;
reportProgress(total, count);
}
return count;
}