Merged V3.2 to HEAD

17475: ETHREEOH-3295: Fix to AuthorityMigrationPatch
      - Forces transaction retry if worker thread reaches child authority before a parent authority
      - Tested on Kev's 3.1.1 repository with ~20,000 bulk loaded users and ~2,000 Share sites
      - Now completes in 5 minutes as opposed to 45
   17461: ETHREEOH-3268: Added MutableAuthenticationService.isAuthenticationCreationAllowed () to allow conditional display of external user invitation UI
   17450: ETHREEOH-2762: Correction to previous fix. Do not generate new name when working copy copied back on check in.
   17440: ETHREEOH-3295: Fixed logging in FixNameCrcValuesPatch
   17439: ETHREEOH-2762: Improved behaviour when a working copy is copied
      - Working copy aspect already removed the working copy aspect on copy
      - Now derives a new name from the node checked out from and a UUID, preserving the extension
   17438: ETHREEOH-2690: Fix sequencing of jgroups system property setting
      - declared dependency between internalEHCacheManager and jgroupsPropertySetter
   17436: ETHREEOH-3295: Further performance improvements to AuthorityMigrationPatch
      - authority created at same time as all its parent associations to save lots of reindexing, as per LDAP sync
      - multi-threaded BatchProcessor (as used by LDAP sync, FixNameCrcValuesPatch) used to process work in 2 threads in batches of 20, report progress every 100 entries and handle transaction retries
      - BatchProcessor now promoted to its own package
   17394: Fix for license issue in local enterprise builds.
      - Replace Community with Enterprise in version.properties during enterprise war building
   17365: ETHREEOH-3229: Visited and fixed all SearchService result set leaks
   17362: ETHREEOH-3254: Eliminate needless ping to LDAP server in LDAPAuthenticationComponentImpl.implementationAllowsGuestLogin()
   17348: ETHREEOH-3003: Fix NPE in Hyperic when LicenseDescriptor has null fields
   17316: Merged V3.1 to V3.2
      17315: ETHREEOH-3092: PersonService won't let you create duplicate persons anymore.
      17314: ETHREEOH-3158: Fix RepoServerMgmt to work with external authentication methods
         - AuthenticationService.getCurrentTicket / getNewTicket now call pre authentication check before issuing a new ticket, thus still allowing ticket enforcement when external authentication is in use.
      17312: ETHREEOH-3219: Enable resolution of JMX server password file path on JBoss 5
      17299: Merged V3.2 to V3.1 (Record only)
         17297: ETHREEOH-1593: Changed name of username cookie and fixed login.jsp to decode it properly
         17248: ETHREEOH-1593: alfUser cookie value should be base 64 encoded to allow for non-ASCII characters
   17297: ETHREEOH-1593: Changed name of username cookie and fixed login.jsp to decode it properly
      - thanks Kev!
   17292: ETHREEOH-1842: Ticket association with HttpSession IDs tracked so that we don't invalidate a ticket in use by multiple sessions prematurely
      - AuthenticationService validate, getCurrentTicket, etc. methods now take optional sessionId arguments
   17269: Fix failing unit test
      - reinstate original behaviour of AbstractChainingAuthenticationService.getAuthenticationEnabled()
   17268: Fix InvitationService
      - Runs as system to do privileged AuthenticationService actions


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

source/java/org/alfresco/repo/security/sync/ChainingUserRegistrySynchronizer.java

@@ -42,6 +42,8 @@ import org.alfresco.model.ContentModel;
 import org.alfresco.repo.attributes.Attribute;
 import org.alfresco.repo.attributes.LongAttributeValue;
 import org.alfresco.repo.attributes.MapAttributeValue;
+import org.alfresco.repo.batch.BatchProcessor;
+import org.alfresco.repo.batch.BatchProcessor.Worker;
 import org.alfresco.repo.lock.JobLockService;
 import org.alfresco.repo.lock.LockAcquisitionException;
 import org.alfresco.repo.management.subsystems.ActivateableBean;
