Merged V3.2 to HEAD:

19472: ALF-725: Revert to using jTDS JDBC driver for SQL Server in 3.2 SP1, since the Microsoft driver doesn't work with the v3.2.r iBATIS stuff
      - All example/installer alfresco-global.properties updated
      - Wiki updated http://wiki.alfresco.com/wiki/Database_Configuration#MS-SQL_Databases
      - Logged doc bug ALF-2144 and release note bug ALF-2145
   19501:Merged DEV/BELARUS/V3.2-2010_02_24 to V3.2 (with corrections)
      19243: ALF-757: Cannot start up on JBoss 5.1 due to audit configuration error
         - Removed getPath() method because it is incompatible with JBoss and other app servers where resources can't be resolved to a file
         - Now use Spring ResourceLoader instead of creating FileInputStream
         - getLastModified() still returned where the resource resolves to a file; otherwise the server startup time
   19503: (RECORD ONLY) ALF-2100: Merged HEAD to V3.2
      19155: ALF-1995: Removed remaining direct dependencies on portlet API from Alfresco Explorer classes
         - Moved into AlfrescoFacesPortlet
         - portlet.jar was removed from alfresco.war for Liferay compatibility
   19506: Merged PATCHES/V3.1.2 to V3.2
      19218: (RECORD ONLY) Created hotfix branch off TAGS/ENTERPRISE/V3.1.2
      19229: (RECORD ONLY) Merged V3.1 to V3.1.2
         18577: Fix for ETHREEOH-4117, based on CHK-11154
      19341: Merged DEV/BELARUS/V3.1-2010_02_05 to PATCHES/V3.1.2 (with corrections)
         19156: ALF-1906: splitPersonCleanUpBootstrapBean is not able to remove duplicated users
         Also
         - improved detection of 'split' persons
         - added unit tests for person splitting and deleting
         - fixed duplicate person caching and sorting problems
         - prevented onUpdateProperties from firing needlessly in PersonServiceImpl and AuthorityDAOImpl when persons and authorities are created initially
      19342: (RECORD ONLY) Incremented version number
   19508: Merged PATCHES/V3.2.0 to V3.2
      18762: (RECORD ONLY) Created hotfix branch off V3.2.0-ENTERPRISE-FINAL
      18789: (RECORD ONLY) Merged BRANCHES/V3.2:r17905,18254,18319 to PATCHES/V3.2.0
         r17905 | markr | 2010-01-06 16:55:12 +0000 (Wed, 06 Jan 2010) | 3 lines
            ETHREEOH-3809 - WCM - First test server deploy fails.
               added yet another transaction to read the previous snapshot transaction.
               added a new system test based upon the WCM services.    The beginnings of testing against layered authored sandboxes.
         r18254 | janv | 2010-01-22 18:15:43 +0000 (Fri, 22 Jan 2010) | 1 line
            WCM/AVM - ETHREEOH-2057 (Submitting WCM Content through WF JSF Error - due to AVM Sync issue)
         r18319 | royw | 2010-01-27 12:18:27 +0000 (Wed, 27 Jan 2010) | 4 lines
            Merged BRANCHES/DEV/BELARUS/V3.2-2010_01_11 to V3.2
               18273: ETHREEOH-3834: WCM: An extral .xml.html file is created when editing newly created content
      18822: (RECORD ONLY) Merged DEV_TEMPORARY to PATCHES/V3.2.0
         18478: SAP XForms errors - ACT 15969
         18699: ETHREEOH-4171: HTTP 500 when filling in a WCM webform - ACT 15969
      18842: (RECORD ONLY)  Merged V3.2 to PATCHES/V3.2.0
         18701: Merged DEV_TEMPORARY to V3.2
            18693 : ETHREEOH-4182: ASR deployer fails to set the contentUrl of documents on the target system
               - Merged in fix related to closing output streams.
               - Increased coverage of unit test.
      18854: (RECORD ONLY) Merged V3.2 to V3.2.0
         18019: ETHREEOH-3770: LDAP sync now supports attribute range retrieval to get around limits imposed by Active Directory on multi-valued attributes
            - Meant that groups with more than 1000 members were getting truncated in Active Directory
            - Now switched on in ldap-ad and off in ldap subsystem
            - Also switched off result set paging in ldap subsystem by default for wider compatibility with non-AD systems
         18272: Merged DEV/BELARUS/V3.2-2010_01_11 to V3.2
            18257: ETHREEOH-4002: User/Group sync does not handle LDAP communication failures
               - Merged with corrections
         18276: ETHREEOH-4002: Correction to previous checkin - modification dates are only persisted after successful processing of users and groups, so need to delete them on comms failure
         18340: ETHREEOH-4069: LDAP sync cannot resolve DNs containing a slash character
            - Due to JNDI interpreting the slash character as a separator
         18403: ETHREEOH-4008: LDAP sync should preserve case of group members
            - Was incorrectly extracting attributes from lower-cased DN
         18846: ETHREEOH-4233: LDAP sync now synchronizes group display names
            - New ldap.synchronization.groupDisplayNameAttributeName property provides name of LDAP attribute
      18877: (RECORD ONLY) Merged /alfresco/BRANCHES/V3.2:r18616
         r18616 | markr | 2010-02-12 14:08:52 +0000 (Fri, 12 Feb 2010) | 1 line
            ETHREEOH-4181 - Access denied exception when deploying via avm deployment receiver
      19319: ALF-2043: User ID case sensitivity issues with Sharepoint Connector and External Authentication Subsystem
         - DefaultRemoteUserMapper and AlfrescoUserGroupServiceHandler should use personService.getUserIdentifier() to 'normalize' a username according to case sensitivity settings
         - NtlmAuthenticationHandler should also leave the normalization to personService
      19320: (RECORD ONLY) Incremented version label
      19380: ALF-2043: Revisit user ID case sensitivity in DefaultRemoteUserMapper
         - Has to use public PersonService in case it is accessed outside of a transaction
         - Fixed regular expression matching
         - Added unit tests to try out all the remote user mapper options
   19509: Merged PATCHES/V3.2.r to V3.2
      18803: (RECORD ONLY) Created hotfix branch off V3.2.r-ENTERPRISE-FINAL
      18833: (RECORD ONLY) Turn on Repo Doclib by default
      19054: (RECORD ONLY) Merging V3.2 to PATCHES/V3.2.r
         18787: MT: fix ETHREEOH-4125 - authority migration / batch processor (when upgrading groups from 3.1 to 3.2)
      19358: (RECORD ONLY) Merged DEV/BELARUS/V3.2-2010_01_11 to PATCHES/V3.2.r
         18699: ETHREEOH-4171: HTTP 500 when filling in a WCM webform
      19447: (RECORD ONLY) Incremented version label
   19518: ALF-757: Corrected audit config resource URL so that it resolves inside Tomcat as well as JUnit!
   19525: ALF-708: Use BatchProcessor to process duplicate persons in small batches in SplitPersonCleanupBootstrapBean
      - Even tested in a unit test!


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19536 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/security/person/PersonTest.java

@@ -21,15 +21,19 @@ 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 junit.framework.Assert;
+
 import org.alfresco.model.ContentModel;
 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;
@@ -726,4 +730,94 @@ public class PersonTest extends BaseSpringTest
             }
         }, true, true);        
     }
+    
+    public void testSplitDuplicates()
+    {
+        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()
+    {
+        testProcessDuplicates(false);        
+    }
+
+    private void testProcessDuplicates(final boolean split)
+    {
+        // Kill the annoying Spring-managed txn
+        super.setComplete();
+        super.endTransaction();
+
+        // 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);
+    }
 }