Merged V3.2 to HEAD

17163: org.alfresco.repo.domain.hibernate.AclDaoComponentImpl.updateAuthority() needs to flush/dirty the session in order to work
   17160: Fix HeartBeat
      - Lazy initialization in scheduled job needed its own transaction
   17146: Fix failing unit tests
      - HibernateNodeDaoServiceImpl.moveNodeToStore() must invalidate parentAssocsCache now that it contains NodeRefs
   17145: Fixes to patches for new CRC schema changes
      - Sequenced patch.fixNameCrcValues-2 before all other patches
      - Fixed typos in schema upgrade script and added CRCs for the repository descriptor nodes, so that the descriptor service and patch service can boot up
      - HeartBeat initializes lazily so that it doesn't try to load information before the patch service has bootstrapped
      - Made FixNameCrcValuesPatch industrial strength by using BatchProcessor to handle multi threading, progress reporting and transaction delineation
   17097: Removal of spurious logs directory accidentally introduced in 17096
   17096: Performance tuning for improved throughput during high volume import from LDAP directory
      - Lucene indexer will now no longer index and then reindex the same node in the same transaction
      - lucene.indexer.mergerTargetOverlaysBlockingFactor reduced to 1 (improves indexing performance and no excessive throttling observed during 10 hour test)
      - HomeFolderManager fixed so that it pays attention to the eager home folder creation flag
      - HibernateNodeDaoServiceImpl.parentAssocsCache 'upgraded' to hold information about root nodes and node refs so that recursive methods such as prependPaths can run entirely out of the cache
      - Boolean argument added to getChildAssocs() so that preloading of all child nodes is optional
      - qname_crc column added to alf_child_assoc to allow efficient lookup and indexing of child associations by QName. CRC of (qname_namespace, qname_localname).
      - idx_alf_cass_qnln on qname_localname replaced with idx_alf_cass_qncrc (qname_crc, type_qname_id, parent_node_id)
      - All node service lookup queries involving qname_localname modified to include qname_crc in WHERE clause
      - schema patch provided
      - existing org.alfresco.repo.admin.patch.impl.FixNameCrcValuesPatch extended to also fill in qname_crc column and forced to run on newer schemas
      - Optimized ChainingUserRegistrySynchronizer so that it doesn't have to look up the entire set of authorities during  an 'empty' incremental sync
      - ChainingUserRegistrySynchronizer no longer starts an outer transaction around all its smaller transactions (used to die due to timeout)
      - rule service disabled for LDAP batch processing threads
      - org.alfresco.cache.parentAssocsCache and org.alfresco.cache.storeAndNodeIdCache size increased to 80,000
      - Fixed case sensitivity issue with person caching in PersonServiceImpl
      - Cache the people container in PersonServiceImpl for faster person lookups
      - PersonDAO removed and replaced with now more efficient node service child assoc lookup methods


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

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

@@ -350,7 +350,7 @@ public class PersonServiceImpl extends TransactionListenerAdapter implements Per
         {
             List<ChildAssociationRef> childRefs = nodeService.getChildAssocs(getPeopleContainer(),
                     ContentModel.ASSOC_CHILDREN, QName.createQName("cm", searchUserName.toLowerCase(),
-                            namespacePrefixResolver));
+                            namespacePrefixResolver), false);
             allRefs = new LinkedHashMap<String, NodeRef>(childRefs.size() * 2);
             // add to cache
             personCache.put(cacheKey, allRefs);
@@ -569,6 +569,11 @@ public class PersonServiceImpl extends TransactionListenerAdapter implements Per
     }
 
     public void setPersonProperties(String userName, Map<QName, Serializable> properties)
+    {
+        setPersonProperties(userName, properties, true);
+    }
+
+    public void setPersonProperties(String userName, Map<QName, Serializable> properties, boolean autoCreate)
     {
         NodeRef personNode = getPersonOrNull(userName);
         if (personNode == null)
@@ -584,7 +589,10 @@ public class PersonServiceImpl extends TransactionListenerAdapter implements Per
         }
         else
         {
-            makeHomeFolderIfRequired(personNode);
+            if (autoCreate)
+            {
+                makeHomeFolderIfRequired(personNode);                
+            }
             String realUserName = DefaultTypeConverter.INSTANCE.convert(String.class, nodeService.getProperty(personNode, ContentModel.PROP_USERNAME));
             properties.put(ContentModel.PROP_USERNAME, realUserName);
         }
@@ -603,7 +611,6 @@ public class PersonServiceImpl extends TransactionListenerAdapter implements Per
     {
         HashMap<QName, Serializable> properties = getDefaultProperties(userName);
         NodeRef person = createPerson(properties);
-        makeHomeFolderIfRequired(person);
         return person;
     }
 
@@ -619,7 +626,7 @@ public class PersonServiceImpl extends TransactionListenerAdapter implements Per
                 {
                     public Object execute() throws Throwable
                     {
-                        homeFolderManager.onCreateNode(ref);
+                        homeFolderManager.makeHomeFolder(ref);
                         return null;
                     }
                 }, transactionService.isReadOnly(), false);
@@ -688,7 +695,7 @@ public class PersonServiceImpl extends TransactionListenerAdapter implements Per
         {
             NodeRef rootNodeRef = nodeService.getRootNode(tenantService.getName(storeRef));
             List<ChildAssociationRef> children = nodeService.getChildAssocs(rootNodeRef, RegexQNamePattern.MATCH_ALL,
-                    QName.createQName(SYSTEM_FOLDER_SHORT_QNAME, namespacePrefixResolver));
+                    QName.createQName(SYSTEM_FOLDER_SHORT_QNAME, namespacePrefixResolver), false);
 
             if (children.size() == 0)
             {
@@ -699,7 +706,7 @@ public class PersonServiceImpl extends TransactionListenerAdapter implements Per
             NodeRef systemNodeRef = children.get(0).getChildRef();
 
             children = nodeService.getChildAssocs(systemNodeRef, RegexQNamePattern.MATCH_ALL, QName.createQName(
-                    PEOPLE_FOLDER_SHORT_QNAME, namespacePrefixResolver));
+                    PEOPLE_FOLDER_SHORT_QNAME, namespacePrefixResolver), false);
 
             if (children.size() == 0)
             {
@@ -763,7 +770,7 @@ public class PersonServiceImpl extends TransactionListenerAdapter implements Per
     public Set<NodeRef> getAllPeople()
     {
         List<ChildAssociationRef> childRefs = nodeService.getChildAssocs(getPeopleContainer(),
-                ContentModel.ASSOC_CHILDREN, RegexQNamePattern.MATCH_ALL);
+                ContentModel.ASSOC_CHILDREN, RegexQNamePattern.MATCH_ALL, false);
         Set<NodeRef> refs = new HashSet<NodeRef>(childRefs.size()*2);
         for (ChildAssociationRef childRef : childRefs)
         {