@@ -137,7 +139,7 @@ public class ChainingUserRegistrySynchronizer extends AbstractLifecycleBean impl
 
     /** The transaction service. */
     private TransactionService transactionService;
-    
+
     /** The retrying transaction helper. */
     private RetryingTransactionHelper retryingTransactionHelper;
 
@@ -542,9 +544,9 @@ public class ChainingUserRegistrySynchronizer extends AbstractLifecycleBean impl
         // First, analyze the group structure. Create maps of authorities to their parents for associations to create
         // and delete. Also deal with 'overlaps' with other zones in the authentication chain.
         final BatchProcessor<NodeDescription> groupProcessor = new BatchProcessor<NodeDescription>(
-                this.retryingTransactionHelper, this.ruleService, this.applicationEventPublisher, userRegistry
-                        .getGroups(lastModified), zone + " Group Analysis", this.loggingInterval, this.workerThreads,
-                20);
+                ChainingUserRegistrySynchronizer.logger, this.retryingTransactionHelper, this.ruleService,
+                this.applicationEventPublisher, userRegistry.getGroups(lastModified), zone + " Group Analysis",
+                this.loggingInterval, this.workerThreads, 20);
         class Analyzer implements Worker<NodeDescription>
         {
             private final Set<String> allZoneAuthorities = new TreeSet<String>();
@@ -776,9 +778,9 @@ public class ChainingUserRegistrySynchronizer extends AbstractLifecycleBean impl
                 // Add the groups and their parent associations in depth-first order
                 final Set<String> groupsToCreate = groupAnalyzer.getGroupsToCreate();
                 BatchProcessor<Map.Entry<String, Set<String>>> groupCreator = new BatchProcessor<Map.Entry<String, Set<String>>>(
-                        this.retryingTransactionHelper, this.ruleService, this.applicationEventPublisher,
-                        sortedGroupAssociations.entrySet(), zone + " Group Creation and Association",
-                        this.loggingInterval, this.workerThreads, 20);
+                        ChainingUserRegistrySynchronizer.logger, this.retryingTransactionHelper, this.ruleService,
+                        this.applicationEventPublisher, sortedGroupAssociations.entrySet(), zone
+                                + " Group Creation and Association", this.loggingInterval, this.workerThreads, 20);
                 groupCreator.process(new Worker<Map.Entry<String, Set<String>>>()
                 {
 
@@ -870,9 +872,9 @@ public class ChainingUserRegistrySynchronizer extends AbstractLifecycleBean impl
             }
         }
         final BatchProcessor<NodeDescription> personProcessor = new BatchProcessor<NodeDescription>(
-                this.retryingTransactionHelper, this.ruleService, this.applicationEventPublisher, userRegistry
-                        .getPersons(lastModified), zone + " User Creation and Association", this.loggingInterval,
-                this.workerThreads, 10);
+                ChainingUserRegistrySynchronizer.logger, this.retryingTransactionHelper, this.ruleService,
+                this.applicationEventPublisher, userRegistry.getPersons(lastModified), zone
+                        + " User Creation and Association", this.loggingInterval, this.workerThreads, 10);
         class PersonWorker implements Worker<NodeDescription>
         {
             private long latestTime;
@@ -1029,8 +1031,9 @@ public class ChainingUserRegistrySynchronizer extends AbstractLifecycleBean impl
         if (allowDeletions)
         {
             BatchProcessor<String> authorityDeletionProcessor = new BatchProcessor<String>(
-                    this.retryingTransactionHelper, this.ruleService, this.applicationEventPublisher,
-                    deletionCandidates, zone + " Authority Deletion", this.loggingInterval, this.workerThreads, 10);
+                    ChainingUserRegistrySynchronizer.logger, this.retryingTransactionHelper, this.ruleService,
+                    this.applicationEventPublisher, deletionCandidates, zone + " Authority Deletion",
+                    this.loggingInterval, this.workerThreads, 10);
             class AuthorityDeleter implements Worker<String>
             {
                 private int personProcessedCount;