mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)
51903 to 54309 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -248,6 +248,7 @@ public class HomeFolderProviderSynchronizer extends AbstractLifecycleBean
|
||||
|
||||
// Define the phases
|
||||
final String createParentFoldersPhaseName = "createParentFolders";
|
||||
final String moveFolderThatClashesPhaseName = "moveHomeFolderThatClashesWithParentFolderStructure";
|
||||
RunAsWorker[] workers = new RunAsWorker[]
|
||||
{
|
||||
new RunAsWorker(systemUserName, tenantDomain, "calculateParentFolderStructure")
|
||||
@@ -260,7 +261,7 @@ public class HomeFolderProviderSynchronizer extends AbstractLifecycleBean
|
||||
}
|
||||
},
|
||||
|
||||
new RunAsWorker(systemUserName, tenantDomain, "moveHomeFolderThatClashesWithParentFolderStructure")
|
||||
new RunAsWorker(systemUserName, tenantDomain, moveFolderThatClashesPhaseName)
|
||||
{
|
||||
@Override
|
||||
public void doWork(NodeRef person) throws Exception
|
||||
@@ -301,7 +302,7 @@ public class HomeFolderProviderSynchronizer extends AbstractLifecycleBean
|
||||
name+" --");
|
||||
}
|
||||
|
||||
int threadCount = (name.equals(createParentFoldersPhaseName)) ? 1 : 2;
|
||||
int threadCount = (name.equals(createParentFoldersPhaseName) || name.equals(moveFolderThatClashesPhaseName)) ? 1 : 2;
|
||||
int peoplePerTransaction = 20;
|
||||
|
||||
// Use 2 threads, 20 person objects per transaction. Log every 100 entries.
|
||||
|
Reference in New Issue
Block a user