mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-07 18:25:23 +00:00
20884: Merged V3.3 to V3.3-BUG-FIX 20883: ALF-3604: Fix PersonTest 20881: Merged PATCHES/V3.2.r to V3.3 20880: ALF-3264: Fix up handling of default namespace. Workaround to JXPATH-61 20878: Merged V2.2 to V3.3 20474: Fix for ALF-1362 - encode group identifiers when used inside embedded param tags 20621: Fix for reopened ALF-1362 - UnknownAuthorityException when viewing/editing/deleting a user group with html entities in it's name 20874: Merged HEAD to V3.3 20873: ALF-3604: Correct case-sensitivity issues in LDAP sync - User names are now brought in line with the case of the LDAP directory during sync (in case the UID attribute is case sensitive) - User names are now compared according to Alfresco's case sensitivity setting - Group name comparisions are still case sensitive - Added unit test to ensure correct behaviour 20868: Merged PATCHES/V3.2.r to V3.3 20832: ALF-3264: XForms 'schema evolution': Remove nodes from XForms instance document with XPaths that don't occur in prototype document 20867: Merged PATCHES/V3.2.r to V3.3 (RECORD ONLY) 20833: Incremented version label 20688: Incremented version label 20687: Merged V3.3 to PATCHES/V3.2.r 20398: Fixed ALF-2890: Upgrade removes content if transaction retries are triggered - Setting ContentData that was derived outside of the current transaction opened up a window for the post-rollback code to delete the underlying binary. The binaries are only registered for writers fetched via the ContentService now; the low-level DAO no longer does management because it can't assume that a new content URL indicates a new underlying binary. - The contentUrlConverter was creating new URLs and thus the low-level DAO cleaned up live content when retrying collisions took place. The cleanup is no longer on the stack for the patch. - Removes the ALF-558 changes around ContentData.reference() 20590: Fixed ALF-3189: Oracle/DB2/SQLServer/PostgreSQL are missing indexes to support many FK constraints - Reverses rev 17421 - Added patchy bits to post-create script and declared patch - Patch only applies to *new* installations from 3.2.0 onwards (schema 3007 to 3400) 20686: ALF-3259: Merged HEAD to PATCHES/V3.2.r 19784: Fix for CIFS/CheckInOut.exe save of working copy breaks lock on original file. ALF-2028. 20866: Merged PATCHES/V3.2.1 to V3.3 (RECORD ONLY) 20840: Incremented version label 20839: ALF-3691: Merged V3.3-BUG-FIX to PATCHES/V3.2.1 20307: VersionStore - minor fixes if running deprecated V1 - warn in startup log - do not execute migration cleanup 20367: ALF-2829: Avoid reading entire result set into memory in FixNameCrcValuesPatch 20368: Work-around for ALF-2366: patch.updateDmPermissions takes too long to complete - this patch may now be deferred until 3.4 using the sample context (DM will use old permissions and AVM new as it did in 2.2.x) - this is only supported upgrading direct to 3.2.1.x 20370: Version Migrator (ALF-1000) - use common batch processor to enable multiple workers 20373: Version Migrator (ALF-1000) - resolve runtime conflict (w/ r20334) 20387: Version Migrator (ALF-1000) - approx x3 boost (policies ignore version2 store) 20431: Version Migrator (ALF-1000) - migrate 1st batch independently 20738:ALF-3617: Merged V3.3-BUG-FIX to PATCHES/V3.2.1 20438: ALF-479: Merged DEV/BELARUS/V3.2-2010_01_11 to DEV/V3.3-BUG-FIX 18448: ETHREEOH-4044: External Authentication Subsystem does not perform user mapping for WebDAV requests The changes listed in the bug comments have been made (and corrected). 20728: Incremented version label 20727: ALF-3617: Merged HEAD to PATCHES/V3.2.1 20616: ALF-2265: Share 'Uber Filter' part 2 - WebScriptNTLMAuthenticationFilter detached from its superclass and renamed to WebScriptSSOAuthenticationFilter - Now the filter simply chains to the downstream authentication filter rather than call its superclass - This means the same filter can be used for Kerberos-protected webscripts as well as NTLM - Wired globalAuthenticationFilter behind webscriptAuthenticationFilter in the filter chain in web.xml - Configured webscriptAuthenticationFilter for Kerberos subsystem 20612: Incremented version label 20610: Merged V3.3 to PATCHES/V3.2.1 20590: Fixed ALF-3189: Oracle/DB2/SQLServer/PostgreSQL are missing indexes to support many FK constraints - Reverses rev 17421 - Added patchy bits to post-create script and declared patch - Patch only applies to *new* installations from 3.2.0 onwards (schema 3007 to 3501) 20403: Merged V3.3 to PATCHES/V3.2.1 20398: Fixed ALF-2890: Upgrade removes content if transaction retries are triggered - Setting ContentData that was derived outside of the current transaction opened up a window for the post-rollback code to delete the underlying binary. The binaries are only registered for writers fetched via the ContentService now; the low-level DAO no longer does management because it can't assume that a new content URL indicates a new underlying binary. - The contentUrlConverter was creating new URLs and thus the low-level DAO cleaned up live content when retrying collisions took place. The cleanup is no longer on the stack for the patch. - Removes the ALF-558 changes around ContentData.reference() 20391: Incremented version label 20390: ALF-2966: Merged DEV/V3.3-BUG-FIX to PATCHES/V3.2.1 20388: Merged BRANCHES/DEV/BELARUS/HEAD-2010_04_28 to BRANCHES/DEV/V3.3-BUG-FIX: 20372: ALF-897: It is impossible to create content when default value selected in ContentHeadlineBackground field for intranet_rssi_landing_template web-form (also fixes ALF-2798 & ALF-791) 20371: ALF-2861: Merged V3.2 to PATCHES/V3.2.1 20028: Reverted (and fixed line endings) of log4j.properties 20027: Merged BRANCHES/V3.1 to BRANCHES/V3.2: 19983: Changes for ALF-2545: Cannot upgrade from 2.1.2a (b 209) to the 3.1.2 (.a3 458) on Oracle 20008: ALF-2351: Oracle upgrade scripts need enhancements from 2.2SP7 20362: ALF-2883: Merged HEAD to V3.2.1 19750: Fix for ALF-2310: alfresco-mmt-3.3dev.jar shows NoClassDefFoundError: org/safehaus/uuid/UUIDGenerator 20359: Merged PATCHES/V3.2.0 to PATCHES/V3.2.1 20349: Merged V3.3 to PATCHES/V3.2.0 20346: ALF-2839: Node pre-loading generates needless resultset rows - Added missing Criteria.list() call 20280: Fixed ALF-2839: Node pre-loading generates needless resultset rows - Split Criteria query to retrieve properties and aspects separately 20272: Backports to help fix ALF-2839: Node pre-loading generates needless resultset rows Merged BRANCHES/V3.2 to PATCHES/V3.2.0: 18490: Added cache for alf_content_data Merged BRANCHES/DEV/V3.3-BUG-FIX to PATCHES/V3.2.0: 20231: Fixed ALF-2784: Degradation of performance between 3.1.1 and 3.2x (observed in JSF) 20266: Test reproduction of ALF-2839 failure: Node pre-loading generates needless resultset rows 20358: Increment version label 20343: Incremented version label 20342: Merged V3.3 to PATCHES/V3.2.1 20322: Fixed ALF-1998: contentStoreCleanerJob leads to foreign key exception - Possible concurrent modification of alf_content_url.orphan_time led to false orphan detection - Fixed queries to check for dereferencing AND use the indexed orphan_time column - More robust use of EagerContentStoreCleaner: On eager cleanup, ensure that URLs are deleted - Added optimistic lock checks on updates and deletes of alf_content_url 20864: Merged PATCHES/V3.2.0 to V3.3 (RECORD ONLY) 20750: Merged V3.3 to PATCHES/V3.2.0 20590: Fixed ALF-3189: Oracle/DB2/SQLServer/PostgreSQL are missing indexes to support many FK constraints - Reverses rev 17421 - Added patchy bits to post-create script and declared patch - Patch only applies to *new* installations from 3.2.0 onwards (schema 3007 to 3400) 20748: Incremented version label 20745: ALF-3639: Merged V3.2 to PATCHES/V3.2.0 18363: WCM clustering - ETHREEOH-3962 (duplicate root node entry) 20863: Merged PATCHES/V3.1.2 to V3.3 20830: ALF-934: Another go at making External Access Servlet reset JSF view state for the document it is requesting 20701: ALF-3203: Guarantee a deterministic initialization sequence for WebClientConfigBootstrap (PARTIAL - Needs Surf fix) 20861: Merged PATCHES/V3.2.1 to V3.3 (RECORD ONLY) 20831: Incremented version label 20702: Incremented version label 20681: ALF-3109: Merged V3.2 to PATCHES/V3.1.2 16933: Fix ETHREEOH-1788 - Bootstrap fails due to disabled-avm-indexing-context.xml 20680: ALF-3109: Merged V3.2 to PATCHES/V3.1.2 16714: WCM/AVM fixes - ETHREEOH-2697 - file system likely to get full with avm lucene directories for unindexed WCM store - ETHREEOH-1847 - re-starting cluster node may show non-staging WCM store indexes out-of-date (although not indexed) 20611: Incremented version label 20538: ALF-3117: Merged HEAD to PATCHES/V3.1.2 17099: Build Fix for failing permission test (missing flush in DAO) 20535: ALF-3141: Merged V3.2 to PATCHES/V3.1.2 17441: Build fix: Fix AVM permission inheritance to match DM and fix common permission dao component 20534: Incremented version label 20533: ALF-3117: Merged DEV/V3.3-BUG-FIX to PATCHES/V3.1.2 20368: Work-around for ALF-2366: patch.updateDmPermissions takes too long to complete - this patch may now be deferred until 3.4 using the sample context (DM will use old permissions and AVM new as it did in 2.2.x) - this is only supported upgrading direct to 3.3.1 20532: ALF-3117: Merged V3.2 to PATCHES/V3.1.2 17076: Improvements for ETHREEOH-2153: patch.updateDmPermissions takes too long to complete 20531: ALF-3141: Merged V3.2 to PATCHES/V3.1.2 17419: Fix for ETHREEOH-3296: Enterprise 3.X / Permissions Error When Cut & Paste on Sub-Folder 20516: Incremented version label 20515: ALF-3109: Merged V3.2 to PATCHES/V3.1.2 18363: WCM clustering - ETHREEOH-3962 (duplicate root node entry) 20860: Merged V3.1 to V3.3 19424: Fix bug in permission evaluation time reporting 20859: Merged V3.1 to V3.3 (RECORD ONLY) 20599: Incremented version label 20596: ALF-3184: Merged V3.3-BUGFIX to V3.1A 20307: VersionStore - minor fixes if running deprecated V1 - warn in startup log - do not execute migration cleanup 20370: Version Migrator (ALF-1000) - use common batch processor to enable multiple workers 20373: Version Migrator (ALF-1000) - resolve runtime conflict (w/ r20334) 20387: Version Migrator (ALF-1000) - approx x3 boost (policies ignore version2 store) 20431: Version Migrator (ALF-1000) - migrate 1st batch independently 20591: ALF-3184: Merged V3.2 to V3.1A (partial) 19507: ALF-955: deletion of dynamic custom model - ignore policies/behaviours for node archive store (reviewed w/ DH) 19553: Follow-on to r19507 (ALF-955) - fix testAutoRemovalOfVersionHistory 20577: ALF-3184: Ported BatchProcessor to V3.1A in preparation for VersionMigrator port 19426: Fix for eclipse build path: Part 2 19425: Fix for eclipse build path 19305: Merged V3.2 to V3.1 ('cause you never know!) 19304: Removed static (singleton) usage of CacheFactory 18996: MOB-388: Fixed copying of properties 18919: CopyServiceChildAssocsFix on 3.1 18566: Removed svn:mergeinfo 18428: Backport of r14260: fixed code typo which cased a ClassCastException with multiple pooled actors. 18424: Updated version label to 3.1.2.1 17861: Merge 2.2 to 3.1: 17803: Re-use open files for the same session/process id so that writes on each file handle go to the same file. ETWOTWO-1250. (Record-only) 17843: Re-use open files for the same session/process id so that writes on each file handle go to the same file. Port of ETWOTWO-1250. 17842: Missing file from previous checkin. 17839: Rewrite the rename file logic to handle MS Office file rename patterns. ETHREEOH-1951. 17359: Fix for CIFS/Kerberos/SPNEGO logon problem with Win2008/Win7 client. ETHREEOH-3225. 17193: ETHREEOH-3112: Issue for adding / deleting non-English files Appropriate encoding for non English symbols was added. Ported from V3.2. 17181: Fixed typo on --record-only 17130: Fix for cannot delete file via CIFS that has a thumbnail associated with it. ETHREEOH-3143 and ETHREEOH-3115. 20858: Merged V2.2 to V3.3 18568: (RECORD ONLY) Fix for CIFS SendTo->Compressed Folder 'not enough space' error. ETWOTWO-596. Ported latest v3 repo filesystem rename logic to v2, should fix a few other issues too. 17803: (RECORD ONLY) Re-use open files for the same session/process id so that writes on each file handle go to the same file. ETWOTWO-1250. 20857: Merged V2.2 to V3.3 20504: Merged DEV/BELARUS/V2.2-2010_02_03 to V2.2 19346: ALF-1358: Deleting space with "execute a script" rule fails - The invocation of the RuleServiceImpl.getRule() was added on the ruleNodeRef to get updated associations of the last one. (???) 20476: Fix for ALF-1863: Advanced Search does not work with custom type of type d:int with a constraint of type LIST 20475: Merged DEV/TEMPORARY to V2.2 20375: ALF-1830: Manage Task UI for Pooled Tasks: don't show Reject/Accept if user hasn't taken ownership 20472: (RECORD ONLY) ALF-1841: Merged DEV/BELARUS/V2.2-2009_12_01 to V2.2 (with corrections) 17865: ETWOTWO-935: Regression: readOnly settings do not work in 2.2 causing bootstrap to fail The check on current mode is read only was added into AbstractLuceneIndexerAndSearcherFactory and AlfrescoJobExecutorThread classes. 20068: Merged BRANCHES/DEV/BELARUS/V2.2-2010_02_03 to BRANCHES/V2.2: 19326: ALF-1932: ALF-1358 Deleting space with "execute a script" rule fails: Unit Test move to RuleServiceImplTest. 19670: Fix for ALF-1788: Renamed Category not usable in Query - renaming a category in the admin console now also renames the association and changes the PATH by which the category is known. 19093: Fix ALF-1791 - added unit test 19055: Fix compile error introduced during pervious merge 19048: Merge DEV/BELARUS/V2.2-2010_02_03 to V2.2 19014 : ALF-883: Rule is not triggered for a item which is restored from the bin 19045: Merge DEV/V2.1SP7 to V2.2 12225 : ETWOONE-74 (Authentication tickets expire after set time, but would be more useful to have them expire after an inactivity timeout.) 18958: Merged BELARUS/V2.2-2010_02_03 18850 Fixed ALF-1358: Deleting space with "execute a script" rule fails - Merged the fix only. The unit test belongs to the RuleService. 18918: (RECORD ONLY) Fixed backward compatibility of CopyServiceChildAssocsFix module 18759: (RECORD ONLY) Merged DEV/BELARUS/V2.2-2010_02_03 to V2.2 18553: ResultSet closing was added to methods This was fixed separately in V3.2; port forward selectively 18561: (RECORD ONLY) Merged DEV to V2.2 18552: Fix ETWOTWO-1389: Issues with ACL upgrade script for Oracle (DH: Removed commented-out SQL statements) 16304: (RECORD ONLY) ETWOONE-335: Parallel Review does not store Priority and Due Date set at task creation 1. Appropriate changes have been made in parallelreview_group_processdefinition.xml and parallelreview_processdefinition.xml files. 2. Redeploy flag is kept with false value by default in the workflow-context.xml.sample file. 3. A sorting of the list of workflow definitions by name has been already applied in all branches according to ETWOTWO-302 issue fix. 20855: Fix for ALF-3690. Unable to FTP files into Share site documentLibrary folder. This fix corrects what it essentially a typo. The dictionaryService was injected twice into the CreateNodeRuleTrigger bean, rather than the dictionaryService and the ruleService. 20853: Merged V2.2 to V3.3 (RECORD ONLY) 20459: Build fix - don't try to delete the guest user in PersonTest 20411: Merged BRANCHES/V3.1 to BRANCHES/V2.2: (for ALF-2628) 14863: (RECORD ONLY) Fixed ETHREEOH-2223: Oracle version-specific schema update failure in upgrading from 2.1A build to 20383: Merged V3.2 to V2.2 (Fixes duplicate ALF-1359) 16731: ETHREEOH-2411: Error message appears when trying to create advanced workflow with long description 19303: Updated version to 2.2.7 17811: Updated version to 2.2.6 17433: Merged V3.1 to V2.2 15894: Fix ETHREEOH-2416 and ALFCOM-3300: Duplicate name exceptions not being trapped correctly Fixes ETWOTWO-1261 15869: Port of desktop action client side EXE fixes from v3.x. ETWOTWO-1374. 20849: (RECORD ONLY) Merged V3.3-BUG-FIX to V3.3 20847: Fixes Recent Documents and My Tasks localisation issues: ALF-2021 & adds an FTL friendly medium length date format property 20828: Missed svn:mergeinfo git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20885 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
846 lines
35 KiB
Java
846 lines
35 KiB
Java
/*
|
|
* Copyright (C) 2005-2010 Alfresco Software Limited.
|
|
*
|
|
* This file is part of Alfresco
|
|
*
|
|
* Alfresco is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU Lesser General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* Alfresco is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public License
|
|
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
package org.alfresco.repo.security.person;
|
|
|
|
import java.io.Serializable;
|
|
import java.util.HashMap;
|
|
import java.util.HashSet;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.Set;
|
|
import java.util.concurrent.ConcurrentHashMap;
|
|
import java.util.concurrent.CountDownLatch;
|
|
import java.util.concurrent.TimeUnit;
|
|
|
|
import javax.transaction.Status;
|
|
import javax.transaction.UserTransaction;
|
|
|
|
import junit.framework.Assert;
|
|
import junit.framework.TestCase;
|
|
|
|
import org.alfresco.model.ContentModel;
|
|
import org.alfresco.repo.security.authentication.AuthenticationUtil;
|
|
import org.alfresco.repo.transaction.RetryingTransactionHelper;
|
|
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
|
|
import org.alfresco.service.cmr.repository.ChildAssociationRef;
|
|
import org.alfresco.service.cmr.repository.NodeRef;
|
|
import org.alfresco.service.cmr.repository.NodeService;
|
|
import org.alfresco.service.cmr.repository.StoreRef;
|
|
import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
|
|
import org.alfresco.service.cmr.security.AuthorityService;
|
|
import org.alfresco.service.cmr.security.NoSuchPersonException;
|
|
import org.alfresco.service.cmr.security.PermissionService;
|
|
import org.alfresco.service.cmr.security.PersonService;
|
|
import org.alfresco.service.namespace.QName;
|
|
import org.alfresco.service.transaction.TransactionService;
|
|
import org.alfresco.util.ApplicationContextHelper;
|
|
import org.alfresco.util.EqualsHelper;
|
|
import org.alfresco.util.GUID;
|
|
import org.alfresco.util.PropertyMap;
|
|
import org.springframework.context.ApplicationContext;
|
|
|
|
public class PersonTest extends TestCase
|
|
{
|
|
private static ApplicationContext applicationContext = ApplicationContextHelper.getApplicationContext();
|
|
|
|
private TransactionService transactionService;
|
|
|
|
private PersonService personService;
|
|
|
|
private NodeService nodeService;
|
|
|
|
private NodeRef rootNodeRef;
|
|
|
|
private PermissionService permissionService;
|
|
|
|
private AuthorityService authorityService;
|
|
|
|
private UserTransaction testTX;
|
|
|
|
public PersonTest()
|
|
{
|
|
super();
|
|
// TODO Auto-generated constructor stub
|
|
}
|
|
|
|
public void setUp() throws Exception
|
|
{
|
|
transactionService = (TransactionService) applicationContext.getBean("transactionService");
|
|
personService = (PersonService) applicationContext.getBean("personService");
|
|
nodeService = (NodeService) applicationContext.getBean("nodeService");
|
|
permissionService = (PermissionService) applicationContext.getBean("permissionService");
|
|
authorityService = (AuthorityService) applicationContext.getBean("authorityService");
|
|
|
|
|
|
testTX = transactionService.getUserTransaction();
|
|
testTX.begin();
|
|
|
|
StoreRef storeRef = nodeService.createStore(StoreRef.PROTOCOL_WORKSPACE, "Test_" + System.currentTimeMillis());
|
|
rootNodeRef = nodeService.getRootNode(storeRef);
|
|
|
|
for (NodeRef nodeRef : personService.getAllPeople())
|
|
{
|
|
String uid = DefaultTypeConverter.INSTANCE.convert(String.class, nodeService.getProperty(nodeRef, ContentModel.PROP_USERNAME));
|
|
if (!uid.equals("admin") && !uid.equals("guest") )
|
|
{
|
|
nodeService.deleteNode(nodeRef);
|
|
}
|
|
}
|
|
|
|
personService.setCreateMissingPeople(true);
|
|
|
|
testTX.commit();
|
|
testTX = transactionService.getUserTransaction();
|
|
testTX.begin();
|
|
}
|
|
|
|
@Override
|
|
protected void tearDown() throws Exception
|
|
{
|
|
|
|
if ((testTX.getStatus() == Status.STATUS_ACTIVE) || (testTX.getStatus() == Status.STATUS_MARKED_ROLLBACK))
|
|
{
|
|
testTX.rollback();
|
|
}
|
|
AuthenticationUtil.clearCurrentSecurityContext();
|
|
super.tearDown();
|
|
}
|
|
public void xtestLazyHomeFolderCreation() throws Exception
|
|
{
|
|
String firstName = "" + System.currentTimeMillis();
|
|
String lastName = String.format("%05d", -1);
|
|
final String username = GUID.generate();
|
|
String emailAddress = String.format("%s.%s@xyz.com", firstName, lastName);
|
|
PropertyMap properties = new PropertyMap(7);
|
|
properties.put(ContentModel.PROP_USERNAME, username);
|
|
properties.put(ContentModel.PROP_FIRSTNAME, firstName);
|
|
properties.put(ContentModel.PROP_LASTNAME, lastName);
|
|
properties.put(ContentModel.PROP_EMAIL, emailAddress);
|
|
final NodeRef madePerson = personService.createPerson(properties);
|
|
|
|
NodeRef homeFolder = DefaultTypeConverter.INSTANCE.convert(NodeRef.class, nodeService.getProperty(madePerson, ContentModel.PROP_HOMEFOLDER));
|
|
if (homeFolder != null)
|
|
{
|
|
throw new IllegalStateException("Home folder created eagerly");
|
|
}
|
|
|
|
testTX.commit();
|
|
testTX = transactionService.getUserTransaction();
|
|
testTX.begin();
|
|
|
|
RetryingTransactionHelper helper = transactionService.getRetryingTransactionHelper();
|
|
helper.doInTransaction(new RetryingTransactionCallback<Void>()
|
|
{
|
|
public Void execute() throws Throwable
|
|
{
|
|
assertTrue(personService.personExists(username));
|
|
NodeRef person = personService.getPerson(username);
|
|
assertEquals(madePerson, person);
|
|
NodeRef homeFolder = DefaultTypeConverter.INSTANCE.convert(NodeRef.class, nodeService.getProperty(madePerson, ContentModel.PROP_HOMEFOLDER));
|
|
if (homeFolder == null)
|
|
{
|
|
throw new IllegalStateException("Home folder not created lazily");
|
|
}
|
|
return null;
|
|
}
|
|
}, true, false);
|
|
|
|
homeFolder = DefaultTypeConverter.INSTANCE.convert(NodeRef.class, nodeService.getProperty(madePerson, ContentModel.PROP_HOMEFOLDER));
|
|
if (homeFolder == null)
|
|
{
|
|
throw new IllegalStateException("Home folder not created lazily");
|
|
}
|
|
}
|
|
|
|
public void testZones()
|
|
{
|
|
assertNull(authorityService.getAuthorityZones("derek"));
|
|
assertNull(authorityService.getAuthorityZones("null"));
|
|
|
|
personService.createPerson(createDefaultProperties("derek", "Derek", "Hulley", "dh@dh", "alfresco", rootNodeRef));
|
|
Set<String> zones = authorityService.getAuthorityZones("derek");
|
|
assertEquals(2, zones.size());
|
|
authorityService.removeAuthorityFromZones("derek", zones);
|
|
assertEquals(0, authorityService.getAuthorityZones("derek").size());
|
|
authorityService.addAuthorityToZones("derek", zones);
|
|
assertEquals(2, authorityService.getAuthorityZones("derek").size());
|
|
|
|
HashSet<String> newZones = null;
|
|
personService.createPerson(createDefaultProperties("null", "null", "null", "null", "null", rootNodeRef), newZones);
|
|
assertEquals(0, authorityService.getAuthorityZones("null").size());
|
|
|
|
newZones = new HashSet<String>();
|
|
personService.createPerson(createDefaultProperties("empty", "empty", "empty", "empty", "empty", rootNodeRef), newZones);
|
|
assertEquals(0, authorityService.getAuthorityZones("empty").size());
|
|
|
|
newZones.add("One");
|
|
personService.createPerson(createDefaultProperties("1", "1", "1", "1", "1", rootNodeRef), newZones);
|
|
assertEquals(1, authorityService.getAuthorityZones("1").size());
|
|
|
|
newZones.add("Two");
|
|
personService.createPerson(createDefaultProperties("2", "2", "2", "2", "2", rootNodeRef), newZones);
|
|
assertEquals(2, authorityService.getAuthorityZones("2").size());
|
|
|
|
newZones.add("Three");
|
|
personService.createPerson(createDefaultProperties("3", "3", "3", "3", "3", rootNodeRef), newZones);
|
|
assertEquals(3, authorityService.getAuthorityZones("3").size());
|
|
|
|
HashSet<String> toRemove = null;
|
|
authorityService.removeAuthorityFromZones("3", toRemove);
|
|
assertEquals(3, authorityService.getAuthorityZones("3").size());
|
|
|
|
toRemove = new HashSet<String>();
|
|
authorityService.removeAuthorityFromZones("3", toRemove);
|
|
assertEquals(3, authorityService.getAuthorityZones("3").size());
|
|
|
|
toRemove.add("Three");
|
|
authorityService.removeAuthorityFromZones("3", toRemove);
|
|
assertEquals(2, authorityService.getAuthorityZones("3").size());
|
|
|
|
toRemove.add("Two");
|
|
authorityService.removeAuthorityFromZones("3", toRemove);
|
|
assertEquals(1, authorityService.getAuthorityZones("3").size());
|
|
|
|
toRemove.add("One");
|
|
authorityService.removeAuthorityFromZones("3", toRemove);
|
|
assertEquals(0, authorityService.getAuthorityZones("3").size());
|
|
|
|
authorityService.addAuthorityToZones("3", newZones);
|
|
assertEquals(3, authorityService.getAuthorityZones("3").size());
|
|
assertEquals(3, authorityService.getAllAuthoritiesInZone("One", null).size());
|
|
assertEquals(2, authorityService.getAllAuthoritiesInZone("Two", null).size());
|
|
assertEquals(1, authorityService.getAllAuthoritiesInZone("Three", null).size());
|
|
|
|
}
|
|
|
|
public void xtestPerformance()
|
|
{
|
|
personService.setCreateMissingPeople(false);
|
|
|
|
personService.createPerson(createDefaultProperties("derek", "Derek", "Hulley", "dh@dh", "alfresco", rootNodeRef));
|
|
|
|
long create = 0;
|
|
|
|
long start;
|
|
long end;
|
|
|
|
for (int i = 0; i < 10000; i++)
|
|
{
|
|
String id = "TestUser-" + i;
|
|
start = System.nanoTime();
|
|
personService.createPerson(createDefaultProperties(id, id, id, id, id, rootNodeRef));
|
|
end = System.nanoTime();
|
|
create += (end - start);
|
|
|
|
if ((i > 0) && (i % 100 == 0))
|
|
{
|
|
System.out.println("Count = " + i);
|
|
System.out.println("Average create : " + (create / i / 1000000.0f));
|
|
start = System.nanoTime();
|
|
personService.personExists(id);
|
|
end = System.nanoTime();
|
|
System.out.println("Exists : " + ((end - start) / 1000000.0f));
|
|
|
|
start = System.nanoTime();
|
|
int size = personService.getAllPeople().size();
|
|
end = System.nanoTime();
|
|
System.out.println("Size (" + size + ") : " + ((end - start) / 1000000.0f));
|
|
}
|
|
}
|
|
}
|
|
|
|
public void testDeletePerson() throws Exception
|
|
{
|
|
personService.getPerson("andy");
|
|
NodeRef n1 = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}one"), ContentModel.TYPE_FOLDER).getChildRef();
|
|
NodeRef n2 = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}two"), ContentModel.TYPE_FOLDER).getChildRef();
|
|
permissionService.setPermission(n1, "andy", PermissionService.READ, true);
|
|
permissionService.setPermission(n2, "andy", PermissionService.ALL_PERMISSIONS, true);
|
|
testTX.commit();
|
|
testTX = transactionService.getUserTransaction();
|
|
testTX.begin();
|
|
nodeService.deleteNode(n1);
|
|
testTX.commit();
|
|
testTX = transactionService.getUserTransaction();
|
|
testTX.begin();
|
|
personService.deletePerson("andy");
|
|
testTX.commit();
|
|
testTX = transactionService.getUserTransaction();
|
|
testTX.begin();
|
|
}
|
|
|
|
public void testCreateAndThenDelete()
|
|
{
|
|
personService.setCreateMissingPeople(false);
|
|
assertFalse(personService.createMissingPeople());
|
|
|
|
personService.setCreateMissingPeople(true);
|
|
assertTrue(personService.createMissingPeople());
|
|
|
|
personService.setCreateMissingPeople(false);
|
|
try
|
|
{
|
|
personService.getPerson("andy");
|
|
fail("Getting Andy should fail");
|
|
}
|
|
catch (PersonException pe)
|
|
{
|
|
|
|
}
|
|
personService.createPerson(createDefaultProperties("andy", "Andy", "Hind", "andy@hind", "alfresco", rootNodeRef));
|
|
personService.getPerson("andy");
|
|
personService.deletePerson("andy");
|
|
try
|
|
{
|
|
personService.getPerson("andy");
|
|
fail("Getting Andy should fail");
|
|
}
|
|
catch (PersonException pe)
|
|
{
|
|
|
|
}
|
|
}
|
|
|
|
public void testCreateMissingPeople1()
|
|
{
|
|
personService.setCreateMissingPeople(false);
|
|
assertFalse(personService.createMissingPeople());
|
|
|
|
personService.setCreateMissingPeople(true);
|
|
assertTrue(personService.createMissingPeople());
|
|
|
|
personService.setCreateMissingPeople(false);
|
|
try
|
|
{
|
|
personService.getPerson("andy");
|
|
fail("Getting Andy should fail");
|
|
}
|
|
catch (PersonException pe)
|
|
{
|
|
|
|
}
|
|
}
|
|
|
|
public void testCreateMissingPeople2()
|
|
{
|
|
System.out.print(personService.getAllPeople());
|
|
|
|
personService.setCreateMissingPeople(false);
|
|
assertFalse(personService.createMissingPeople());
|
|
|
|
personService.setCreateMissingPeople(true);
|
|
assertTrue(personService.createMissingPeople());
|
|
|
|
NodeRef nodeRef = personService.getPerson("andy");
|
|
assertNotNull(nodeRef);
|
|
testProperties(nodeRef, "andy", "andy", "", "", "");
|
|
|
|
nodeRef = personService.getPerson("andy");
|
|
testProperties(nodeRef, "andy", "andy", "", "", "");
|
|
|
|
nodeRef = personService.getPerson("Andy");
|
|
testProperties(nodeRef, "andy", "andy", "", "", "");
|
|
|
|
assertEquals(nodeRef, personService.getPerson("Andy"));
|
|
nodeRef = personService.getPerson("Andy");
|
|
assertNotNull(nodeRef);
|
|
if (personService.getUserIdentifier("Andy").equals("Andy"))
|
|
{
|
|
testProperties(nodeRef, "Andy", "Andy", "", "", "");
|
|
}
|
|
else
|
|
{
|
|
testProperties(nodeRef, "andy", "andy", "", "", "");
|
|
}
|
|
|
|
personService.setCreateMissingPeople(false);
|
|
try
|
|
{
|
|
personService.setPersonProperties("derek", createDefaultProperties("derek", "Derek", "Hulley", "dh@dh", "alfresco", rootNodeRef));
|
|
fail("Getting Derek should fail");
|
|
}
|
|
catch (PersonException pe)
|
|
{
|
|
|
|
}
|
|
}
|
|
|
|
public void testCreateMissingPeople()
|
|
{
|
|
personService.setCreateMissingPeople(false);
|
|
assertFalse(personService.createMissingPeople());
|
|
|
|
personService.setCreateMissingPeople(true);
|
|
assertTrue(personService.createMissingPeople());
|
|
|
|
NodeRef nodeRef = personService.getPerson("andy");
|
|
assertNotNull(nodeRef);
|
|
testProperties(nodeRef, "andy", "andy", "", "", "");
|
|
|
|
personService.setCreateMissingPeople(true);
|
|
personService.setPersonProperties("derek", createDefaultProperties("derek", "Derek", "Hulley", "dh@dh", "alfresco", rootNodeRef));
|
|
testProperties(personService.getPerson("derek"), "derek", "Derek", "Hulley", "dh@dh", "alfresco");
|
|
|
|
testProperties(personService.getPerson("andy"), "andy", "andy", "", "", "");
|
|
|
|
assertEquals(4, personService.getAllPeople().size());
|
|
assertTrue(personService.getAllPeople().contains(personService.getPerson("andy")));
|
|
assertTrue(personService.getAllPeople().contains(personService.getPerson("derek")));
|
|
|
|
}
|
|
|
|
public void testMutableProperties()
|
|
{
|
|
assertEquals(5, personService.getMutableProperties().size());
|
|
assertTrue(personService.getMutableProperties().contains(ContentModel.PROP_HOMEFOLDER));
|
|
assertTrue(personService.getMutableProperties().contains(ContentModel.PROP_FIRSTNAME));
|
|
assertTrue(personService.getMutableProperties().contains(ContentModel.PROP_LASTNAME));
|
|
assertTrue(personService.getMutableProperties().contains(ContentModel.PROP_EMAIL));
|
|
assertTrue(personService.getMutableProperties().contains(ContentModel.PROP_ORGID));
|
|
|
|
}
|
|
|
|
public void testPersonCRUD1()
|
|
{
|
|
personService.setCreateMissingPeople(false);
|
|
try
|
|
{
|
|
personService.getPerson("derek");
|
|
fail("Getting Derek should fail");
|
|
}
|
|
catch (PersonException pe)
|
|
{
|
|
|
|
}
|
|
}
|
|
|
|
public void testPersonCRUD2()
|
|
{
|
|
personService.setCreateMissingPeople(false);
|
|
personService.createPerson(createDefaultProperties("derek", "Derek", "Hulley", "dh@dh", "alfresco", rootNodeRef));
|
|
testProperties(personService.getPerson("derek"), "derek", "Derek", "Hulley", "dh@dh", "alfresco");
|
|
|
|
personService.setPersonProperties("derek", createDefaultProperties("derek", "Derek_", "Hulley_", "dh@dh_", "alfresco_", rootNodeRef));
|
|
|
|
testProperties(personService.getPerson("derek"), "derek", "Derek_", "Hulley_", "dh@dh_", "alfresco_");
|
|
|
|
personService.setPersonProperties("derek", createDefaultProperties("derek", "Derek", "Hulley", "dh@dh", "alfresco", rootNodeRef));
|
|
|
|
testProperties(personService.getPerson("derek"), "derek", "Derek", "Hulley", "dh@dh", "alfresco");
|
|
|
|
assertEquals(3, personService.getAllPeople().size());
|
|
assertTrue(personService.getAllPeople().contains(personService.getPerson("derek")));
|
|
assertEquals(1, personService.getPeopleFilteredByProperty(ContentModel.PROP_USERNAME, "derek").size());
|
|
assertEquals(1, personService.getPeopleFilteredByProperty(ContentModel.PROP_EMAIL, "dh@dh").size());
|
|
assertEquals(1, personService.getPeopleFilteredByProperty(ContentModel.PROP_ORGID, "alfresco").size());
|
|
assertEquals(0, personService.getPeopleFilteredByProperty(ContentModel.PROP_USERNAME, "glen").size());
|
|
assertEquals(0, personService.getPeopleFilteredByProperty(ContentModel.PROP_EMAIL, "gj@email.com").size());
|
|
assertEquals(0, personService.getPeopleFilteredByProperty(ContentModel.PROP_ORGID, "microsoft").size());
|
|
|
|
personService.deletePerson("derek");
|
|
assertEquals(2, personService.getAllPeople().size());
|
|
try
|
|
{
|
|
personService.getPerson("derek");
|
|
fail("Getting Derek should fail");
|
|
}
|
|
catch (PersonException pe)
|
|
{
|
|
|
|
}
|
|
}
|
|
|
|
public void testPersonCRUD()
|
|
{
|
|
personService.setCreateMissingPeople(false);
|
|
personService.createPerson(createDefaultProperties("Derek", "Derek", "Hulley", "dh@dh", "alfresco", rootNodeRef));
|
|
testProperties(personService.getPerson("Derek"), "Derek", "Derek", "Hulley", "dh@dh", "alfresco");
|
|
|
|
personService.setPersonProperties("Derek", createDefaultProperties("notderek", "Derek_", "Hulley_", "dh@dh_", "alfresco_", rootNodeRef));
|
|
|
|
testProperties(personService.getPerson("Derek"), "Derek", "Derek_", "Hulley_", "dh@dh_", "alfresco_");
|
|
|
|
personService.setPersonProperties("Derek", createDefaultProperties("notderek", "Derek", "Hulley", "dh@dh", "alfresco", rootNodeRef));
|
|
|
|
testProperties(personService.getPerson("Derek"), "Derek", "Derek", "Hulley", "dh@dh", "alfresco");
|
|
|
|
assertEquals(3, personService.getAllPeople().size());
|
|
assertTrue(personService.getAllPeople().contains(personService.getPerson("Derek")));
|
|
assertEquals(1, personService.getPeopleFilteredByProperty(ContentModel.PROP_USERNAME, "Derek").size());
|
|
assertEquals(1, personService.getPeopleFilteredByProperty(ContentModel.PROP_EMAIL, "dh@dh").size());
|
|
assertEquals(1, personService.getPeopleFilteredByProperty(ContentModel.PROP_ORGID, "alfresco").size());
|
|
assertEquals(0, personService.getPeopleFilteredByProperty(ContentModel.PROP_USERNAME, "Glen").size());
|
|
assertEquals(0, personService.getPeopleFilteredByProperty(ContentModel.PROP_EMAIL, "gj@email.com").size());
|
|
assertEquals(0, personService.getPeopleFilteredByProperty(ContentModel.PROP_ORGID, "microsoft").size());
|
|
assertEquals(personService.personExists("derek"), EqualsHelper.nullSafeEquals(personService.getUserIdentifier("derek"), "Derek"));
|
|
assertEquals(personService.personExists("dEREK"), EqualsHelper.nullSafeEquals(personService.getUserIdentifier("dEREK"), "Derek"));
|
|
assertEquals(personService.personExists("DEREK"), EqualsHelper.nullSafeEquals(personService.getUserIdentifier("DEREK"), "Derek"));
|
|
|
|
personService.deletePerson("Derek");
|
|
assertEquals(2, personService.getAllPeople().size());
|
|
|
|
}
|
|
|
|
private void testProperties(NodeRef nodeRef, String userName, String firstName, String lastName, String email, String orgId)
|
|
{
|
|
assertEquals(userName, DefaultTypeConverter.INSTANCE.convert(String.class, nodeService.getProperty(nodeRef, ContentModel.PROP_USERNAME)));
|
|
assertNotNull(nodeService.getProperty(nodeRef, ContentModel.PROP_HOMEFOLDER));
|
|
assertEquals(firstName, DefaultTypeConverter.INSTANCE.convert(String.class, nodeService.getProperty(nodeRef, ContentModel.PROP_FIRSTNAME)));
|
|
assertEquals(lastName, DefaultTypeConverter.INSTANCE.convert(String.class, nodeService.getProperty(nodeRef, ContentModel.PROP_LASTNAME)));
|
|
assertEquals(email, DefaultTypeConverter.INSTANCE.convert(String.class, nodeService.getProperty(nodeRef, ContentModel.PROP_EMAIL)));
|
|
assertEquals(orgId, DefaultTypeConverter.INSTANCE.convert(String.class, nodeService.getProperty(nodeRef, ContentModel.PROP_ORGID)));
|
|
}
|
|
|
|
private Map<QName, Serializable> createDefaultProperties(String userName, String firstName, String lastName, String email, String orgId, NodeRef home)
|
|
{
|
|
HashMap<QName, Serializable> properties = new HashMap<QName, Serializable>();
|
|
properties.put(ContentModel.PROP_USERNAME, userName);
|
|
properties.put(ContentModel.PROP_HOMEFOLDER, home);
|
|
properties.put(ContentModel.PROP_FIRSTNAME, firstName);
|
|
properties.put(ContentModel.PROP_LASTNAME, lastName);
|
|
properties.put(ContentModel.PROP_EMAIL, email);
|
|
properties.put(ContentModel.PROP_ORGID, orgId);
|
|
return properties;
|
|
}
|
|
|
|
public void testCaseSensitive()
|
|
{
|
|
|
|
personService.createPerson(createDefaultProperties("Derek", "Derek", "Hulley", "dh@dh", "alfresco", rootNodeRef));
|
|
|
|
try
|
|
{
|
|
NodeRef nodeRef = personService.getPerson("derek");
|
|
if (personService.getUserIdentifier("derek").equals("Derek"))
|
|
{
|
|
assertNotNull(nodeRef);
|
|
}
|
|
else
|
|
{
|
|
assertNotNull(null);
|
|
}
|
|
}
|
|
catch (PersonException pe)
|
|
{
|
|
|
|
}
|
|
try
|
|
{
|
|
NodeRef nodeRef = personService.getPerson("deRek");
|
|
if (personService.getUserIdentifier("deRek").equals("Derek"))
|
|
{
|
|
assertNotNull(nodeRef);
|
|
}
|
|
else
|
|
{
|
|
assertNotNull(null);
|
|
}
|
|
}
|
|
catch (PersonException pe)
|
|
{
|
|
|
|
}
|
|
try
|
|
{
|
|
|
|
NodeRef nodeRef = personService.getPerson("DEREK");
|
|
if (personService.getUserIdentifier("DEREK").equals("Derek"))
|
|
{
|
|
assertNotNull(nodeRef);
|
|
}
|
|
else
|
|
{
|
|
assertNotNull(null);
|
|
}
|
|
}
|
|
catch (PersonException pe)
|
|
{
|
|
|
|
}
|
|
personService.getPerson("Derek");
|
|
}
|
|
|
|
public void testReadOnlyTransactionHandling() throws Exception
|
|
{
|
|
// Kill the annoying Spring-managed txn
|
|
testTX.commit();
|
|
|
|
|
|
boolean createMissingPeople = personService.createMissingPeople();
|
|
assertTrue("Default should be to create missing people", createMissingPeople);
|
|
|
|
final String username = "Derek";
|
|
// Make sure that the person is missing
|
|
RetryingTransactionCallback<Object> deletePersonWork = new RetryingTransactionCallback<Object>()
|
|
{
|
|
public Object execute() throws Throwable
|
|
{
|
|
personService.deletePerson(username);
|
|
return null;
|
|
}
|
|
};
|
|
transactionService.getRetryingTransactionHelper().doInTransaction(deletePersonWork, false, true);
|
|
// Make a read-only transaction and check that we get NoSuchPersonException
|
|
RetryingTransactionCallback<NodeRef> getMissingPersonWork = new RetryingTransactionCallback<NodeRef>()
|
|
{
|
|
public NodeRef execute() throws Throwable
|
|
{
|
|
return personService.getPerson(username);
|
|
}
|
|
};
|
|
try
|
|
{
|
|
transactionService.getRetryingTransactionHelper().doInTransaction(getMissingPersonWork, true, true);
|
|
fail("Expected auto-creation of person to fail gracefully");
|
|
}
|
|
catch (NoSuchPersonException e)
|
|
{
|
|
// Expected
|
|
}
|
|
// It should work in a write transaction, though
|
|
transactionService.getRetryingTransactionHelper().doInTransaction(getMissingPersonWork, false, true);
|
|
|
|
transactionService.getRetryingTransactionHelper().doInTransaction(deletePersonWork, false, true);
|
|
}
|
|
|
|
/**
|
|
* Disabled due to time constraints. This <i>does</i> highlight a problem, but one that won't manifest
|
|
* itself critically in the product.
|
|
*/
|
|
public void xtestSplitPersonCleanupManyTimes() throws Throwable
|
|
{
|
|
for (int i = 0; i < 100; i++) // Bump this number up to 1000 for 'real' testing
|
|
{
|
|
try
|
|
{
|
|
forceSplitPersonCleanup();
|
|
}
|
|
catch (Throwable e)
|
|
{
|
|
throw new RuntimeException("Failed on iteration " + i + " of forcing split person.", e);
|
|
}
|
|
}
|
|
}
|
|
|
|
private void forceSplitPersonCleanup() throws Exception
|
|
{
|
|
// Kill the annoying Spring-managed txn
|
|
testTX.commit();
|
|
|
|
boolean createMissingPeople = personService.createMissingPeople();
|
|
assertTrue("Default should be to create missing people", createMissingPeople);
|
|
|
|
PersonServiceImpl personServiceImpl = (PersonServiceImpl) personService;
|
|
personServiceImpl.setDuplicateMode("LEAVE");
|
|
|
|
// The user to duplicate
|
|
final String duplicateUsername = GUID.generate();
|
|
// Make sure that the person is missing
|
|
RetryingTransactionCallback<Object> deletePersonWork = new RetryingTransactionCallback<Object>()
|
|
{
|
|
public Object execute() throws Throwable
|
|
{
|
|
personService.deletePerson(duplicateUsername);
|
|
return null;
|
|
}
|
|
};
|
|
transactionService.getRetryingTransactionHelper().doInTransaction(deletePersonWork, false, true);
|
|
// Fire off 10 threads to create the same person
|
|
int threadCount = 10;
|
|
final CountDownLatch startLatch = new CountDownLatch(threadCount);
|
|
final CountDownLatch endLatch = new CountDownLatch(threadCount);
|
|
final Map<String, NodeRef> cleanableNodeRefs = new ConcurrentHashMap<String, NodeRef>(17);
|
|
Runnable createPersonRunnable = new Runnable()
|
|
{
|
|
public void run()
|
|
{
|
|
final RetryingTransactionCallback<NodeRef> createPersonWork = new RetryingTransactionCallback<NodeRef>()
|
|
{
|
|
public NodeRef execute() throws Throwable
|
|
{
|
|
// Wait for the trigger to start
|
|
try
|
|
{
|
|
startLatch.await();
|
|
}
|
|
catch (InterruptedException e)
|
|
{
|
|
}
|
|
|
|
// Trigger
|
|
NodeRef personNodeRef = personService.getPerson(duplicateUsername);
|
|
return personNodeRef;
|
|
}
|
|
};
|
|
startLatch.countDown();
|
|
try
|
|
{
|
|
NodeRef nodeRef = transactionService.getRetryingTransactionHelper().doInTransaction(createPersonWork, false, true);
|
|
// Store the noderef for later checking
|
|
String threadName = Thread.currentThread().getName();
|
|
cleanableNodeRefs.put(threadName, nodeRef);
|
|
}
|
|
catch (Throwable e)
|
|
{
|
|
// Errrm
|
|
e.printStackTrace();
|
|
}
|
|
endLatch.countDown();
|
|
}
|
|
};
|
|
// Fire the threads
|
|
for (int i = 0; i < threadCount; i++)
|
|
{
|
|
Thread thread = new Thread(createPersonRunnable);
|
|
thread.setName(getName() + "-" + i);
|
|
thread.setDaemon(true);
|
|
thread.start();
|
|
}
|
|
// Wait for the threads to have finished
|
|
try
|
|
{
|
|
endLatch.await(60, TimeUnit.SECONDS);
|
|
}
|
|
catch (InterruptedException e)
|
|
{
|
|
}
|
|
|
|
// Now, get the user with full split person handling
|
|
personServiceImpl.setDuplicateMode("DELETE");
|
|
|
|
RetryingTransactionCallback<NodeRef> getPersonWork = new RetryingTransactionCallback<NodeRef>()
|
|
{
|
|
public NodeRef execute() throws Throwable
|
|
{
|
|
return personService.getPerson(duplicateUsername);
|
|
}
|
|
};
|
|
final NodeRef remainingNodeRef = transactionService.getRetryingTransactionHelper().doInTransaction(getPersonWork, false, true);
|
|
transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<Object>(){
|
|
|
|
public Object execute() throws Throwable
|
|
{
|
|
// Should all be cleaned up now, but no way to check
|
|
for (NodeRef nodeRef : cleanableNodeRefs.values())
|
|
{
|
|
if (nodeRef.equals(remainingNodeRef))
|
|
{
|
|
// This one should still be around
|
|
continue;
|
|
}
|
|
if (nodeService.exists(nodeRef))
|
|
{
|
|
fail("Expected unused person noderef to have been cleaned up: " + nodeRef);
|
|
}
|
|
}
|
|
return null;
|
|
}
|
|
}, true, true);
|
|
}
|
|
|
|
public void testSplitDuplicates() throws Exception
|
|
{
|
|
testProcessDuplicates(true);
|
|
|
|
// Test out the SplitPersonCleanupBootstrapBean for removal of the duplicates
|
|
SplitPersonCleanupBootstrapBean splitPersonBean = new SplitPersonCleanupBootstrapBean();
|
|
splitPersonBean.setNodeService(nodeService);
|
|
splitPersonBean.setPersonService(personService);
|
|
splitPersonBean.setTransactionService(transactionService);
|
|
Assert.assertEquals(9, splitPersonBean.removePeopleWithGUIDBasedIds());
|
|
|
|
}
|
|
|
|
public void testDeleteDuplicates() throws Exception
|
|
{
|
|
testProcessDuplicates(false);
|
|
}
|
|
|
|
private void testProcessDuplicates(final boolean split) throws Exception
|
|
{
|
|
// Kill the annoying Spring-managed txn
|
|
testTX.commit();
|
|
|
|
// Set the duplicate processing mode
|
|
((PersonServiceImpl) personService).setDuplicateMode(split ? "SPLIT" : "DELETE");
|
|
|
|
final String duplicateUserName = GUID.generate();
|
|
final NodeRef[] duplicates = transactionService.getRetryingTransactionHelper().doInTransaction(
|
|
new RetryingTransactionCallback<NodeRef[]>()
|
|
{
|
|
|
|
public NodeRef[] execute() throws Throwable
|
|
{
|
|
NodeRef[] duplicates = new NodeRef[10];
|
|
|
|
// Generate a first person node
|
|
Map<QName, Serializable> properties = createDefaultProperties(duplicateUserName, "firstName", "lastName", "email@orgId", "orgId", null);
|
|
duplicates[0] = personService.createPerson(properties);
|
|
ChildAssociationRef container = nodeService.getPrimaryParent(duplicates[0]);
|
|
List<ChildAssociationRef> parents = nodeService.getParentAssocs(duplicates[0]);
|
|
|
|
// Generate some duplicates
|
|
for (int i = 1; i < duplicates.length; i++)
|
|
{
|
|
// Create the node with the same parent assocs
|
|
duplicates[i] = nodeService.createNode(container.getParentRef(), container.getTypeQName(),
|
|
container.getQName(), ContentModel.TYPE_PERSON, properties).getChildRef();
|
|
for (ChildAssociationRef parent : parents)
|
|
{
|
|
if (!parent.isPrimary())
|
|
{
|
|
nodeService.addChild(parent.getParentRef(), duplicates[i], parent.getTypeQName(),
|
|
parent.getQName());
|
|
}
|
|
}
|
|
}
|
|
// With the default settings, the last created node should be the one that wins
|
|
assertEquals(duplicates[duplicates.length - 1], personService.getPerson(duplicateUserName));
|
|
return duplicates;
|
|
}
|
|
}, false, true);
|
|
|
|
// Check the duplicates were processed appropriately in the previous transaction
|
|
transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<Void>()
|
|
{
|
|
public Void execute() throws Throwable
|
|
{
|
|
for (int i = 0; i < duplicates.length - 1; i++)
|
|
{
|
|
if (split)
|
|
{
|
|
String newUserName = (String) nodeService
|
|
.getProperty(duplicates[i], ContentModel.PROP_USERNAME);
|
|
assertNotSame(duplicateUserName, newUserName);
|
|
}
|
|
else
|
|
{
|
|
assertFalse(nodeService.exists(duplicates[i]));
|
|
}
|
|
}
|
|
|
|
// Get rid of the non-split person
|
|
assertTrue(personService.personExists(duplicateUserName));
|
|
personService.deletePerson(duplicateUserName);
|
|
return null;
|
|
}
|
|
}, false, true);
|
|
}
|
|
}
|