mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-21 18:09:20 +00:00
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
1054 lines
39 KiB
Java
1054 lines
39 KiB
Java
/*
|
|
* Copyright (C) 2005-2013 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 static org.junit.Assert.assertEquals;
|
|
import static org.junit.Assert.assertFalse;
|
|
import static org.junit.Assert.assertNotNull;
|
|
import static org.junit.Assert.assertNull;
|
|
import static org.junit.Assert.assertTrue;
|
|
|
|
import java.util.Arrays;
|
|
import java.util.HashSet;
|
|
import java.util.List;
|
|
import java.util.Locale;
|
|
import java.util.Set;
|
|
|
|
import javax.transaction.Status;
|
|
import javax.transaction.UserTransaction;
|
|
|
|
import org.alfresco.model.ContentModel;
|
|
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.RetryingTransactionCallback;
|
|
import org.alfresco.service.ServiceRegistry;
|
|
import org.alfresco.service.cmr.model.FileFolderService;
|
|
import org.alfresco.service.cmr.repository.ChildAssociationRef;
|
|
import org.alfresco.service.cmr.repository.ContentData;
|
|
import org.alfresco.service.cmr.repository.ContentService;
|
|
import org.alfresco.service.cmr.repository.ContentWriter;
|
|
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.namespace.NamespaceService;
|
|
import org.alfresco.service.namespace.QName;
|
|
import org.alfresco.service.transaction.TransactionService;
|
|
import org.alfresco.util.ApplicationContextHelper;
|
|
import org.alfresco.util.PropertyMap;
|
|
import org.junit.After;
|
|
import org.junit.Before;
|
|
import org.junit.BeforeClass;
|
|
import org.junit.ComparisonFailure;
|
|
import org.junit.FixMethodOrder;
|
|
import org.junit.Test;
|
|
import org.junit.runners.MethodSorters;
|
|
import org.springframework.context.ApplicationContext;
|
|
|
|
/**
|
|
* Integration test for HomeFolderProviderSynchronizer.
|
|
*
|
|
* @author Alan Davis
|
|
*/
|
|
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
|
public class HomeFolderProviderSynchronizerTest
|
|
{
|
|
private static final QName PROP_PARENT_PATH = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "parentPath");
|
|
|
|
private static ApplicationContext applicationContext;
|
|
private static ServiceRegistry serviceRegistry;
|
|
private static TransactionService transactionService;
|
|
private static FileFolderService fileFolderService;
|
|
private static PersonServiceImpl personService;
|
|
private static NodeService nodeService;
|
|
private static ContentService contentService;
|
|
private static AuthorityService authorityService;
|
|
private static TenantAdminService tenantAdminService;
|
|
private static TenantService tenantService;
|
|
private static UserNameMatcherImpl userNameMatcher;
|
|
private static PortableHomeFolderManager homeFolderManager;
|
|
private static RegexHomeFolderProvider largeHomeFolderProvider;
|
|
private static String largeHomeFolderProviderName;
|
|
private static RegexHomeFolderProvider testHomeFolderProvider;
|
|
private static String testHomeFolderProviderName;
|
|
private static String storeUrl;
|
|
private static String origRootPath;
|
|
private static NodeRef rootNodeRef;
|
|
private static HomeFolderProviderSynchronizer homeFolderProviderSynchronizer;
|
|
private static boolean firstTest = true;
|
|
|
|
private UserTransaction trans;
|
|
|
|
@BeforeClass
|
|
public static void classSetup() throws Exception
|
|
{
|
|
applicationContext = ApplicationContextHelper.getApplicationContext();
|
|
serviceRegistry = (ServiceRegistry) applicationContext.getBean("ServiceRegistry");
|
|
transactionService = (TransactionService) applicationContext.getBean("transactionService");
|
|
fileFolderService = (FileFolderService) applicationContext.getBean("fileFolderService");
|
|
personService = (PersonServiceImpl) applicationContext.getBean("personService");
|
|
nodeService = (NodeService) applicationContext.getBean("nodeService");
|
|
contentService = (ContentService) applicationContext.getBean("contentService");
|
|
authorityService = (AuthorityService) applicationContext.getBean("authorityService");
|
|
tenantAdminService = (TenantAdminService) applicationContext.getBean("tenantAdminService");
|
|
tenantService = (TenantService) applicationContext.getBean("tenantService");
|
|
userNameMatcher = (UserNameMatcherImpl) applicationContext.getBean("userNameMatcher");
|
|
homeFolderManager = (PortableHomeFolderManager) applicationContext.getBean("homeFolderManager");
|
|
largeHomeFolderProvider = (RegexHomeFolderProvider) applicationContext.getBean("largeHomeFolderProvider");
|
|
largeHomeFolderProviderName = largeHomeFolderProvider.getName();
|
|
storeUrl = largeHomeFolderProvider.getStoreUrl();
|
|
origRootPath = largeHomeFolderProvider.getRootPath();
|
|
|
|
personService.setCreateMissingPeople(true);
|
|
|
|
// Create test home folder provider that gets its path from a property and the username
|
|
testHomeFolderProvider = new RegexHomeFolderProvider()
|
|
{
|
|
@Override
|
|
public List<String> getHomeFolderPath(NodeRef person)
|
|
{
|
|
String parentPath = DefaultTypeConverter.INSTANCE.convert(String.class, nodeService.getProperty(person, PROP_PARENT_PATH));
|
|
String propPath = ((parentPath == null || parentPath.length() == 0) ? "" : parentPath+'/')+
|
|
homeFolderManager.getPersonProperty(person, ContentModel.PROP_USERNAME);
|
|
return Arrays.asList(propPath.split("/"));
|
|
}
|
|
};
|
|
testHomeFolderProvider.setPropertyName(ContentModel.PROP_USERNAME.getLocalName());
|
|
testHomeFolderProvider.setPattern("(..)");
|
|
testHomeFolderProvider.setBeanName("testHomeFolderProvider");
|
|
testHomeFolderProvider.setHomeFolderManager(homeFolderManager);
|
|
testHomeFolderProvider.setRootPath(origRootPath);
|
|
testHomeFolderProvider.setStoreUrl(storeUrl);
|
|
testHomeFolderProvider.setOnCreatePermissionsManager((PermissionsManager)applicationContext.getBean("defaultOnCreatePermissionsManager"));
|
|
testHomeFolderProvider.setOnCreatePermissionsManager((PermissionsManager)applicationContext.getBean("defaultOnCreatePermissionsManager"));
|
|
testHomeFolderProvider.setOnReferencePermissionsManager((PermissionsManager)applicationContext.getBean("defaultOnReferencePermissionsManager"));
|
|
testHomeFolderProviderName = testHomeFolderProvider.getName();
|
|
homeFolderManager.addProvider(testHomeFolderProvider);
|
|
|
|
homeFolderProviderSynchronizer = new HomeFolderProviderSynchronizer(
|
|
transactionService, authorityService,
|
|
personService, fileFolderService, nodeService,
|
|
homeFolderManager, tenantAdminService);
|
|
}
|
|
|
|
@Before
|
|
public void setUp() throws Exception
|
|
{
|
|
homeFolderProviderSynchronizer.setEnabled("true");
|
|
homeFolderProviderSynchronizer.setOverrideHomeFolderProviderName(null);
|
|
homeFolderProviderSynchronizer.setKeepEmptyParents("false");
|
|
|
|
largeHomeFolderProvider.setPattern("^(..)");
|
|
testHomeFolderProvider.setRootPath(origRootPath);
|
|
largeHomeFolderProvider.setRootPath(origRootPath);
|
|
|
|
// Just in case we killed a test last time - tidy up
|
|
if (firstTest)
|
|
{
|
|
firstTest = false;
|
|
|
|
AuthenticationUtil.setRunAsUserSystem();
|
|
trans = transactionService.getUserTransaction();
|
|
trans.begin();
|
|
rootNodeRef = homeFolderManager.getRootPathNodeRef(largeHomeFolderProvider);
|
|
trans.commit();
|
|
trans = null;
|
|
|
|
tearDown();
|
|
}
|
|
|
|
AuthenticationUtil.setRunAsUserSystem();
|
|
trans = transactionService.getUserTransaction();
|
|
trans.begin();
|
|
// System.out.println(NodeStoreInspector.dumpNode(nodeService, rootNodeRef));
|
|
}
|
|
|
|
@After
|
|
public void tearDown() throws Exception
|
|
{
|
|
if (trans != null)
|
|
{
|
|
try
|
|
{
|
|
trans.commit();
|
|
trans = null;
|
|
}
|
|
catch (Exception e)
|
|
{
|
|
if ((trans.getStatus() == Status.STATUS_ACTIVE) ||
|
|
(trans.getStatus() == Status.STATUS_MARKED_ROLLBACK))
|
|
{
|
|
trans.rollback();
|
|
trans = null;
|
|
}
|
|
}
|
|
}
|
|
|
|
RetryingTransactionCallback<Void> cleanup = new RetryingTransactionCallback<Void>()
|
|
{
|
|
@Override
|
|
public Void execute() throws Throwable
|
|
{
|
|
Set<NodeRef> adminGuestUserHomeFolders = deleteNonAdminGuestUsers();
|
|
deleteNonAdminGuestFolders(adminGuestUserHomeFolders);
|
|
deleteAllTenants();
|
|
return null;
|
|
}
|
|
};
|
|
try
|
|
{
|
|
transactionService.getRetryingTransactionHelper().doInTransaction(cleanup);
|
|
}
|
|
finally
|
|
{
|
|
AuthenticationUtil.clearCurrentSecurityContext();
|
|
userNameMatcher.setUserNamesAreCaseSensitive(false); // Put back the default
|
|
}
|
|
}
|
|
|
|
private Set<NodeRef> deleteNonAdminGuestUsers()
|
|
{
|
|
final Set<NodeRef> adminGuestUserHomeFolders = new HashSet<NodeRef>();
|
|
for (final NodeRef nodeRef : personService.getAllPeople())
|
|
{
|
|
final String username = DefaultTypeConverter.INSTANCE.convert(String.class,
|
|
nodeService.getProperty(nodeRef, ContentModel.PROP_USERNAME));
|
|
final String domainUsername = tenantService.getBaseNameUser(username);
|
|
String tenantDomain = tenantService.getUserDomain(username);
|
|
boolean disabled = !TenantService.DEFAULT_DOMAIN.equals(tenantDomain) &&
|
|
!tenantAdminService.isEnabledTenant(tenantDomain);
|
|
try
|
|
{
|
|
if (disabled)
|
|
{
|
|
tenantAdminService.enableTenant(tenantDomain);
|
|
}
|
|
TenantUtil.runAsSystemTenant(new TenantRunAsWork<Object>()
|
|
{
|
|
public Object doWork() throws Exception
|
|
{
|
|
deleteUser(adminGuestUserHomeFolders, nodeRef, username, domainUsername);
|
|
return null;
|
|
}
|
|
}, tenantDomain);
|
|
}
|
|
finally
|
|
{
|
|
if (disabled)
|
|
{
|
|
tenantAdminService.disableTenant(tenantDomain);
|
|
}
|
|
}
|
|
}
|
|
return adminGuestUserHomeFolders;
|
|
}
|
|
|
|
// Delete users other than admin and guest. The home folders of
|
|
// admin and guest are added to internalUserHomeFolders.
|
|
private void deleteUser(final Set<NodeRef> adminGuestUserHomeFolders,
|
|
NodeRef person, String username, String domainUsername)
|
|
{
|
|
if (!domainUsername.equals("admin") && !domainUsername.equals("guest"))
|
|
{
|
|
personService.deletePerson(person);
|
|
System.out.println("deleted user "+username);
|
|
}
|
|
else
|
|
{
|
|
NodeRef homeFolder = DefaultTypeConverter.INSTANCE.convert(
|
|
NodeRef.class, nodeService.getProperty(person,
|
|
ContentModel.PROP_HOMEFOLDER));
|
|
adminGuestUserHomeFolders.add(homeFolder);
|
|
}
|
|
}
|
|
|
|
private void deleteNonAdminGuestFolders(final Set<NodeRef> adminGuestUserHomeFolders)
|
|
{
|
|
// Delete folders from under the home folder root path in case they have been left over
|
|
// from another test. Admin and Guest home folder should not be under here, but lets
|
|
// double check.
|
|
for (ChildAssociationRef childAssocs: nodeService.getChildAssocs(rootNodeRef))
|
|
{
|
|
NodeRef nodeRef = childAssocs.getChildRef();
|
|
if (!adminGuestUserHomeFolders.contains(nodeRef))
|
|
{
|
|
System.out.println("TearDown remove '"+childAssocs.getQName().getLocalName()+
|
|
"' from under the home folder root.");
|
|
nodeService.deleteNode(nodeRef);
|
|
}
|
|
}
|
|
}
|
|
|
|
private NodeRef createUser(String parentPath, String username) throws Exception
|
|
{
|
|
return createUser(TenantService.DEFAULT_DOMAIN, parentPath, username);
|
|
}
|
|
|
|
private NodeRef createUser(String parentPath,
|
|
String username, String homeFolderProviderName, boolean createHomeDirectory) throws Exception
|
|
{
|
|
return createUser(TenantService.DEFAULT_DOMAIN, parentPath, username,
|
|
homeFolderProviderName, createHomeDirectory);
|
|
}
|
|
|
|
private NodeRef createUser(String tenantDomain, String parentPath, String username) throws Exception
|
|
{
|
|
return createUser(tenantDomain, parentPath, username, largeHomeFolderProviderName, true);
|
|
}
|
|
|
|
private NodeRef createUser(String tenantDomain, final String parentPath,
|
|
final String username, final String homeFolderProviderName,
|
|
final boolean createHomeDirectory) throws Exception
|
|
{
|
|
final String domainUsername = tenantService.getDomainUser(username, tenantDomain);
|
|
return TenantUtil.runAsSystemTenant(new TenantRunAsWork<NodeRef>()
|
|
{
|
|
public NodeRef doWork() throws Exception
|
|
{
|
|
String firstName = username;
|
|
String lastName = "Smith";
|
|
String emailAddress = String.format("%s.%s@xyz.com", firstName,
|
|
lastName);
|
|
PropertyMap properties = new PropertyMap();
|
|
properties.put(ContentModel.PROP_USERNAME, domainUsername);
|
|
properties.put(ContentModel.PROP_FIRSTNAME, firstName);
|
|
properties.put(ContentModel.PROP_LASTNAME, lastName);
|
|
properties.put(ContentModel.PROP_EMAIL, emailAddress);
|
|
if (parentPath != null)
|
|
{
|
|
properties.put(ContentModel.PROP_HOME_FOLDER_PROVIDER, testHomeFolderProviderName);
|
|
properties.put(PROP_PARENT_PATH, parentPath);
|
|
}
|
|
else
|
|
{
|
|
properties.put(ContentModel.PROP_HOME_FOLDER_PROVIDER, homeFolderProviderName);
|
|
}
|
|
personService.setHomeFolderCreationEager(createHomeDirectory);
|
|
NodeRef person = personService.createPerson(properties);
|
|
assertNotNull("The person nodeRef for "+domainUsername+" should have been created", person);
|
|
NodeRef homeFolder = DefaultTypeConverter.INSTANCE.convert(
|
|
NodeRef.class, nodeService.getProperty(person,
|
|
ContentModel.PROP_HOMEFOLDER));
|
|
if (createHomeDirectory && parentPath != null)
|
|
{
|
|
assertNotNull("The homeFolder for "+domainUsername+" should have been created", homeFolder);
|
|
}
|
|
else
|
|
{
|
|
assertNull("The homeFolder for "+domainUsername+" should NOT have been created", homeFolder);
|
|
}
|
|
|
|
if (!testHomeFolderProviderName.equals(homeFolderProviderName))
|
|
{
|
|
if (homeFolderProviderName == null)
|
|
{
|
|
nodeService.removeProperty(person, ContentModel.PROP_HOME_FOLDER_PROVIDER);
|
|
}
|
|
else
|
|
{
|
|
nodeService.setProperty(person, ContentModel.PROP_HOME_FOLDER_PROVIDER,
|
|
homeFolderProviderName);
|
|
}
|
|
}
|
|
return person;
|
|
}
|
|
}, tenantDomain);
|
|
}
|
|
|
|
private NodeRef createFolder(String path) throws Exception
|
|
{
|
|
NodeRef parent = rootNodeRef;
|
|
if (path.length() > 0)
|
|
{
|
|
StringBuilder currentPath = new StringBuilder();
|
|
for (String pathElement: path.split("/"))
|
|
{
|
|
if (currentPath.length() > 0)
|
|
{
|
|
currentPath.append("/");
|
|
}
|
|
currentPath.append(pathElement);
|
|
NodeRef nodeRef = nodeService.getChildByName(parent,
|
|
ContentModel.ASSOC_CONTAINS, pathElement);
|
|
if (nodeRef == null)
|
|
{
|
|
parent = fileFolderService.create(parent, pathElement,
|
|
ContentModel.TYPE_FOLDER).getNodeRef();
|
|
}
|
|
else
|
|
{
|
|
assertTrue("Expected "+currentPath+" to be a folder",
|
|
fileFolderService.getFileInfo(nodeRef).isFolder());
|
|
parent = nodeRef;
|
|
}
|
|
}
|
|
}
|
|
return parent;
|
|
}
|
|
|
|
private NodeRef createContent(String parentPath, String name) throws Exception
|
|
{
|
|
NodeRef parent = createFolder(parentPath);
|
|
PropertyMap propertyMap = new PropertyMap();
|
|
propertyMap.put(ContentModel.PROP_CONTENT, new ContentData(null, "text/plain",
|
|
0L, "UTF-16", Locale.ENGLISH));
|
|
propertyMap.put(ContentModel.PROP_NAME, name);
|
|
NodeRef content = nodeService.createNode(
|
|
parent,
|
|
ContentModel.ASSOC_CONTAINS,
|
|
QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, name),
|
|
ContentModel.TYPE_CONTENT,
|
|
propertyMap).getChildRef();
|
|
ContentWriter writer = contentService.getWriter(content, ContentModel.TYPE_CONTENT, true);
|
|
writer.putContent("The cat sat on the mat.");
|
|
|
|
// System.out.println(NodeStoreInspector.dumpNode(nodeService, rootNodeRef));
|
|
return content;
|
|
}
|
|
|
|
private String toPath(NodeRef root, NodeRef homeFolder)
|
|
{
|
|
if (root == null || homeFolder == null)
|
|
{
|
|
return null;
|
|
}
|
|
|
|
if (root.equals(homeFolder))
|
|
{
|
|
return ".";
|
|
}
|
|
|
|
Path rootPath = nodeService.getPath(root);
|
|
Path homeFolderPath = nodeService.getPath(homeFolder);
|
|
int rootSize = rootPath.size();
|
|
int homeFolderSize = homeFolderPath.size();
|
|
if (rootSize >= homeFolderSize)
|
|
{
|
|
return null;
|
|
}
|
|
|
|
StringBuilder sb = new StringBuilder("");
|
|
|
|
// 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
|
|
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();
|
|
if (sb.length() > 0)
|
|
{
|
|
sb.append('/');
|
|
}
|
|
sb.append(folderQName.getLocalName());
|
|
}
|
|
return sb.toString();
|
|
}
|
|
|
|
private void createTenant(final String tenantDomain)
|
|
{
|
|
AuthenticationUtil.runAs(new RunAsWork<Object>()
|
|
{
|
|
public Object doWork() throws Exception
|
|
{
|
|
if (!tenantAdminService.existsTenant(tenantDomain))
|
|
{
|
|
tenantAdminService.createTenant(tenantDomain,
|
|
("admin "+tenantDomain).toCharArray(), null);
|
|
}
|
|
return null;
|
|
}
|
|
}, AuthenticationUtil.getSystemUserName());
|
|
}
|
|
|
|
private void deleteAllTenants() throws Exception
|
|
{
|
|
List<Tenant> tenants = tenantAdminService.getAllTenants();
|
|
for (Tenant tenant : tenants)
|
|
{
|
|
deleteTenant(tenant.getTenantDomain());
|
|
}
|
|
|
|
}
|
|
|
|
// DbNodeServiceImpl does not support deleteStore() at the moment,
|
|
// even though it supports createStore(), so just disable them for now.
|
|
private void deleteTenant(final String tenantDomain) throws Exception
|
|
{
|
|
AuthenticationUtil.runAs(new RunAsWork<Object>()
|
|
{
|
|
public Object doWork() throws Exception
|
|
{
|
|
if (tenantAdminService.existsTenant(tenantDomain))
|
|
{
|
|
// Can't delete so disable
|
|
// tenantAdminService.deleteTenant(tenantDomain);
|
|
|
|
if (tenantAdminService.isEnabledTenant(tenantDomain))
|
|
{
|
|
tenantAdminService.disableTenant(tenantDomain);
|
|
}
|
|
}
|
|
return null;
|
|
}
|
|
}, AuthenticationUtil.getSystemUserName());
|
|
}
|
|
|
|
private void assertHomeFolderLocation(String username, String expectedPath) throws Exception
|
|
{
|
|
assertHomeFolderLocation(TenantService.DEFAULT_DOMAIN, username, expectedPath);
|
|
}
|
|
|
|
private void assertHomeFolderLocation(String tenantDomain, final String username,
|
|
final String expectedPath) throws Exception
|
|
{
|
|
try
|
|
{
|
|
final String domainUsername = tenantService.getDomainUser(username, tenantDomain);
|
|
TenantUtil.runAsSystemTenant(new TenantRunAsWork<Object>()
|
|
{
|
|
public NodeRef doWork() throws Exception
|
|
{
|
|
NodeRef person = personService.getPerson(domainUsername, false);
|
|
NodeRef homeFolder = DefaultTypeConverter.INSTANCE.convert(NodeRef.class,
|
|
nodeService.getProperty(person, ContentModel.PROP_HOMEFOLDER));
|
|
|
|
if (expectedPath != null)
|
|
{
|
|
assertNotNull("User: "+domainUsername+" home folder should exist", homeFolder);
|
|
}
|
|
|
|
NodeRef rootPath = homeFolderManager.getRootPathNodeRef(largeHomeFolderProvider);
|
|
String actualPath = toPath(rootPath, homeFolder);
|
|
assertEquals("User: "+domainUsername+" home folder location", expectedPath, actualPath);
|
|
return null;
|
|
}
|
|
}, tenantDomain);
|
|
}
|
|
catch (RuntimeException e)
|
|
{
|
|
final Throwable cause = e.getCause();
|
|
if (cause instanceof ComparisonFailure || cause instanceof AssertionError)
|
|
{
|
|
throw (ComparisonFailure)cause;
|
|
}
|
|
else
|
|
{
|
|
throw e;
|
|
}
|
|
}
|
|
}
|
|
|
|
private boolean exists(String path) throws Exception
|
|
{
|
|
NodeRef parent = rootNodeRef;
|
|
boolean exists = true;
|
|
for (String pathElement: path.split("/"))
|
|
{
|
|
NodeRef nodeRef = nodeService.getChildByName(parent,
|
|
ContentModel.ASSOC_CONTAINS, pathElement);
|
|
if (nodeRef == null)
|
|
{
|
|
exists = false;
|
|
break;
|
|
}
|
|
else
|
|
{
|
|
parent = nodeRef;
|
|
}
|
|
}
|
|
return exists;
|
|
}
|
|
|
|
private void moveUserHomeFolders() throws Exception
|
|
{
|
|
trans.commit();
|
|
trans = null;
|
|
|
|
homeFolderProviderSynchronizer.onBootstrap(null);
|
|
|
|
trans = transactionService.getUserTransaction();
|
|
trans.begin();
|
|
}
|
|
|
|
@Test
|
|
public void test01CorrectLocation() throws Exception
|
|
{
|
|
createUser("te", "tess");
|
|
|
|
moveUserHomeFolders();
|
|
|
|
assertHomeFolderLocation("tess", "te/tess");
|
|
}
|
|
|
|
@Test
|
|
public void test02CreateParentFolder() throws Exception
|
|
{
|
|
createUser("", "fred");
|
|
|
|
moveUserHomeFolders();
|
|
|
|
assertHomeFolderLocation("fred", "fr/fred");
|
|
}
|
|
|
|
@Test
|
|
public void test03NotEnabled() throws Exception
|
|
{
|
|
createUser("", "fred");
|
|
homeFolderProviderSynchronizer.setEnabled("false");
|
|
|
|
moveUserHomeFolders();
|
|
|
|
// If performed, the home folder will have been moved to fr/fred
|
|
// We must force the creation of the home folder as it will not
|
|
// have been done
|
|
personService.getPerson("fred");
|
|
assertHomeFolderLocation("fred", "fred");
|
|
}
|
|
|
|
@Test
|
|
public void test04HomeFolderNotYetCreated() throws Exception
|
|
{
|
|
NodeRef person = createUser("", "fred", largeHomeFolderProviderName, false);
|
|
|
|
moveUserHomeFolders();
|
|
|
|
NodeRef homeFolder = DefaultTypeConverter.INSTANCE.convert(NodeRef.class,
|
|
nodeService.getProperty(person, ContentModel.PROP_HOMEFOLDER));
|
|
assertNull("The homeFolder should NOT have been created", homeFolder);
|
|
|
|
person = personService.getPerson("fred");
|
|
homeFolder = DefaultTypeConverter.INSTANCE.convert(NodeRef.class,
|
|
nodeService.getProperty(person, ContentModel.PROP_HOMEFOLDER));
|
|
assertNotNull("The homeFolder should have been created", homeFolder);
|
|
}
|
|
|
|
@Test
|
|
public void test05CreateMultipleParentFolders() throws Exception
|
|
{
|
|
largeHomeFolderProvider.setPattern("^(.?)(.?)(.?)(.?)(.?)");
|
|
|
|
createUser("", "fred");
|
|
createUser("", "peter");
|
|
createUser("", "tess");
|
|
|
|
moveUserHomeFolders();
|
|
|
|
assertHomeFolderLocation("fred", "f/r/e/d/fred");
|
|
assertHomeFolderLocation("peter", "p/e/t/e/r/peter");
|
|
assertHomeFolderLocation("tess", "t/e/s/s/tess");
|
|
}
|
|
|
|
@Test
|
|
public void test06MoveToRoot() throws Exception
|
|
{
|
|
// i.e. there are no parent folders after the sync
|
|
largeHomeFolderProvider.setPattern("");
|
|
|
|
createUser("fr", "fred");
|
|
|
|
moveUserHomeFolders();
|
|
|
|
assertHomeFolderLocation("fred", "fred");
|
|
}
|
|
|
|
@Test
|
|
public void test07RemoveEmptyParents() throws Exception
|
|
{
|
|
createUser("a/bb/ccc", "peter");
|
|
|
|
moveUserHomeFolders();
|
|
|
|
assertHomeFolderLocation("peter", "pe/peter");
|
|
assertFalse("Expected the empty parent 'a' to have been removed.", exists("a"));
|
|
}
|
|
|
|
@Test
|
|
public void test08KeepEmptyParents() throws Exception
|
|
{
|
|
createUser("a/bb/ccc", "peter");
|
|
homeFolderProviderSynchronizer.setKeepEmptyParents("true");
|
|
|
|
moveUserHomeFolders();
|
|
|
|
assertHomeFolderLocation("peter", "pe/peter");
|
|
assertTrue("Expected the empty parent 'a/bb/ccc' to still exist as global " +
|
|
"property was set.", exists("a/bb/ccc"));
|
|
}
|
|
|
|
@Test
|
|
public void test09KeepNonEmptyParents() throws Exception
|
|
{
|
|
createUser("a/bb/ccc", "peter");
|
|
createFolder("a/bb/ddd");
|
|
|
|
moveUserHomeFolders();
|
|
|
|
assertHomeFolderLocation("peter", "pe/peter");
|
|
assertFalse("Expected the empty parent 'a/bb/ccc' to have been removed.", exists("a/bb/ccc"));
|
|
assertTrue("Expected the non empty parent 'a/bb' to have been kept.", exists("a/bb/ddd"));
|
|
}
|
|
|
|
@Test
|
|
public void test10PathAlreadyInUseByFolder() throws Exception
|
|
{
|
|
createUser("", "fred");
|
|
createFolder("fr");
|
|
|
|
moveUserHomeFolders();
|
|
|
|
assertHomeFolderLocation("fred", "fr/fred");
|
|
}
|
|
|
|
@Test
|
|
public void test11PathAlreadyInUseByContent() throws Exception
|
|
{
|
|
System.out.println("testPathAlreadyInUseByContent: EXPECT TO SEE AN EXCEPTION IN THE LOG ======================== ");
|
|
|
|
createUser("", "fred");
|
|
createContent("", "fr");
|
|
|
|
moveUserHomeFolders();
|
|
|
|
assertHomeFolderLocation("fred", "fred"); // unchanged
|
|
assertFalse("Did not expect there to be a folder in the prefered location.", exists("fr/fred"));
|
|
assertTrue("Expected the content to still exist.", exists("fr"));
|
|
}
|
|
|
|
@Test
|
|
public void test12PathInUseByUser() throws Exception
|
|
{
|
|
// i.e. test clash between home folder names and parent folders
|
|
// which requires a temporary folder to be created
|
|
createUser("", "fr");
|
|
createUser("", "fred");
|
|
createUser("", "peter");
|
|
createUser("", "pe");
|
|
|
|
moveUserHomeFolders();
|
|
|
|
assertHomeFolderLocation("fr", "fr/fr");
|
|
assertHomeFolderLocation("fred", "fr/fred");
|
|
assertHomeFolderLocation("peter", "pe/peter");
|
|
assertHomeFolderLocation("pe", "pe/pe");
|
|
|
|
assertFalse("The Temporary-1 folder should have been removed", exists("Temporary-1"));
|
|
}
|
|
|
|
@Test
|
|
public void test13UseFirstAvailableTemporaryFolder() throws Exception
|
|
{
|
|
createUser("", "fr");
|
|
createUser("", "fred");
|
|
createFolder("Temporary-1");
|
|
createFolder("Temporary-2");
|
|
createFolder("Temporary-3");
|
|
|
|
// Don't delete the temporary folder
|
|
homeFolderProviderSynchronizer.setKeepEmptyParents("true");
|
|
|
|
moveUserHomeFolders();
|
|
|
|
assertTrue("The existing Temporary-1 folder should still exist", exists("Temporary-1"));
|
|
assertTrue("The existing Temporary-2 folder should still exist", exists("Temporary-2"));
|
|
assertTrue("The existing Temporary-3 folder should still exist", exists("Temporary-3"));
|
|
assertTrue("The existing Temporary-4 folder should still exist", exists("Temporary-4"));
|
|
}
|
|
|
|
@Test
|
|
public void test14Exception() throws Exception
|
|
{
|
|
System.out.println("testException: EXPECT TO SEE AN EXCEPTION IN THE LOG ======================== ");
|
|
|
|
// Force the need for a temporary folder
|
|
createUser("", "fr");
|
|
createUser("", "fred");
|
|
|
|
// Use up all possible temporary folder names
|
|
for (int i=1; i<=100; i++)
|
|
{
|
|
createFolder("Temporary-"+i);
|
|
}
|
|
|
|
moveUserHomeFolders();
|
|
|
|
// normally would have changed to fr/fred if there had not been an exception
|
|
assertHomeFolderLocation("fred", "fred");
|
|
}
|
|
|
|
@Test
|
|
public void test15MultipleRoots() throws Exception
|
|
{
|
|
createFolder("root");
|
|
String rootPath = origRootPath + "/cm:root";
|
|
testHomeFolderProvider.setRootPath(rootPath);
|
|
|
|
createUser("a/b/c", "tess", testHomeFolderProviderName, true);
|
|
createUser("a/b/c", "fred", largeHomeFolderProviderName, true);
|
|
|
|
moveUserHomeFolders();
|
|
|
|
assertHomeFolderLocation("fred", "fr/fred");
|
|
assertHomeFolderLocation("tess", "root/a/b/c/tess");
|
|
}
|
|
|
|
@Test
|
|
public void test16PathNotUnderRoot() throws Exception
|
|
{
|
|
System.out.println("-------------- testPathNotUnderRoot --------------");
|
|
|
|
createUser("a/b/c", "fred");
|
|
|
|
createFolder("root");
|
|
String rootPath = origRootPath + "/cm:root";
|
|
largeHomeFolderProvider.setRootPath(rootPath);
|
|
|
|
assertHomeFolderLocation("fred", null);
|
|
|
|
moveUserHomeFolders();
|
|
|
|
assertHomeFolderLocation("fred", "fr/fred");
|
|
}
|
|
|
|
@Test
|
|
public void test17PathIsRoot() throws Exception
|
|
{
|
|
System.out.println("-------------- testPathIsRoot --------------");
|
|
|
|
createUser("", "fred");
|
|
|
|
createFolder("root");
|
|
String rootPath = origRootPath + "/cm:fred";
|
|
largeHomeFolderProvider.setRootPath(rootPath);
|
|
|
|
assertHomeFolderLocation("fred", ".");
|
|
|
|
moveUserHomeFolders();
|
|
|
|
assertHomeFolderLocation("fred", ".");
|
|
}
|
|
|
|
@Test
|
|
public void test18PathIsAboveRoot() throws Exception
|
|
{
|
|
System.out.println("-------------- testPathIsAboveRoot --------------");
|
|
|
|
createUser("", "fred");
|
|
|
|
createFolder("fred/under1/under2");
|
|
String rootPath = origRootPath + "/cm:fred/cm:under1/cm:under2";
|
|
String origRootPath = largeHomeFolderProvider.getRootPath();
|
|
largeHomeFolderProvider.setRootPath(rootPath);
|
|
|
|
assertHomeFolderLocation("fred", null);
|
|
|
|
moveUserHomeFolders();
|
|
|
|
assertHomeFolderLocation("fred", null);
|
|
|
|
largeHomeFolderProvider.setRootPath(origRootPath);
|
|
assertHomeFolderLocation("fred", "fred");
|
|
}
|
|
|
|
@Test
|
|
public void test19MultipleUsers() throws Exception
|
|
{
|
|
// Tried 2000 users and the HomeFolderProviderSynchronizer.onBootstrap(null)
|
|
// took 33 seconds. The setup and tear down takes a while too.
|
|
|
|
// Use a value larger than the batch size of 20 and log every 100.
|
|
int userCount = 110;
|
|
for (int i=1; i<=userCount; i++)
|
|
{
|
|
String name = "f"+i+"red";
|
|
createUser("", name);
|
|
}
|
|
|
|
moveUserHomeFolders();
|
|
|
|
for (int i=1; i<=userCount; i++)
|
|
{
|
|
String name = "f"+i+"red";
|
|
assertHomeFolderLocation(name, name.substring(0,2)+'/'+name);
|
|
}
|
|
}
|
|
|
|
@Test
|
|
public void test20OverrideProvider() throws Exception
|
|
{
|
|
NodeRef person = createUser("a/b/c", "fred");
|
|
moveUserHomeFolders();
|
|
assertHomeFolderLocation("fred", "fr/fred");
|
|
|
|
homeFolderProviderSynchronizer.setOverrideHomeFolderProviderName(
|
|
testHomeFolderProviderName);
|
|
moveUserHomeFolders();
|
|
|
|
assertHomeFolderLocation("fred", "a/b/c/fred");
|
|
String providerName = (String) nodeService.getProperty(person,
|
|
ContentModel.PROP_HOME_FOLDER_PROVIDER);
|
|
assertEquals(testHomeFolderProviderName , providerName);
|
|
}
|
|
|
|
@Test
|
|
public void test21NoOriginalProvider() throws Exception
|
|
{
|
|
createUser("a/b/c", "fred", null, true);
|
|
homeFolderProviderSynchronizer.setOverrideHomeFolderProviderName(
|
|
largeHomeFolderProviderName);
|
|
|
|
moveUserHomeFolders();
|
|
|
|
assertHomeFolderLocation("fred", "fr/fred"); // unchanged
|
|
assertTrue("Expected the empty parent 'a/b/c' to still exist as original " +
|
|
"root was unknown, because the original home folder provider was not set.",
|
|
exists("a/b/c"));
|
|
}
|
|
|
|
@Test
|
|
@SuppressWarnings("deprecation")
|
|
public void test22Version1HomeFolderProvider() throws Exception
|
|
{
|
|
// Should just log a message to say it can't do anything
|
|
final String name = "v1Provider";
|
|
HomeFolderProvider v1Provider = new HomeFolderProvider()
|
|
{
|
|
@Override
|
|
public void onCreateNode(ChildAssociationRef childAssocRef)
|
|
{
|
|
}
|
|
|
|
@Override
|
|
public String getName()
|
|
{
|
|
return name;
|
|
}
|
|
};
|
|
homeFolderManager.addProvider(v1Provider);
|
|
|
|
createUser("a/b/c", "fred");
|
|
|
|
homeFolderProviderSynchronizer.setOverrideHomeFolderProviderName(name);
|
|
moveUserHomeFolders();
|
|
|
|
assertHomeFolderLocation("fred", "a/b/c/fred");
|
|
}
|
|
|
|
@Test
|
|
@SuppressWarnings("deprecation")
|
|
public void test23ExtendsAbstractHomeFolderProvider() throws Exception
|
|
{
|
|
// Should work through the V2Adaptor
|
|
final String name = "v1Provider";
|
|
AbstractHomeFolderProvider v1Provider = new UIDBasedHomeFolderProvider();
|
|
v1Provider.setBeanName(name);
|
|
v1Provider.setHomeFolderManager(homeFolderManager);
|
|
v1Provider.setOnCreatePermissionsManager(largeHomeFolderProvider.getOnCreatePermissionsManager());
|
|
v1Provider.setOnReferencePermissionsManager(largeHomeFolderProvider.getOnReferencePermissionsManager());
|
|
v1Provider.setOwnerOnCreate(largeHomeFolderProvider.getOwner());
|
|
v1Provider.setPath(largeHomeFolderProvider.getRootPath());
|
|
v1Provider.setServiceRegistry(serviceRegistry);
|
|
v1Provider.setStoreUrl(largeHomeFolderProvider.getStoreUrl());
|
|
v1Provider.afterPropertiesSet();
|
|
|
|
createUser("a/b/c", "fred");
|
|
|
|
homeFolderProviderSynchronizer.setOverrideHomeFolderProviderName(name);
|
|
moveUserHomeFolders();
|
|
|
|
assertHomeFolderLocation("fred", "fred");
|
|
}
|
|
|
|
@Test
|
|
public void test24TenantService() throws Exception
|
|
{
|
|
// Only test if running multi-tenant
|
|
if (tenantAdminService.isEnabled())
|
|
{
|
|
long time = System.currentTimeMillis();
|
|
final String tenant1 = time+".tenant1";
|
|
final String tenant2 = time+".tenant2";
|
|
|
|
createTenant(tenant1);
|
|
createTenant(tenant2);
|
|
|
|
createUser("", "fred");
|
|
createUser(tenant1, "", "fred");
|
|
createUser(tenant2, "", "fred");
|
|
|
|
moveUserHomeFolders();
|
|
|
|
assertHomeFolderLocation("fred", "fr/fred");
|
|
assertHomeFolderLocation(tenant1, "fred", "fr/"+tenantService.getDomainUser("fred", tenant1));
|
|
assertHomeFolderLocation(tenant2, "fred", "fr/"+tenantService.getDomainUser("fred", tenant2));
|
|
}
|
|
}
|
|
|
|
// ALF-11535
|
|
@Test
|
|
public void test25ChangeParentFolderCase() throws Exception
|
|
{
|
|
// By default, user names are case sensitive
|
|
createUser("fr", "FRED");
|
|
moveUserHomeFolders();
|
|
assertHomeFolderLocation("FRED", "FR/FRED");
|
|
assertHomeFolderLocation("fred", "FR/FRED"); // Same user
|
|
}
|
|
|
|
// ALF-11535
|
|
@Test
|
|
public void test26CaseSensitiveUsers() throws Exception
|
|
{
|
|
userNameMatcher.setUserNamesAreCaseSensitive(true);
|
|
|
|
// Users are processed in a sorted order (natural ordering).
|
|
// The preferred parent folder structure of the first user
|
|
// is used where there is a clash between users.
|
|
|
|
// The following users are in their natural order.
|
|
createUser("Ab", "Abby");
|
|
createUser("TE", "TESS");
|
|
createUser("TE", "Tess");
|
|
createUser("Ab", "aBBY");
|
|
|
|
moveUserHomeFolders();
|
|
assertHomeFolderLocation("Abby", "Ab/Abby");
|
|
assertHomeFolderLocation("TESS", "TE/TESS");
|
|
assertHomeFolderLocation("Tess", "TE/Tess-1");
|
|
assertHomeFolderLocation("aBBY", "Ab/aBBY-1");
|
|
}
|
|
}
|