alfresco-community-repo/source/java/org/alfresco/repo/security/person/HomeFolderProviderSynchronizer.java
Jan Vonka da8bdafbcc Merged BRANCHES/DEV/CONV_HEAD to HEAD:
47880: Create branch for Cloud Convergence from the latest state of HEAD (Revision 47874)
   47886: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        33052: (RECORD ONLY) Branch for Enterprise 4.0 service pack development
        38002: (RECORD ONLY) Create branch for 4.1 Enterprise releases, based on 4.0.2
        38003: (RECORD ONLY) Update version to 4.1.0
        38079: (RECORD ONLY) Updated schema version to 5100
        38536: (RECORD ONLY) Merged V4.1-BUG-FIX to V4.1
             38219: ALF-14674: DOS voodoo to make start_deployment.bat work, as installed by Bitrock
             38344: ALF-14674: Deployment installer still doesn't work
             - Use ${installdir.escape_backslashes} instead of ${installdir}
             38471: ALF-14674: Deployment installer still doesn't work
             - Correction to use of ${installdir.escape_backslashes}
        39519: (RECORD ONLY) Merged PATCHES/V4.0.2 to V4.1
             38899: ALF-15005: Merged V4.0-BUG-FIX to PATCHES/V4.0.2
                37920: ALF-13816: Permission Denied on web-client browsing if parent does not inherit permissions
                   - FileFolderService getNamePath() now performs toFileInfo() as SystemUser.
             38900: ALF-15005: Merged V4.1-BUG-FIX to PATCHES/V4.0.2
                38549: ALF-11861: Maintain the same defuault root of WebDav for Alfresco 4.0 as was in pre-4.0
                   Removed overriding protocols.rootPath property from installer and enterprise overlay versions of alfresco-global.properties so that correct setting in repository.properties is used.
             39494: ALF-15213 / ALF-15170: Can't change folder permissions in Private or Public-moderated sites
                - Fix by Dmitry V
        44843: (RECORD ONLY) Created hotfix branch off V4.1 build 372 revision 44743 (candidate 4.1.2 release)
        45708: (RECORD ONLY) Merged PATCHES/V4.1.2 to PATCHES/V4.1.3
             45570: Merged V3.4-BUG-FIX to PATCHES/V4.1.2
                43939: ALF-17197 / ALF-16917: Merged PATCHES/V3.4.11 to V3.4-BUG-FIX
                   43896: MNT-198: Activity feeds get not generated in private sites for added files if username in LDAP-AD contains uppercase letters
                   - Now we can cope with a runAs where the username is in the wrong case
        45714: (RECORD ONLY) Merged BRANCHES/DEV/V4.1-BUG-FIX to PATCHES/DEV/V4.1.3
              45513: MNT-279: Use binary search in cached authority search to cut down search time when a group contains an astronomical number of authorities
              - Experimental fix to cut down on severe profiling hit
        45715: (RECORD ONLY) Merged BRANCHES/DEV/V4.1-BUG-FIX to PATCHES/V4.1.3
              44848: Fix for     ALF-17178 SolrLuceneAnalyser.findAnalyser generating InavlidQNameExceptions wher they are easily protected.
        46188: (RECORD ONLY) Merged BRANCHES/DEV/V4.1-BUG-FIX to PATCHES/V4.1.3
             46014: Fix for ALF-17732 - SWF files are considered insecure content and should not be displayed directly in the browser.
             46160: Fix for ALF-17759 - HTML files are stripped from metadata and style information after they are uploaded.
             46165: Fix for ALF-17787 - Site Members 'All Members' link should not run query immediately
             46169: Fix for ALF-17787 - Site Members 'All Members' link should not run query immediately - missing file
             46186: Fix for ALF-17786 - Site dashboard page issues too many requests (Site Members dashlet issues avatar requests when it doesn't need too)
        46242: (RECORD ONLY) Merged BRANCHES/DEV/V4.1-BUG-FIX to PATCHES/V4.1.3:
             46184: Refactoring a test class to use JUnit Rules - as part of attempt to reproduce ALF-17797.
             46192: Enhancement to JUnit Rule TemporaryNodes.java as required by fix for ALF-17797.
             46194: Fix for ALF-17797. AddFailedThumbnailActionExecuter is failing.
        46710: (RECORD ONLY) Create branch for Cloud Convergence from the latest state of 4.1.3 (RC5, Build 85, Revision 46648)
   47908: Merged from DEV/CONV_V143 to DEV/CONV_HEAD
        46788: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              30323: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1:
                 30171: ALF-9613: caching content store. Various improvements and bug fixes. Including:
              30325: THOR-114: S3 content store
              30326: THOR-128: S3 content store
              30333: THOR-139 F101: Get account for user e-mail id
              30335: Merge from THOR0 to THOR1
                 r30274: THOR-135 is email address accepted by Alfresco? Part One.  
              30340: THOR-99: Thor module - enable tests
              30341: Removing duplicate account-service-context.xml file.
              30343: Merge THOR0 to THOR1
                 30339: Test email singup in Share complete
                    30338: New form runtime features:
                       - Yellow background is displayed for mandatory fields without value
                       - Red background dis displayed for fields with validation errors
                       - Error message is displayed in a balloon when fields with error has focus
                       - Using balloons is now the default method of displaying errors
                       - Removed balloon code form create site menu since its now handled automatically
                       - An alternative to balloons are "error containers" (div with clickable red text labels focusing the field): setErrorContainer(divEl)
                       - Its possible to setMultipleErrors(true) to display all the forms/fields errors in the "error container"/ballon.
                       - Its possible to turn of the balloons and error containers complete by setting setErrorContainer(null)
                       - js validation handlers no longer needs to handle the messages OR the css classes for mandatory & invalid
              30344: Missing value check caused js undefined error
              30346: Minor css form fixes
              30347: THOR-126: S3 content store - do not swallow exceptions
              30348: THOR-66: disable unused services/features
              30349: THOR-137 F88: Add existing external user (from another network) checkpoint
              30350: THOR-135 Is email address accepted by Alfresco.
        46789: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35594: Fix merge issue
   47930: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        46762: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46768: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46769: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46778: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46780: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46786: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46791: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46792: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46808: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46809: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46819: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46829: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46839: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46842: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46844: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46846: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46847: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46876: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46877: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46878: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46879: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46880: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46881: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
   47947: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        46737: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             35288: Alfresco Cloud (from BRANCHES/V4.0)
             35389: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  30170: Thor branch based on Swift feature complete
                  30185: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1:
                       28973: THOR-1: verify ability to create DB schema programatically on AWS RDS (for MySQL & Oracle)
                       28999: THOR-3: Tenant Routing Data Source (dynamic tenant-aware DB connection pools)
                       29022: THOR-1: verify ability to create DB schema programatically on AWS RDS (for MySQL & Oracle)
                       29031: THOR-1: verify ability to create DB schema programatically on AWS RDS (for MySQL & Oracle)
                  30186: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: (3 conflicts resolved)
                       29116: THOR-3: Tenant Routing Data Source (dynamic tenant-aware DB connection pools)
                       29174: THOR-24 Set up new Alfresco AMP module project.
                       29186: THOR-25 Copy and refactor Account Service from SambaJAM
                       29193: ImporterComponent - prep for THOR-7
                       29198: THOR-7:  Tenant Service API - Create Tenant (using separate DB schema)
                       29204: THOR-29 Account Type Registry
                       29234: THOR-7:  Tenant Service API - Create Tenant (using separate DB schema)
                       29246: THOR-7:  Tenant Service API - Create Tenant (using separate DB schema)
                       29251: THOR-30 Added AccountDAO interface along with two implementations:
                           AccountDAOImpl (not implemented) which will manage Account data in an RDB via iBatis.
                           AccountDAO_InMemory which manages AccountInfo in simple HashMaps for testing purposes only.
                       29258: THOR-28
                       29259: Addendum to THOR-25. Moved account-service spring config into a subfolder. (trivial)
             35393: (RECORD ONLY) Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                   - fix up classpath (remove mybatis 1.0.0 -> 1.0.1 and chemistry 0.4.0 -> 0.6.0)
             35411: (RECORD ONLY) Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/CLOUD1:
                  35409: Merged HEAD to BRANCHES/DEV/V4.0-BUG-FIX:
                       35399: ALF-12874: Schema reference files are out of date.
             35452: (RECORD ONLY) Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/CLOUD1:
                   34219: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/V4.0-BUG-FIX:
                       32096: THOR-429: Fix "MT: Thumbnail + Preview are not updated (after uploading new version)"
                       32125: THOR-429: Fix "MT: Thumbnail + Preview are not updated (after uploading new version)"
                   34220: Minor: follow-on to r34219 (ALF-11563)
                   34747: ALF-13262: adding missing indexes for new schema's (activiti-schema create) + schema patch for existing schema
                   35417: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/V4.0-BUG-FIX: (THOR-6 / ALF-13755)
                       29356: THOR-6: MT is configured (but not enabled) by default - will be auto-enabled when first tenant is created
                       29455: THOR-6: build test/fix
                       29471: THOR-6: build test/fix
                   35423: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/V4.0-BUG-FIX: (THOR-4 / ALF-13756)
                       29500: THOR-4: Replace Tenant attributes with Tenant table (alf_tenant)
                       29501: THOR-4: Replace Tenant attributes with Tenant table (alf_tenant)
                       29503: THOR-4: Replace Tenant attributes with Tenant table (alf_tenant)
   47949: Merged HEAD to BRANCHES/DEV/CONV_HEAD:
        47914: Merge fix for org.alfresco.repo.cache.AbstractAsynchronouslyRefreshedCache<T> R 46078, 46079, 46121
   47958: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        46746: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             35455: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  30187: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1:
                       29260: THOR: Initial Tenant Admin Service REST API - create, delete, get (list) web scripts
                       29356: THOR-6: MT is configured by default
                       29366: THOR-59: selectively disable certain test suites (for THOR dev build plan)
                       29377: THOR-59: selectively disable certain test suites (for THOR dev build plan)
                       29398: Refactoring of code to remove deprecation warnings. Replaced lots of object.field accesses with object.getField() calls.Trivial changes, but with so many warnings I can't see the wood for the trees.
                       29400: THOR-59: selectively disable certain test suites (for THOR dev build plan)
             35456: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  30188: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: 
                       29442: THOR-59: selectively disable certain test suites (for THOR dev build plan)
                       29453: THOR-59: selectively disable certain test suites (for THOR dev build plan)
                       29455: THOR-76: track THOR build test failures and fix-up
                       29471: THOR-76: track THOR build test failures and fix-up
             35459: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  30189: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1:
                       29473: Preliminary checkin for THOR-44. Created placeholder interface/impl/spring config for a new UserService.
                       29497: THOR-76: track THOR build test failures and fix-up ( LicenseComponentTest)
                       29500: THOR-4: Replace Tenant attributes with Tenant table (alf_tenant)
                       29501: THOR-4: Replace Tenant attributes with Tenant table (alf_tenant)
                       29503: THOR-4: Replace Tenant attributes with Tenant table (alf_tenant)
                       29511: THOR-59: selectively disable certain test suites (for THOR dev build plan)
                       29512: Adding a new JUnit4 test class with an @Ignore'd test in it - to see how Bamboo reports these.
                       29514: THOR: Initial Tenant Admin Service REST API - create, delete, list web scripts
                       29515: THOR-59: selectively disable certain test suites (for THOR dev build plan)
                       29521: THOR-79 - mark AVM sitestore as unindexed
             35461: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  30190: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1:
                       29533: THOR-59: exclude certain N/A tests
                       29555: THOR-76: track THOR build test failures
                       29630: Added ant build targets for Cloud Module and a new executable for the Alfresco devenv.
                       29664: THOR-76: exclude system test suites
                       29667: THOR-64: add initial support for tenant routing data source
                       29676: THOR-76: exclude intermittent ActionTrackingServiceImplTest (pending ALF-9773 & ALF-9774)
                       29677: THOR-80: MT-aware S3 content store
                       29678: THOR-80: MT-aware S3 content store
                       29680: THOR-80: MT-aware S3 content store
                       29693: THOR-80: MT-aware S3 content store
                       29694: THOR-80: MT-aware S3 content store
   47959: CONV_HEAD: CLOUD-1348 - comment back in MultiTDemoTest.testDeleteAllTenants
   47967: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        46748: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             35464: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  30195: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1:
                       29774: Refactor Account DAO and Service. Boost Tests. Add appropriate headers.
                       29776: THOR-76: exclude intermittent ActionTrackingServiceImplTest (pending ALF-9773 & ALF-9774)
                       29795: Implemented MyBatis-backed Account DAO:
                       29817: Move (and rename) user service from repository to thor
                  30196: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1:
                       29827: THOR-69: TenantAdminDAO
                       29832: THOR-78: fix tenantEntityCache (shared)
                       29834: THOR-111: experimental config option for S3 content store to support flat root (ie. all tenant files in single folder)
                       29856: THOR updates
                       29857: THOR-76: exclude build components/projects
        46761: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             35478: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  30198: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1:
                       29869: THOR-92. BPMN2.0 workflow definition for account self-signup.
                       29871: THOR-93. REST API for self signup (and miscellaneous related items).
                       29882: THOR-102: Faster CreateTenant
                       29888: THOR-95. Placeholder email template for self-signup.
                       29889: Completion of THOR-95. Placeholder emails for self-signup.
                            Added a 'you've already registered' template.
                       29896: THOR-89F100: Create User Foundation API…
                       29912: Fix issue where module believed it was still executed after delete tenant
                       29940: THOR-96. First cut of a signup email sender delegate. This will be refined later - probably both in this sprint and the next.
                       29966: Fixing InvitationServiceImplTest failing tests, which are failing because the email templates are not there.
                       29978: THOR-89: Switch tenant for person creation
                       29982: THOR-89: Fix multi-domain account creation test after review with Jan
                       29983: THOR-102: Faster CreateTenant
                       29985: THOR-90: F99 Is email address already registred foundation API
                       29991: THOR-99: Thor module build/packaging
                       29994: Changes for THOR-92, THOR-93 and THOR-96.
                  30199: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1:
                       29995: THOR-93. Use the proper sspring config in the test case.
                       29996: THOR-99: Thor module build/packaging
                       29997: Consolidated DaveC's EmailAddressService and my EMailUtil into a single feature.
                       29998: Follow-on to previous check-in (29997). Deletion of now-unused folder.
                       30000: Blatant attempt to get svn r=30k. Removing some dead config.
                       30001: THOR-96. Ensure that we get a meaningful exception when attempting to activate an account with no pending workflow for that email.
                       30036: Resolve issues with tenant-independent user store - can now login via Share
                       30041: Package and auto deploy of license with Thor module
                       30048: Ensure that when a duplicate email prevents a workflow from creating an account, that the workflow still ends gracefully.
                       30049: Removing a dead class that I'd used to see how our Bamboo handles @Ignore(message=msg) @Test annotations.
                       30054: THOR-84 F82: List Accounts Foundation API
                       30067: THOR-87 List Accounts REST API.
                       30069: THOR-87. Completion of listAccounts REST API.
                           Fixed the problems in the JUnit test case and tweaked the FTL slightly.
                       30071: Cosmetic changes as part of THOR-93.
                       30072: Oops. Broke a test case. Follow-on to previous (30071) check-in which cosmetically changed JSON as part of THOR-93.
                       30073: As part of THOR-93 (REST API signup) I have made the 2 webscripts usable without any authentication.
                       30074: Trivial fix to an error string.
                       30076: THOR-93. The account-activation.post webscript now includes the provided workflowInstanceId when identifying the ongoing workflow. 
                       30077: Fix Email validator to allow for example domains
                   30202: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1:
                       30140: Refactor of account signup workflow
                       30142: No longer require email address for activation step of sign-up
                       30143: Remove use of task query in account signup workflow
                       30146: thor-share project structure
                       30147: Buildfix (removed modules not used by THOR)
                       30151: Incorporate already registered use case into account signup workflow
                       30152: Finally resolve license loading in Eclipse based tests
                   30203: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1:
                       30184: Build box fix as a result of not including certian components
                   30206: Fix blatant merge issues
   47972: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        46766: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             35497: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/CLOUD1:
                  29723: THOR-31: MT-aware shared caches
                  29749: THOR-5: MT-aware immutable singletons
                  29762: THOR-31: MT-aware shared cache
        46767: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             35507: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  30237: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1:
                       29532: THOR-79 - add ability to disable Lucene indexes (so that IndexInfo / IndexInfoBackup files are not created per store per tenant)
                       29723: THOR-31: MT-aware shared caches
                       29749: THOR-5: MT-aware immutable singletons
                       29762: THOR-31: MT-aware shared cache
   47973: CONV_HEAD: CLOUD-1348 - comment back in MultiTDemoTest tests (testNonSharedGroupDeletion & testSharedGroupDeletion)
   47975: CONV_HEAD: CLOUD-1348 - comment back in FeedNotifierTest.testFailedNotifications
   47988: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        46775: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             35531: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                   30449: F66: add option to configure a common "contentRootContainerPath"
                   30564: THOR-156: prep - consolidate runAsSystemTenant/runAsPrimaryTenant
             35532: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  30777: THOR-201: temporarily comment-out MultiTDemoTest.testDeleteArchiveAndRestoreContent (pending fix for THOR-201)
   48008: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        46844: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46895: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46903: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46907: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46922: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46974: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46991: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46992: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46994: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47107: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47265: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47267: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47272: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47277: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47284: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47286: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47289: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47292: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
   48009: Merged DEV/CONV_V413 to DEV/CONV_HEAD
        46801: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35602: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              30513: Cloud Share module
              30515: Fix issue with person replication between tenants.
              30516: Slight mod to email validation web script response.
              30518: Quick fix for workflow id generation in sign email
              30534: THOR-163: Unable to get license file
              30535: Fix Thor build process.
              30536: Refine user's home site name and description
              30539: THOR-96. When sending the signup email, execute the mail action asynchronously.
              30542: Replace placeholder text in sign-up email
              30543: Account Activation
        46802: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35643: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              30544: Account activation
              30545: Account activation
              30550: AMP build targets
              30554: THOR-94. Cloud site invitation workflow.
              30555: AMP build targets - added client side resources
   48011: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47056: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47087: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47228: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47271: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47297: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47299: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47300: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47301: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47304: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47328: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47330: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47339: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
   48013: Merged DEV/CONV_V413 to DEV/CONV_HEAD (commiting the missing merge info for r48009)
        46801: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35602: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              30513: Cloud Share module
              30515: Fix issue with person replication between tenants.
              30516: Slight mod to email validation web script response.
              30518: Quick fix for workflow id generation in sign email
              30534: THOR-163: Unable to get license file
              30535: Fix Thor build process.
              30536: Refine user's home site name and description
              30539: THOR-96. When sending the signup email, execute the mail action asynchronously.
              30542: Replace placeholder text in sign-up email
              30543: Account Activation
        46802: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35643: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              30544: Account activation
              30545: Account activation
              30550: AMP build targets
              30554: THOR-94. Cloud site invitation workflow.
              30555: AMP build targets - added client side resources
   48015: Merged DEV/CONV_V413 to DEV/CONV_HEAD
        46841: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35684: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              30904: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1:
                 30270  ALF-9492 Can now update task properties through the Workflow JavaScript API. ALF-10087 Fixed failing Multi-tenancy tests.
                 30288  ALF-9492 Can now update task properties through the Workflow JavaScript API.
                 30309  Fixed failing MultiTDemoTest and re-enabled.
                 30356  ALF-10117: JBPM workflows should be hidden.
                 30358  Build fix, fallout from ALF-10117 (JBPM workflows should be hidden)
                 30415  Added parseRootElement() method to Activiti's BPMNParseListener.
                 30452  ALF-10276: Reject flow didn't set bpm_assignee property properly
                 30563  Added tests to ensure multi-tenancy works and fixed several multi-tenancy issues in workflow.
                 30698  ALF-9541: Fixed HistoricTaskEntity update when TaskEntity is loaded from DB
                 30699  ALF-10084, ALF-10242. Fixed issues and added WorkflowService methods to get workflow instances without filtering by definition id.
                 30750  ALF-10197, Added the ability to auto-complete Start Tasks in Activiti. If a start task extends the bpm:activitiStartTask type or implements the bpm:endAutomatically aspect then the task will be ended as soon as the workflow instance is started.
                 30796  ALF-10374 Fixed failing MultiTDemoTest
              30908: Add logging for failed email domain lookups:
              30922: Rolling back .classpath changes to Data Model.
              30930: Basic version of site invite working
              30931: THOR-172: Switch Tenant via public API
              30936: Allow for repo web scripts to switch to user's default tenant via -default- tenant id:
              30937: Implementation of THOR-214. There is now a new repo webscript to retrieve signup status for a given {id, key} pair.
              30938: Allow dev email address to be specified in properties file:
              30945: THOR-221: Add (EntityLookup) cache to AccountDAO
              30946: Build fix. Renaming a test infrastructure class so that it doesn't get picked up by the ant test targets.
              30955: THOR-222. Added inviter first and last name to invitation-status.get webscript.
        46843: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35694: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              30997: Firefox scrollbars removed on "invitation" and "signup" pages (now using new helper method Alfresco.util.createYUIOverlay)
              31001: Impl of THOR-223. Webscripts for getting pending invitations.
              31002: Invite - redirect bug fixed, removed old code matching previous webscript api, email picker style fixes
              31003: Addendum for THOR-223. I've added an explicit test to record the fact that pending-invitations.get to a non-existent site returns 200 and an empty collection rather than a 404.
              31004: Adding REST-client .rcq files as part of THOR-223
        46848: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35700: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              31014: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1:
                   30999: ALF-9957 - MT: test and fix subscriptions (followers)
              31020: Update invite email template to bring in line with wireframe and text
              31021: Apply latest sanitized email blacklist:
              31030: Fixed THOR-226 "DocLib "Detailed View" (default) does not list items - note: "Simple View" seems to be OK"
              31033: THOR-228: Update aws sample file with quota config for cachingcontentstore
              31036: Fixed THOR-236 "Webscript URL clash in signup"
              31037: THOR-175: set and enforce per-tenant quota
              31043: Fixed THOR-174 "F27: User can switch between networks they belong to"   
        46854: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35725: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              31124: Fix for THOR-145. This check-in makes the Cloud Signup and Invitation workflows hidden within Share - users can't initiate them via "Start workflow..."
   48016: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        46793: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46795: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46796: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
   48030: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        46820: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             35657: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  30556: THOR-135F103: Is e-mail address accepted by Alfresco?
                  30562: Fixing a typo in the email-validation FTL. It was returning invalid JSON - no opening " on a string.
                  30569: THOR-156: switch to secondary tenant (initially via @@login)
                  30571: THOR-99: Thor build
   48037: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        46821: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             35659: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  30586: THOR-166. I've added an additional check at the start of the signup workflow that checks if the email is blocked.
                  30587: THOR-163: S3ContentReader fails to getObjectDetails
                  30592: THOR-156: switch to secondary tenant (initially via @@login)
             35660: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  30607: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1:
                       30208: Remaining commits for ALF-9510
                       30218: Fix build - add missing files
                       30254: Encryption related documentation, source code comments
                       30392: Fix for ALF-10205
                       30405: Fix for ALF-10189
                       30406: Fix for ALF-10189: part 2 - minor update
                  30613: THOR-148. The cloud test target was accidentally excluding *RestTest.java.
                  30613: THOR-148. The cloud test target was accidentally excluding *RestTest.java.
                  30614: Revert some of the additional email checks in registration process
                  30615: Set ignore patterns for build dir in thor module
                  30619: Merged HEAD to BRANCHES/DEV/THOR1:
                       30618: Additional test classes that allow for easier testing of Notifications (emails mostly).
                  30622: Ensure use of System user, not system user
                  30624: Removed deep merge info
                  30625: Switch off creation of missing people, use Admin instead of System
        46824: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46828: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
   48038: Merged DEV/CONV_V413 to DEV/CONV_HEAD (ui-only)
        46830: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
           Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
           30737: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1:
                30736: ALF-6706 - MT: activities not generated (for tenants)
           30738: Site invite (rough version, not finished)
           30741: THOR-175: Set and enforce file space quota for tenant
           30752: Site invite - added som padding to user suggestion list
           30753: Disabling 2 tests while I fix them.
           30758: THOR-172 F63: Switch Tenant via public REST API:
           30764: Tweak to Activiti integration code to prevent it from trying to create person nodes for the System user.
           30766: Implementation of THOR-196. Inviting multiple email addresses in a single call.
           30769: Re-enable MultiTDemoTest 
           30775: Site invite 
           30776: THOR-172: Switch Tenant via public API
           30785: Add tenant id to account info returned in Thor responses
   48043: Merged DEV/CONV_V413 to DEV/CONV_HEAD
        46831: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
           Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              30813: Add Eclipse project for Thor-Share module:
              30815: THOR-175: Set and enforce file space quota for tenant
              30817: Switch network skeleton code and minor fixes
              30818: Update Share Node Browser (at least for THOR) to allow option to retrieve "storeroot" via DB query
              30826: Add distribute-solr to Thor builds
   48045: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
       Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 
           30737: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1: 
           30736: ALF-6706 - MT: activities not generated (for tenants) 
           30738: Site invite (rough version, not finished) 
           30741: THOR-175: Set and enforce file space quota for tenant 
           30752: Site invite - added som padding to user suggestion list 
           30753: Disabling 2 tests while I fix them. 
           30758: THOR-172 F63: Switch Tenant via public REST API: 
           30764: Tweak to Activiti integration code to prevent it from trying to create person nodes for the System user. 
           30766: Implementation of THOR-196. Inviting multiple email addresses in a single call. 
           30769: Re-enable MultiTDemoTest 
           30775: Site invite 
           30776: THOR-172: Switch Tenant via public API 
           30785: Add tenant id to account info returned in Thor responses 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@48251 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-03-18 09:23:29 +00:00

1317 lines
50 KiB
Java

/*
* Copyright (C) 2005-2012 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.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.batch.BatchProcessWorkProvider;
import org.alfresco.repo.batch.BatchProcessor;
import org.alfresco.repo.batch.BatchProcessor.BatchProcessWorkerAdaptor;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
import org.alfresco.repo.tenant.Tenant;
import org.alfresco.repo.tenant.TenantAdminService;
import org.alfresco.repo.tenant.TenantService;
import org.alfresco.repo.tenant.TenantUtil;
import org.alfresco.repo.tenant.TenantUtil.TenantRunAsWork;
import org.alfresco.repo.transaction.RetryingTransactionHelper;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
import org.alfresco.service.cmr.model.FileExistsException;
import org.alfresco.service.cmr.model.FileFolderService;
import org.alfresco.service.cmr.model.FileNotFoundException;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.Path;
import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
import org.alfresco.service.cmr.security.AuthorityService;
import org.alfresco.service.cmr.security.AuthorityType;
import org.alfresco.service.cmr.security.NoSuchPersonException;
import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.service.namespace.QName;
import org.alfresco.service.transaction.TransactionService;
import org.alfresco.util.VmShutdownListener;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.context.ApplicationEvent;
import org.springframework.extensions.surf.util.AbstractLifecycleBean;
/**
* Called on startup to move (synchronise) home folders to the preferred
* location defined by their {@link HomeFolderProvider2} or extend the
* now depreciated {@link AbstractHomeFolderProvider}. Only users that
* use a HomeFolderProvider2 that don't provide a shared home
* folder (all user are given the same home folder) will be moved. This
* allows existing home directories to be moved to reflect changes in
* policy related to the location of home directories. Originally created
* for ALF-7797 which related to the need to move large numbers of
* existing home directories created via an LDAP import into a hierarchical
* folder structure with fewer home folder in each.<p>
*
* By default no action is taken unless the the global property
* {@code home_folder_provider_synchronizer.enabled=true}.<p>
*
* The home folders for internal users (such as {@code admin} and {@code
* guest}) that use {@code guestHomeFolderProvider} or {@code
* bootstrapHomeFolderProvider} are not moved, nor are any users that use
* {@link HomeFolderProviders} create shared home folders (all user are
* given the same home folder).
*
* It is also possible change the HomeFolderProvider used by all other
* users by setting the global property
* {@code home_folder_provider_synchronizer.override_provider=<providerBeanName>}.<p>
*
* <b>Warning:</b> The LDAP synchronise process overwrites the home folder
* provider property. This is not an issue as long as the root path of
* the overwriting provider is the same as the overwritten provider or is
* not an ancestor of any of the existing home folders. This is important
* because the root directory value is used by this class to tidy up empty
* 'parent' folders under the root when a home folders are moved elsewhere.
* If you have any concerns that this may not be true, set the global
* property {@code home_folder_provider_synchronizer.keep_empty_parents=true}
* and tidy up any empty folders manually. Typically users created by the
* LDAP sync process are all placed under the same root folder so there
* will be no parent folders anyway.<p>
*
* @author Alan Davis
*/
public class HomeFolderProviderSynchronizer extends AbstractLifecycleBean
{
private static final Log logger = LogFactory.getLog(HomeFolderProviderSynchronizer.class);
private static final Log batchLogger = LogFactory.getLog(HomeFolderProviderSynchronizer.class+".batch");
private static final String GUEST_HOME_FOLDER_PROVIDER = "guestHomeFolderProvider";
private static final String BOOTSTRAP_HOME_FOLDER_PROVIDER = "bootstrapHomeFolderProvider";
private final TransactionService transactionService;
private final AuthorityService authorityService;
private final PersonService personService;
private final FileFolderService fileFolderService;
private final NodeService nodeService;
private final PortableHomeFolderManager homeFolderManager;
private final TenantAdminService tenantAdminService;
private boolean enabled;
private String overrideHomeFolderProviderName;
private boolean keepEmptyParents;
public HomeFolderProviderSynchronizer(
TransactionService transactionService,
AuthorityService authorityService, PersonService personService,
FileFolderService fileFolderService, NodeService nodeService,
PortableHomeFolderManager homeFolderManager,
TenantAdminService tenantAdminService)
{
this.transactionService = transactionService;
this.authorityService = authorityService;
this.personService = personService;
this.fileFolderService = fileFolderService;
this.nodeService = nodeService;
this.homeFolderManager = homeFolderManager;
this.tenantAdminService = tenantAdminService;
}
public void setEnabled(String enabled)
{
this.enabled = "true".equalsIgnoreCase(enabled);
}
private boolean enabled()
{
return enabled;
}
public void setOverrideHomeFolderProviderName(String overrideHomeFolderProviderName)
{
this.overrideHomeFolderProviderName = overrideHomeFolderProviderName;
}
private String getOverrideHomeFolderProviderName()
{
return overrideHomeFolderProviderName;
}
public void setKeepEmptyParents(String keepEmptyParents)
{
this.keepEmptyParents = "true".equalsIgnoreCase(keepEmptyParents);
}
private boolean keepEmptyParents()
{
return keepEmptyParents;
}
@Override
protected void onShutdown(ApplicationEvent event)
{
// do nothing
}
@Override
protected void onBootstrap(ApplicationEvent event)
{
if (enabled())
{
final String overrideProviderName = getOverrideHomeFolderProviderName();
// Scan users in default and each Tenant
scanPeople(AuthenticationUtil.getSystemUserName(), TenantService.DEFAULT_DOMAIN, overrideProviderName);
if (tenantAdminService.isEnabled())
{
List<Tenant> tenants = tenantAdminService.getAllTenants();
for (Tenant tenant : tenants)
{
if (tenant.isEnabled())
{
final String tenantDomain = tenant.getTenantDomain();
TenantUtil.runAsSystemTenant(new TenantRunAsWork<Object>()
{
public NodeRef doWork() throws Exception
{
scanPeople(AuthenticationUtil.getSystemUserName(), tenantDomain, overrideProviderName);
return null;
}
}, tenantDomain);
}
}
}
}
}
/**
* Scans all {@code person} people objects and checks their home folder is located according
* to the person's home folder provider preferred default location.
* @param systemUserName String the system user name with the tenant-specific ID attached.
* @param tenantDomain String name of the tenant domain. Used to restrict the which people
* are processed.
* @param overrideProvider String the bean name of a HomeFolderProvider to be used
* in place of the all home folders existing providers. If {@code null}
* the existing provider is used.
*/
private void scanPeople(final String systemUserName, final String tenantDomain, final String overrideProvider)
{
/*
* To avoid problems with existing home folders that are located in locations
* that will be needed by 'parent' folders, we need a 4 phase process.
* Consider the following user names and required structure. There would be a
* problem with the username 'ab'.
*
* abc --> ab/abc
* def /abd
* abd /ab
* ab de/def
*
* 1. Record which parent folders are needed
* 2. Move any home folders which overlap with parent folders to a temporary folder
* 3. Create parent folder structure. Done in a single thread before the move of
* home folders to avoid race conditions
* 4. Move home folders if required
*
* Alternative approaches are possible, but the above has the advantage that
* nodes are not moved if they are already in their preferred location.
*
* Also needed to change the case of parent folders.
*/
// Using authorities rather than Person objects as they are much lighter
final Set<String> authorities = getAllAuthoritiesInTxn(systemUserName);
final ParentFolderStructure parentFolderStructure = new ParentFolderStructure();
final Map<NodeRef,String> tmpFolders = new HashMap<NodeRef,String>();
// Define the phases
final String createParentFoldersPhaseName = "createParentFolders";
RunAsWorker[] workers = new RunAsWorker[]
{
new RunAsWorker(systemUserName, tenantDomain, "calculateParentFolderStructure")
{
@Override
public void doWork(NodeRef person) throws Exception
{
calculateParentFolderStructure(
parentFolderStructure, person, overrideProvider);
}
},
new RunAsWorker(systemUserName, tenantDomain, "moveHomeFolderThatClashesWithParentFolderStructure")
{
@Override
public void doWork(NodeRef person) throws Exception
{
moveHomeFolderThatClashesWithParentFolderStructure(
parentFolderStructure, tmpFolders, person, overrideProvider);
}
},
new RunAsWorker(systemUserName, tenantDomain, createParentFoldersPhaseName)
{
@Override
public void doWork(NodeRef person) throws Exception
{
createParentFolders(person, overrideProvider);
}
},
new RunAsWorker(systemUserName, tenantDomain, "moveHomeFolderIfRequired")
{
@Override
public void doWork(NodeRef person) throws Exception
{
moveHomeFolderIfRequired(person, overrideProvider);
}
}
};
// Run the phases
for (RunAsWorker worker: workers)
{
String name = worker.getName();
if (logger.isInfoEnabled())
{
logger.info(" -- "+
(TenantService.DEFAULT_DOMAIN.equals(tenantDomain)? "" : tenantDomain+" ")+
name+" --");
}
int threadCount = (name.equals(createParentFoldersPhaseName)) ? 1 : 2;
int peoplePerTransaction = 20;
// Use 2 threads, 20 person objects per transaction. Log every 100 entries.
BatchProcessor<NodeRef> processor = new BatchProcessor<NodeRef>(
"HomeFolderProviderSynchronizer",
transactionService.getRetryingTransactionHelper(),
new WorkProvider(authorities),
threadCount, peoplePerTransaction,
null,
batchLogger, 100);
processor.process(worker, true);
if (processor.getTotalErrors() > 0)
{
logger.info(" -- Give up after error --");
break;
}
}
}
// Can only use authorityService.getAllAuthorities(...) in a transaction.
private Set<String> getAllAuthoritiesInTxn(final String systemUserName)
{
return AuthenticationUtil.runAs(new RunAsWork<Set<String>>()
{
public Set<String> doWork() throws Exception
{
RetryingTransactionHelper txnHelper = transactionService.getRetryingTransactionHelper();
RetryingTransactionCallback<Set<String>> restoreCallback =
new RetryingTransactionCallback<Set<String>>()
{
public Set<String> execute() throws Exception
{
// Returns a sorted set (using natural ordering) rather than a hashCode
// so that it is more obvious what the order is for processing users.
Set<String> result = new TreeSet<String>();
result.addAll(authorityService.getAllAuthorities(AuthorityType.USER));
return result;
}
};
return txnHelper.doInTransaction(restoreCallback, false, true);
}
}, systemUserName);
}
/**
* Work out the preferred parent folder structure so we will be able to work out if any
* existing home folders clash.
*/
private ParentFolderStructure calculateParentFolderStructure(
final ParentFolderStructure parentFolderStructure,
NodeRef person, String overrideProviderName)
{
new HomeFolderHandler(person, overrideProviderName)
{
@Override
protected void handleNotInPreferredLocation()
{
recordParentFolder();
}
@Override
protected void handleInPreferredLocation()
{
recordParentFolder();
}
private void recordParentFolder()
{
parentFolderStructure.recordParentFolder(root, preferredPath);
}
}.doWork();
return parentFolderStructure;
}
/**
* Move any home folders (to a temporary folder) that clash with the
* new parent folder structure.
*/
private void moveHomeFolderThatClashesWithParentFolderStructure(
final ParentFolderStructure parentFolderStructure,
final Map<NodeRef,String> tmpFolders,
NodeRef person, String overrideProviderName)
{
new HomeFolderHandler(person, overrideProviderName)
{
@Override
protected void handleNotInPreferredLocation()
{
moveToTmpIfClash();
}
@Override
protected void handleInPreferredLocation()
{
moveToTmpIfClash();
}
private void moveToTmpIfClash()
{
if (parentFolderStructure.clash(root, actualPath))
{
String tmpFolder = getTmpFolderName(root);
preferredPath = new ArrayList<String>();
preferredPath.add(tmpFolder);
preferredPath.addAll(actualPath);
// - providerName parameter is set to null as we don't want the
// "homeFolderProvider" reset
moveHomeFolder(person, homeFolder, root, preferredPath, originalRoot,
null, originalProviderName, actualPath);
}
}
private String getTmpFolderName(NodeRef root)
{
synchronized(tmpFolders)
{
String tmpFolder = tmpFolders.get(root);
if (tmpFolder == null)
{
tmpFolder = createTmpFolderName(root);
tmpFolders.put(root, tmpFolder);
}
return tmpFolder;
}
}
private String createTmpFolderName(NodeRef root)
{
// Try a few times but then give up.
String temporary = "Temporary-";
int from = 1;
int to = 100;
for (int i = from; i <= to; i++)
{
String tmpFolderName = temporary+i;
if (fileFolderService.searchSimple(root, tmpFolderName) == null)
{
fileFolderService.create(root, tmpFolderName, ContentModel.TYPE_FOLDER);
return tmpFolderName;
}
}
String msg = "Unable to create a temporary " +
"folder into which home folders will be moved. " +
"Tried creating " + temporary + from + " .. " + temporary + to +
". Remove these folders and try again.";
logger.error(" # "+msg);
throw new PersonException(msg);
}
}.doWork();
}
/**
* Creates the new home folder structure, before we move home folders so that
* we don't have race conditions that result in unnecessary retries.
* @param parentFolderStructure
*/
private void createParentFolders(NodeRef person, String overrideProviderName)
{
// We could short cut this process and build all the home folder from the
// ParentFolderStructure in the calling method, but that would complicate
// the code a little more and might result in transaction size problems.
// For now lets loop through all the person objects.
new HomeFolderHandler(person, overrideProviderName)
{
@Override
protected void handleNotInPreferredLocation()
{
createNewParentIfRequired(root, preferredPath);
}
@Override
protected void handleInPreferredLocation()
{
// do nothing
}
}.doWork();
}
/**
* If the home folder has been created but is not in its preferred location, the home folder
* is moved. Empty parent folder's under the old root are only removed if the old root is
* known and {@code home_folder_provider_synchronizer.keep_empty_parents=true} has not been
* set.
* @param person Person to be checked.
* @param overrideProviderName String name of a provider to use in place of
* the one currently used. Ignored if {@code null}.
*/
private void moveHomeFolderIfRequired(NodeRef person, String overrideProviderName)
{
new HomeFolderHandler(person, overrideProviderName)
{
@Override
protected void handleNotInPreferredLocation()
{
moveHomeFolder(person, homeFolder, root, preferredPath, originalRoot,
providerName, originalProviderName, actualPath);
}
@Override
protected void handleInPreferredLocation()
{
if (logger.isInfoEnabled())
{
logger.info(" # "+toPath(actualPath)+" is already in preferred location.");
}
}
@Override
protected void handleSharedHomeProvider()
{
if (logger.isInfoEnabled())
{
logger.info(" # "+userName+" "+providerName+" creates shared home folders - These are not moved.");
}
}
@Override
protected void handleOriginalSharedHomeProvider()
{
if (logger.isInfoEnabled())
{
logger.info(" # "+userName+" Original "+originalProviderName+" creates shared home folders - These are not moved.");
}
}
@Override
protected void handleRootOrAbove()
{
if (logger.isInfoEnabled())
{
logger.info(" # "+userName+" has a home folder that is the provider's root directory (or is above it). " +
"This is normally for users that origanally had an internal provider or a provider that uses " +
"shared home folders - These are not moved.");
}
}
@Override
protected void handleNotAHomeFolderProvider2()
{
if (logger.isInfoEnabled())
{
logger.info(" # "+userName+" "+providerName+" for is not a HomeFolderProvider2.");
}
}
@Override
protected void handleSpecialHomeFolderProvider()
{
if (logger.isInfoEnabled())
{
logger.info(" # "+userName+" Original "+originalProviderName+" is an internal type - These are not moved.");
}
}
@Override
protected void handleHomeFolderNotSet()
{
if (logger.isInfoEnabled())
{
logger.info(" # "+userName+" Home folder is not set - ignored");
}
}
}.doWork();
}
/**
* @return a String for debug a folder list.
*/
private String toPath(List<String> folders)
{
return toPath(folders, (folders == null) ? 0 : folders.size()-1);
}
private String toPath(List<String> folders, int depth)
{
StringBuilder sb = new StringBuilder("");
if (folders != null)
{
if (folders.isEmpty())
{
sb.append('.');
}
else
{
for (String folder : folders)
{
if (sb.length() > 0)
{
sb.append('/');
}
sb.append(folder);
if (depth-- <= 0)
{
break;
}
}
}
}
else
{
sb.append("<notUnderSameRoot>");
}
return sb.toString();
}
private String toPath(NodeRef root, NodeRef leaf)
{
StringBuilder sb = new StringBuilder("");
List<String> path = getRelativePath(root, leaf);
if (path != null)
{
if (path.isEmpty())
{
sb.append('.');
}
else
{
for (String folder : path)
{
if (sb.length() > 0)
{
sb.append('/');
}
sb.append(folder);
}
}
}
else
{
sb.append("<notUnderSameRoot>");
}
return sb.toString();
}
/**
* @return the relative 'path' (a list of folder names) of the {@code homeFolder}
* from the {@code root} or {@code null} if the homeFolder is not under the root
* or is the root. An empty list is returned if the homeFolder is the same as the
* root or the root is below the homeFolder.
*/
private List<String> getRelativePath(NodeRef root, NodeRef homeFolder)
{
if (root == null || homeFolder == null)
{
return null;
}
if (root.equals(homeFolder))
{
return Collections.emptyList();
}
Path rootPath = nodeService.getPath(root);
Path homeFolderPath = nodeService.getPath(homeFolder);
int rootSize = rootPath.size();
int homeFolderSize = homeFolderPath.size();
if (rootSize >= homeFolderSize)
{
return Collections.emptyList();
}
// Check homeFolder is under root
for (int i=0; i < rootSize; i++)
{
if (!rootPath.get(i).equals(homeFolderPath.get(i)))
{
return null;
}
}
// Build up path of sub folders
List<String> path = new ArrayList<String>();
for (int i = rootSize; i < homeFolderSize; i++)
{
Path.Element element = homeFolderPath.get(i);
if (!(element instanceof Path.ChildAssocElement))
{
return null;
}
QName folderQName = ((Path.ChildAssocElement) element).getRef().getQName();
path.add(folderQName.getLocalName());
}
return path;
}
/**
* Move an existing home folder from one location to another,
* removing empty parent folders and reseting homeFolder and
* homeFolderProvider properties.
*/
private void moveHomeFolder(NodeRef person, NodeRef homeFolder, NodeRef root,
List<String> preferredPath, NodeRef oldRoot, String providerName,
String originalProviderName, List<String> actualPath)
{
try
{
// Create the new parent folder (if required)
// Code still here for completeness, but should be okay
// as the temporary folder will have been created and any
// parent folders should have been created.
NodeRef newParent = createNewParentIfRequired(root, preferredPath);
// If the preferred home folder already exists, append "-N"
homeFolderManager.modifyHomeFolderNameIfItExists(root, preferredPath);
String homeFolderName = preferredPath.get(preferredPath.size() - 1);
// Get the old parent before we move anything.
NodeRef oldParent = nodeService.getPrimaryParent(homeFolder) .getParentRef();
// Log action
if (logger.isInfoEnabled())
{
logger.info(" mv "+toPath(actualPath)+
" "+ toPath(preferredPath)+
((providerName != null && !providerName.equals(originalProviderName))
? " # AND reset provider to "+providerName
: ""));
}
// Perform the move
homeFolder = fileFolderService.move(homeFolder, newParent,
homeFolderName).getNodeRef();
// Reset the homeFolder property
nodeService.setProperty(person, ContentModel.PROP_HOMEFOLDER, homeFolder);
// Change provider name
if (providerName != null && !providerName.equals(originalProviderName))
{
nodeService.setProperty(person,
ContentModel.PROP_HOME_FOLDER_PROVIDER, providerName);
}
// Tidy up
removeEmptyParentFolders(oldParent, oldRoot);
}
catch (FileExistsException e)
{
String message = "mv "+toPath(actualPath)+" "+toPath(preferredPath)+
" failed as the target already existed.";
logger.error(" # "+message);
throw new PersonException(message);
}
catch (FileNotFoundException e)
{
// This should not happen unless there is a coding error
String message = "mv "+toPath(actualPath)+" "+toPath(preferredPath)+
" failed as source did not exist.";
logger.error(" "+message);
throw new PersonException(message);
}
}
private NodeRef createNewParentIfRequired(NodeRef root, List<String> homeFolderPath)
{
NodeRef parent = root;
int len = homeFolderPath.size() - 1;
for (int i = 0; i < len; i++)
{
String pathElement = homeFolderPath.get(i);
NodeRef nodeRef = nodeService.getChildByName(parent,
ContentModel.ASSOC_CONTAINS, pathElement);
String path = toPath(homeFolderPath, i);
if (nodeRef == null)
{
if (logger.isInfoEnabled())
{
logger.info(" mkdir "+path);
}
parent = fileFolderService.create(parent, pathElement,
ContentModel.TYPE_FOLDER).getNodeRef();
}
else
{
// Throw our own FileExistsException before we get an
// exception when we cannot create a sub-folder under
// a non folder that marks the transaction rollback, as
// there is no point trying again.
if (!fileFolderService.getFileInfo(nodeRef).isFolder())
{
if (logger.isErrorEnabled())
{
logger.error(" # cannot create folder " + path +
" as content with the same name exists. " +
"Move the content and try again.");
}
throw new FileExistsException(parent, path);
}
parent = nodeRef;
}
}
return parent;
}
/**
* Removes the parent folder if it is empty and its parents up to but not
* including the root.
*/
private void removeEmptyParentFolders(NodeRef parent, NodeRef root)
{
// Parent folders we have created don't have an owner, were as
// home folders do, hence the 3rd test (just in case) as we really
// don't want to delete empty home folders.
if (root != null &&
!keepEmptyParents() &&
nodeService.getProperty(parent, ContentModel.PROP_OWNER) == null)
{
// Do nothing if root is not an ancestor of parent.
NodeRef nodeRef = parent;
while (!root.equals(nodeRef))
{
if (nodeRef == null)
{
return;
}
nodeRef = nodeService.getPrimaryParent(nodeRef).getParentRef();
}
// Remove any empty nodes.
while (!root.equals(parent))
{
nodeRef = parent;
parent = nodeService.getPrimaryParent(parent).getParentRef();
if (!nodeService.getChildAssocs(nodeRef).isEmpty())
{
return;
}
if (logger.isInfoEnabled())
{
logger.info(" rm "+toPath(root, nodeRef));
}
nodeService.deleteNode(nodeRef);
}
}
}
// BatchProcessWorkProvider returns batches of 100 person objects from lightweight authorities.
private class WorkProvider implements BatchProcessWorkProvider<NodeRef>
{
private static final int BATCH_SIZE = 100;
private final VmShutdownListener vmShutdownLister = new VmShutdownListener("getHomeFolderProviderSynchronizerWorkProvider");
private final Iterator<String> iterator;
private final int size;
public WorkProvider(Set<String> authorities)
{
iterator = authorities.iterator();
size = authorities.size();
}
@Override
public synchronized int getTotalEstimatedWorkSize()
{
return size;
}
@Override
public synchronized Collection<NodeRef> getNextWork()
{
if (vmShutdownLister.isVmShuttingDown())
{
return Collections.emptyList();
}
RetryingTransactionHelper txnHelper = transactionService.getRetryingTransactionHelper();
RetryingTransactionCallback<Collection<NodeRef>> restoreCallback = new RetryingTransactionCallback<Collection<NodeRef>>()
{
public Collection<NodeRef> execute() throws Exception
{
Collection<NodeRef> results = new ArrayList<NodeRef>(BATCH_SIZE);
while (results.size() < BATCH_SIZE && iterator.hasNext())
{
String userName = iterator.next();
try
{
NodeRef person = personService.getPerson(userName, false);
results.add(person);
}
catch (NoSuchPersonException e)
{
if (logger.isTraceEnabled())
{
logger.trace("The user "+userName+" no longer exists - ignored.");
}
}
}
return results;
}
};
return txnHelper.doInTransaction(restoreCallback, false, true);
}
}
// BatchProcessWorker that runs work as another user.
private abstract class RunAsWorker extends BatchProcessWorkerAdaptor<NodeRef>
{
@Override
public void beforeProcess() throws Throwable
{
AuthenticationUtil.pushAuthentication();
AuthenticationUtil.setFullyAuthenticatedUser(userName);
}
@Override
public void afterProcess() throws Throwable
{
AuthenticationUtil.popAuthentication();
}
final String userName;
final String tenantDomain;
final String name;
public RunAsWorker(String userName, String tenantDomain, String name)
{
this.userName = userName;
this.tenantDomain = tenantDomain;
this.name = name;
}
public void process(final NodeRef person) throws Throwable
{
// note: runAs before runAsTenant (to avoid clearing tenant context, if no previous auth)
AuthenticationUtil.runAs(new RunAsWork<Object>()
{
@Override
public Object doWork() throws Exception
{
return TenantUtil.runAsTenant(new TenantRunAsWork<Void>()
{
public Void doWork() throws Exception
{
RunAsWorker.this.doWork(person);
return null;
}
}, tenantDomain);
}
}, userName);
}
public abstract void doWork(NodeRef person) throws Exception;
public String getName()
{
return name;
}
};
// Obtains home folder provider and path information with call backs.
private abstract class HomeFolderHandler
{
protected final NodeRef person;
protected final String overrideProviderName;
protected NodeRef homeFolder;
protected String userName;
protected String originalProviderName;
protected String providerName;
protected HomeFolderProvider2 provider;
protected NodeRef root;
protected List<String> preferredPath;
protected List<String> actualPath;
protected NodeRef originalRoot;
public HomeFolderHandler(NodeRef person, String overrideProviderName)
{
this.person = person;
this.overrideProviderName =
(overrideProviderName == null || overrideProviderName.trim().isEmpty())
? null
: overrideProviderName;
}
public void doWork()
{
homeFolder = DefaultTypeConverter.INSTANCE.convert(NodeRef.class,
nodeService.getProperty(person, ContentModel.PROP_HOMEFOLDER));
userName = DefaultTypeConverter.INSTANCE.convert(
String.class, nodeService.getProperty(person, ContentModel.PROP_USERNAME));
if (homeFolder != null)
{
originalProviderName = DefaultTypeConverter.INSTANCE.convert(String.class,
nodeService.getProperty(person, ContentModel.PROP_HOME_FOLDER_PROVIDER));
if (!BOOTSTRAP_HOME_FOLDER_PROVIDER.equals(originalProviderName) &&
!GUEST_HOME_FOLDER_PROVIDER.equals(originalProviderName))
{
providerName = overrideProviderName != null
? overrideProviderName
: originalProviderName;
provider = homeFolderManager.getHomeFolderProvider2(providerName);
if (provider != null)
{
root = homeFolderManager.getRootPathNodeRef(provider);
preferredPath = provider.getHomeFolderPath(person);
if (preferredPath == null || preferredPath.isEmpty())
{
handleSharedHomeProvider();
}
else
{
originalRoot = null;
HomeFolderProvider2 originalProvider = homeFolderManager.getHomeFolderProvider2(originalProviderName);
List<String> originalPreferredPath = null;
if (originalProvider != null)
{
originalRoot = homeFolderManager.getRootPathNodeRef(originalProvider);
originalPreferredPath = originalProvider.getHomeFolderPath(person);
}
if (originalProvider != null &&
(originalPreferredPath == null || originalPreferredPath.isEmpty()))
{
handleOriginalSharedHomeProvider();
}
else
{
actualPath = getRelativePath(root, homeFolder);
if (actualPath != null && actualPath.isEmpty())
{
handleRootOrAbove();
}
else
if (preferredPath.equals(actualPath))
{
handleInPreferredLocation();
}
else
{
handleNotInPreferredLocation();
}
}
}
}
else
{
handleNotAHomeFolderProvider2();
}
}
else
{
handleSpecialHomeFolderProvider();
}
}
else
{
handleHomeFolderNotSet();
}
}
protected abstract void handleInPreferredLocation();
protected abstract void handleNotInPreferredLocation();
protected void handleSharedHomeProvider()
{
}
protected void handleOriginalSharedHomeProvider()
{
}
protected void handleRootOrAbove()
{
}
protected void handleNotAHomeFolderProvider2()
{
}
protected void handleSpecialHomeFolderProvider()
{
}
protected void handleHomeFolderNotSet()
{
}
}
// Records the parents of the preferred folder paths (the leaf folder are not recorded)
// and checks actual paths against these.
private class ParentFolderStructure
{
// Parent folders within each root node
private Map<NodeRef, RootFolder> folders = new HashMap<NodeRef, RootFolder>();
public void recordParentFolder(NodeRef root, List<String> path)
{
RootFolder rootsFolders = getFolders(root);
synchronized(rootsFolders)
{
rootsFolders.add(path);
}
}
/**
* Checks to see if there is a clash between the preferred paths and the
* existing folder structure. If there is a clash, the existing home folder
* (the leaf folder) is moved to a temporary structure. This allows any
* parent folders to be tidied up (if empty), so that the new preferred
* structure can be recreated.<p>
*
* 1. There is no clash if the path is null or empty.
*
* 2. There is a clash if there is a parent structure included the root
* folder itself.<p>
*
* 3. There is a clash if the existing path exists in the parent structure.
* This comparison ignores case as Alfresco does not allow duplicates
* regardless of case.<p>
*
* 4. There is a clash if any of the folders in the existing path don't
* match the case of the parent folders.
*
* 5. There is a clash there are different case versions of the parent
* folders themselves or other existing folders.
*
* When 4 takes place, we will end up with the first one we try to recreate
* being used for all.
*/
public boolean clash(NodeRef root, List<String> path)
{
if (path == null || path.isEmpty())
{
return false;
}
RootFolder rootsFolders = getFolders(root);
synchronized(rootsFolders)
{
return rootsFolders.clash(path);
}
}
private RootFolder getFolders(NodeRef root)
{
synchronized(folders)
{
RootFolder rootsFolders = folders.get(root);
if (rootsFolders == null)
{
rootsFolders = new RootFolder();
folders.put(root, rootsFolders);
}
return rootsFolders;
}
}
// Records the parents of the preferred folder paths (the leaf folder are not recorded)
// and checks actual paths against these BUT only for a single root.
private class RootFolder extends Folder
{
private boolean includesRoot;
public RootFolder()
{
super(null);
}
// Adds a path (but not the leaf folder) if it does not already exist.
public void add(List<String> path)
{
if (!includesRoot)
{
int parentSize = path.size() - 1;
if (parentSize == 0)
{
includesRoot = true;
children = null; // can discard children as all home folders now clash.
if (logger.isInfoEnabled())
{
logger.info(" # Recorded root as parent - no need to record other parents as all home folders will clash");
}
}
else
{
add(path, 0);
}
}
}
/**
* See description of {@link ParentFolderStructure#clash(NodeRef, List)}.<p>
*
* Performs check 2 and then calls {@link Folder#clash(List, int)} to
* perform 3, 4 and 5.
*/
public boolean clash(List<String> path)
{
// Checks 2.
return includesRoot ? false : clash(path, 0);
}
}
private class Folder
{
// Case specific name of first folder added.
String name;
// Indicates if there is another preferred name that used different case.
boolean duplicateWithDifferentCase;
List<Folder> children;
public Folder(String name)
{
this.name = name;
}
/**
* Adds a path (but not the leaf folder) if it does not already exist.
* @param path the full path to add
* @param depth the current depth into the path starting with 0.
*/
protected void add(List<String> path, int depth)
{
int parentSize = path.size() - 1;
String name = path.get(depth);
Folder child = getChild(name);
if (child == null)
{
child = new Folder(name);
if (children == null)
{
children = new LinkedList<Folder>();
}
children.add(child);
if (logger.isInfoEnabled())
{
logger.info(" " + toPath(path, depth));
}
}
else if (!child.name.equals(name))
{
child.duplicateWithDifferentCase = true;
}
// Don't add the leaf folder
if (++depth < parentSize)
{
add(path, depth);
}
}
/**
* See description of {@link ParentFolderStructure#clash(NodeRef, List)}.<p>
*
* Performs checks 3, 4 and 5 for a single level and then recursively checks
* lower levels.
*/
protected boolean clash(List<String> path, int depth)
{
String name = path.get(depth);
Folder child = getChild(name); // Uses equalsIgnoreCase
if (child == null)
{
// Negation of check 3.
return false;
}
else if (child.duplicateWithDifferentCase) // if there folders using different case!
{
// Check 5.
return true;
}
else if (!child.name.equals(name)) // if the case does not match
{
// Check 4.
child.duplicateWithDifferentCase = true;
return true;
}
// If a match (including case) has been made to the end of the path
if (++depth == path.size())
{
// Check 3.
return true;
}
// Check lower levels.
return clash(path, depth);
}
/**
* Returns the child folder with the specified name (ignores case).
*/
private Folder getChild(String name)
{
if (children != null)
{
for (Folder child: children)
{
if (name.equalsIgnoreCase(child.name))
{
return child;
}
}
}
return null;
}
}
}
}