mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-10-22 15:12:38 +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
670 lines
24 KiB
Java
670 lines
24 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.usage;
|
|
|
|
import java.util.ArrayList;
|
|
import java.util.HashMap;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.Set;
|
|
import java.util.concurrent.locks.Lock;
|
|
import java.util.concurrent.locks.ReentrantLock;
|
|
|
|
import org.alfresco.model.ContentModel;
|
|
import org.alfresco.repo.domain.usage.UsageDAO;
|
|
import org.alfresco.repo.domain.usage.UsageDAO.MapHandler;
|
|
import org.alfresco.repo.node.NodeServicePolicies;
|
|
import org.alfresco.repo.node.NodeServicePolicies.OnCreateNodePolicy;
|
|
import org.alfresco.repo.policy.JavaBehaviour;
|
|
import org.alfresco.repo.policy.PolicyComponent;
|
|
import org.alfresco.repo.security.authentication.AuthenticationUtil;
|
|
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.repo.transaction.TransactionServiceImpl;
|
|
import org.alfresco.service.cmr.repository.ChildAssociationRef;
|
|
import org.alfresco.service.cmr.repository.NodeRef;
|
|
import org.alfresco.service.cmr.repository.NodeService;
|
|
import org.alfresco.service.cmr.repository.StoreRef;
|
|
import org.alfresco.service.cmr.usage.UsageService;
|
|
import org.alfresco.service.namespace.QName;
|
|
import org.alfresco.util.Pair;
|
|
import org.apache.commons.logging.Log;
|
|
import org.apache.commons.logging.LogFactory;
|
|
import org.springframework.context.ApplicationEvent;
|
|
import org.springframework.extensions.surf.util.AbstractLifecycleBean;
|
|
|
|
/**
|
|
* User Usage Tracking Component - to allow user usages to be collapsed or re-calculated
|
|
*
|
|
* - used by UserUsageCollapseJob to collapse usage deltas.
|
|
* - used on bootstrap to either clear all usages or (re-)calculate all missing usages.
|
|
*/
|
|
public class UserUsageTrackingComponent extends AbstractLifecycleBean implements NodeServicePolicies.OnCreateNodePolicy
|
|
{
|
|
private static Log logger = LogFactory.getLog(UserUsageTrackingComponent.class);
|
|
|
|
private TransactionServiceImpl transactionService;
|
|
private ContentUsageImpl contentUsageImpl;
|
|
|
|
private NodeService nodeService;
|
|
private UsageDAO usageDAO;
|
|
private UsageService usageService;
|
|
private TenantAdminService tenantAdminService;
|
|
private TenantService tenantService;
|
|
|
|
private StoreRef personStoreRef;
|
|
|
|
private int clearBatchSize = 50;
|
|
private int updateBatchSize = 50;
|
|
|
|
private boolean enabled = true;
|
|
private Lock writeLock = new ReentrantLock();
|
|
|
|
private PolicyComponent policyComponent;
|
|
|
|
/**
|
|
* Spring bean init method
|
|
*/
|
|
public void init()
|
|
{
|
|
if (enabled)
|
|
{
|
|
this.policyComponent.bindClassBehaviour(OnCreateNodePolicy.QNAME, ContentModel.TYPE_PERSON, new JavaBehaviour(this, "onCreateNode"));
|
|
}
|
|
}
|
|
|
|
public void setPolicyComponent(PolicyComponent policyComponent)
|
|
{
|
|
this.policyComponent = policyComponent;
|
|
}
|
|
|
|
public void setTransactionService(TransactionServiceImpl transactionService)
|
|
{
|
|
this.transactionService = transactionService;
|
|
}
|
|
|
|
public void setContentUsageImpl(ContentUsageImpl contentUsageImpl)
|
|
{
|
|
this.contentUsageImpl = contentUsageImpl;
|
|
}
|
|
|
|
public void setPersonStoreUrl(String storeUrl)
|
|
{
|
|
this.personStoreRef = new StoreRef(storeUrl);
|
|
}
|
|
|
|
public void setNodeService(NodeService nodeService)
|
|
{
|
|
this.nodeService = nodeService;
|
|
}
|
|
|
|
public void setUsageDAO(UsageDAO usageDAO)
|
|
{
|
|
this.usageDAO = usageDAO;
|
|
}
|
|
|
|
public void setUsageService(UsageService usageService)
|
|
{
|
|
this.usageService = usageService;
|
|
}
|
|
|
|
public void setTenantAdminService(TenantAdminService tenantAdminService)
|
|
{
|
|
this.tenantAdminService = tenantAdminService;
|
|
}
|
|
|
|
public void setTenantService(TenantService tenantService)
|
|
{
|
|
this.tenantService = tenantService;
|
|
}
|
|
|
|
public void setClearBatchSize(int clearBatchSize)
|
|
{
|
|
this.clearBatchSize = clearBatchSize;
|
|
}
|
|
|
|
public void setUpdateBatchSize(int updateBatchSize)
|
|
{
|
|
this.updateBatchSize = updateBatchSize;
|
|
}
|
|
|
|
public void setEnabled(boolean enabled)
|
|
{
|
|
this.enabled = enabled;
|
|
}
|
|
|
|
public void execute()
|
|
{
|
|
if (enabled == false || transactionService.isReadOnly())
|
|
{
|
|
return;
|
|
}
|
|
|
|
boolean locked = writeLock.tryLock();
|
|
if (locked)
|
|
{
|
|
// collapse usages - note: for MT environment, will collapse for all tenants
|
|
try
|
|
{
|
|
collapseUsages();
|
|
}
|
|
finally
|
|
{
|
|
writeLock.unlock();
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
protected void onBootstrap(ApplicationEvent event)
|
|
{
|
|
// default domain
|
|
bootstrapInternal();
|
|
|
|
if (tenantAdminService.isEnabled())
|
|
{
|
|
List<Tenant> tenants = tenantAdminService.getAllTenants();
|
|
for (Tenant tenant : tenants)
|
|
{
|
|
TenantUtil.runAsSystemTenant(new TenantRunAsWork<Object>()
|
|
{
|
|
public Object doWork() throws Exception
|
|
{
|
|
bootstrapInternal();
|
|
return null;
|
|
}
|
|
}, tenant.getTenantDomain());
|
|
}
|
|
}
|
|
}
|
|
|
|
public void bootstrapInternal()
|
|
{
|
|
if (transactionService.isReadOnly())
|
|
{
|
|
return;
|
|
}
|
|
|
|
boolean locked = writeLock.tryLock();
|
|
if (locked)
|
|
{
|
|
try
|
|
{
|
|
if (enabled)
|
|
{
|
|
// enabled - calculate missing usages
|
|
calculateMissingUsages();
|
|
}
|
|
else
|
|
{
|
|
if (clearBatchSize != 0)
|
|
{
|
|
// disabled - remove all usages
|
|
clearAllUsages();
|
|
}
|
|
}
|
|
}
|
|
finally
|
|
{
|
|
writeLock.unlock();
|
|
}
|
|
}
|
|
}
|
|
|
|
@Override
|
|
public void onCreateNode(ChildAssociationRef childAssocRef)
|
|
{
|
|
if (enabled == true)
|
|
{
|
|
final NodeRef personRef = childAssocRef.getChildRef();
|
|
final String userName = (String) this.nodeService.getProperty(personRef, ContentModel.PROP_USERNAME);
|
|
|
|
if (userName != null)
|
|
{
|
|
RetryingTransactionCallback<Long> updateUserWithUsage = new RetryingTransactionCallback<Long>()
|
|
{
|
|
public Long execute() throws Throwable
|
|
{
|
|
List<String> stores = contentUsageImpl.getStores();
|
|
|
|
Long currentUsage = null;
|
|
|
|
for (String store : stores)
|
|
{
|
|
final StoreRef storeRef = tenantService.getName(new StoreRef(store));
|
|
|
|
Long contentSize = usageDAO.getContentSizeForStoreForUser(storeRef, userName);
|
|
|
|
if (contentSize != null)
|
|
{
|
|
currentUsage = (currentUsage == null ? 0L : currentUsage) + contentSize;
|
|
}
|
|
}
|
|
|
|
if (currentUsage != null && currentUsage > 0L)
|
|
{
|
|
List<Pair<NodeRef, Long>> batchUserUsages = new ArrayList<Pair<NodeRef, Long>>(1);
|
|
batchUserUsages.add(new Pair<NodeRef, Long>(personRef, currentUsage));
|
|
|
|
updateUsages(batchUserUsages);
|
|
}
|
|
|
|
return null;
|
|
}
|
|
};
|
|
|
|
// execute in READ-WRITE txn
|
|
transactionService.getRetryingTransactionHelper().doInTransaction(updateUserWithUsage, false);
|
|
}
|
|
}
|
|
}
|
|
|
|
@Override
|
|
protected void onShutdown(ApplicationEvent event)
|
|
{
|
|
}
|
|
|
|
|
|
/**
|
|
* Clear content usage for all users that have a usage.
|
|
*/
|
|
private void clearAllUsages()
|
|
{
|
|
if (logger.isInfoEnabled())
|
|
{
|
|
logger.info("Disabled - clear non-missing user usages ...");
|
|
}
|
|
|
|
final Map<String, NodeRef> users = new HashMap<String, NodeRef>();
|
|
|
|
RetryingTransactionCallback<Object> getUsersWithUsage = new RetryingTransactionCallback<Object>()
|
|
{
|
|
public Object execute() throws Throwable
|
|
{
|
|
// get people (users) with calculated usage
|
|
MapHandler userHandler = new MapHandler()
|
|
{
|
|
public void handle(Map<String, Object> result)
|
|
{
|
|
String username = (String)result.get("username");
|
|
String uuid = (String)result.get("uuid");
|
|
|
|
if (! username.equalsIgnoreCase(AuthenticationUtil.getSystemUserName()))
|
|
{
|
|
users.put(username, new NodeRef(personStoreRef, uuid));
|
|
}
|
|
}
|
|
};
|
|
usageDAO.getUsersWithUsage(tenantService.getName(personStoreRef), userHandler);
|
|
|
|
return null;
|
|
}
|
|
};
|
|
|
|
// execute in READ-ONLY txn
|
|
transactionService.getRetryingTransactionHelper().doInTransaction(getUsersWithUsage, true);
|
|
|
|
if (logger.isInfoEnabled())
|
|
{
|
|
logger.info("Found " + users.size() + " users to clear");
|
|
}
|
|
|
|
int clearCount = 0;
|
|
int batchCount = 0;
|
|
int totalCount = 0;
|
|
|
|
List<NodeRef> batchPersonRefs = new ArrayList<NodeRef>(clearBatchSize);
|
|
for (NodeRef personNodeRef : users.values())
|
|
{
|
|
batchPersonRefs.add(personNodeRef);
|
|
batchCount++;
|
|
totalCount++;
|
|
|
|
if ((batchCount == clearBatchSize) || (totalCount == users.size()))
|
|
{
|
|
int cleared = clearUsages(batchPersonRefs);
|
|
clearCount = clearCount + cleared;
|
|
|
|
batchPersonRefs.clear();
|
|
batchCount = 0;
|
|
}
|
|
}
|
|
|
|
if (logger.isInfoEnabled())
|
|
{
|
|
logger.info("... cleared non-missing usages for " + clearCount + " users");
|
|
}
|
|
}
|
|
|
|
private int clearUsages(final List<NodeRef> personNodeRefs)
|
|
{
|
|
RetryingTransactionCallback<Integer> clearPersonUsage = new RetryingTransactionCallback<Integer>()
|
|
{
|
|
public Integer execute() throws Throwable
|
|
{
|
|
int clearCount = 0;
|
|
for (NodeRef personNodeRef : personNodeRefs)
|
|
{
|
|
nodeService.setProperty(personNodeRef, ContentModel.PROP_SIZE_CURRENT, null);
|
|
usageService.deleteDeltas(personNodeRef);
|
|
|
|
if (logger.isTraceEnabled())
|
|
{
|
|
logger.trace("Cleared usage for person ("+ personNodeRef+")");
|
|
}
|
|
|
|
clearCount++;
|
|
}
|
|
return clearCount;
|
|
}
|
|
};
|
|
|
|
// execute in READ-WRITE txn
|
|
return transactionService.getRetryingTransactionHelper().doInTransaction(clearPersonUsage, false);
|
|
}
|
|
|
|
/**
|
|
* Recalculate content usage for all users that have no usage.
|
|
* Required if upgrading an existing Alfresco, for users that have not had their initial usage calculated.
|
|
*/
|
|
private void calculateMissingUsages()
|
|
{
|
|
if (logger.isInfoEnabled())
|
|
{
|
|
logger.info("Enabled - calculate missing user usages ...");
|
|
}
|
|
|
|
final Map<String, NodeRef> users = new HashMap<String, NodeRef>();
|
|
|
|
RetryingTransactionCallback<Object> getUsersWithoutUsage = new RetryingTransactionCallback<Object>()
|
|
{
|
|
public Object execute() throws Throwable
|
|
{
|
|
// get people (users) without calculated usage
|
|
MapHandler userHandler = new MapHandler()
|
|
{
|
|
public void handle(Map<String, Object> result)
|
|
{
|
|
String username = (String)result.get("username");
|
|
String uuid = (String)result.get("uuid");
|
|
|
|
if (! username.equalsIgnoreCase(AuthenticationUtil.getSystemUserName()))
|
|
{
|
|
users.put(username, new NodeRef(personStoreRef, uuid));
|
|
}
|
|
}
|
|
};
|
|
|
|
usageDAO.getUsersWithoutUsage(tenantService.getName(personStoreRef), userHandler);
|
|
|
|
return null;
|
|
}
|
|
};
|
|
|
|
// execute in READ-ONLY txn
|
|
transactionService.getRetryingTransactionHelper().doInTransaction(getUsersWithoutUsage, true);
|
|
|
|
if (logger.isInfoEnabled())
|
|
{
|
|
logger.info("Found " + users.size() + " users to recalculate");
|
|
}
|
|
|
|
int updateCount = 0;
|
|
if (users.size() > 0)
|
|
{
|
|
updateCount = recalculateUsages(users);
|
|
}
|
|
|
|
if (logger.isInfoEnabled())
|
|
{
|
|
logger.info("... calculated missing usages for " + updateCount + " users");
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Recalculate content usage for given users. Required if upgrading an existing Alfresco, for users that
|
|
* have not had their initial usage calculated. In a future release, could also be called explicitly by
|
|
* a SysAdmin, eg. via a JMX operation.
|
|
*/
|
|
private int recalculateUsages(final Map<String, NodeRef> users)
|
|
{
|
|
final Map<String, Long> currentUserUsages = new HashMap<String, Long>(users.size());
|
|
|
|
RetryingTransactionCallback<Long> calculateCurrentUsages = new RetryingTransactionCallback<Long>()
|
|
{
|
|
public Long execute() throws Throwable
|
|
{
|
|
List<String> stores = contentUsageImpl.getStores();
|
|
|
|
for (String store : stores)
|
|
{
|
|
final StoreRef storeRef = tenantService.getName(new StoreRef(store));
|
|
|
|
if (logger.isTraceEnabled())
|
|
{
|
|
logger.trace("Recalc usages for store=" + storeRef);
|
|
}
|
|
|
|
// get content urls
|
|
MapHandler userContentUrlHandler = new MapHandler()
|
|
{
|
|
public void handle(Map<String, Object> result)
|
|
{
|
|
String owner = (String)result.get("owner");
|
|
String creator = (String)result.get("creator");
|
|
Long contentSize = (Long)result.get("contentSize"); // sum of content size (via join of new style content id)
|
|
|
|
if (contentSize == null)
|
|
{
|
|
contentSize = 0L;
|
|
}
|
|
|
|
if (owner == null)
|
|
{
|
|
owner = creator;
|
|
}
|
|
|
|
Long currentUsage = currentUserUsages.get(owner);
|
|
|
|
if (currentUsage == null)
|
|
{
|
|
currentUsage = 0L;
|
|
}
|
|
|
|
currentUserUsages.put(owner, currentUsage + contentSize);
|
|
}
|
|
};
|
|
|
|
// Query and sum the 'new' style content properties
|
|
usageDAO.getUserContentSizesForStore(storeRef, userContentUrlHandler);
|
|
}
|
|
|
|
return null;
|
|
}
|
|
};
|
|
|
|
// execute in READ-ONLY txn
|
|
transactionService.getRetryingTransactionHelper().doInTransaction(calculateCurrentUsages, true);
|
|
|
|
if (logger.isDebugEnabled())
|
|
{
|
|
logger.debug("Usages calculated - start update");
|
|
}
|
|
|
|
int updateCount = 0;
|
|
int batchCount = 0;
|
|
int totalCount = 0;
|
|
|
|
List<Pair<NodeRef, Long>> batchUserUsages = new ArrayList<Pair<NodeRef, Long>>(updateBatchSize);
|
|
|
|
for (Map.Entry<String, NodeRef> user : users.entrySet())
|
|
{
|
|
String userName = user.getKey();
|
|
NodeRef personNodeRef = user.getValue();
|
|
|
|
Long currentUsage = currentUserUsages.get(userName);
|
|
if (currentUsage == null)
|
|
{
|
|
currentUsage = 0L;
|
|
}
|
|
|
|
batchUserUsages.add(new Pair<NodeRef, Long>(personNodeRef, currentUsage));
|
|
batchCount++;
|
|
totalCount++;
|
|
|
|
if ((batchCount == updateBatchSize) || (totalCount == users.size()))
|
|
{
|
|
int updated = updateUsages(batchUserUsages);
|
|
updateCount = updateCount + updated;
|
|
|
|
batchUserUsages.clear();
|
|
batchCount = 0;
|
|
}
|
|
}
|
|
|
|
return totalCount;
|
|
}
|
|
|
|
private int updateUsages(final List<Pair<NodeRef, Long>> userUsages)
|
|
{
|
|
RetryingTransactionCallback<Integer> updateCurrentUsages = new RetryingTransactionCallback<Integer>()
|
|
{
|
|
public Integer execute() throws Throwable
|
|
{
|
|
int updateCount = 0;
|
|
|
|
for (Pair<NodeRef, Long> userUsage : userUsages)
|
|
{
|
|
NodeRef personNodeRef = userUsage.getFirst();
|
|
Long currentUsage = userUsage.getSecond();
|
|
|
|
contentUsageImpl.setUserStoredUsage(personNodeRef, currentUsage);
|
|
usageService.deleteDeltas(personNodeRef);
|
|
|
|
updateCount++;
|
|
}
|
|
return updateCount;
|
|
}
|
|
};
|
|
|
|
// execute in READ-WRITE txn
|
|
return transactionService.getRetryingTransactionHelper().doInTransaction(updateCurrentUsages, false);
|
|
}
|
|
|
|
/**
|
|
* Collapse usages - note: for MT environment, will collapse all tenants
|
|
*/
|
|
private void collapseUsages()
|
|
{
|
|
if (logger.isDebugEnabled())
|
|
{
|
|
logger.debug("Collapse usages ...");
|
|
}
|
|
|
|
// Collapse usage deltas (if a person has initial usage set)
|
|
RetryingTransactionCallback<Set<NodeRef>> getUsageNodeRefs = new RetryingTransactionCallback<Set<NodeRef>>()
|
|
{
|
|
public Set<NodeRef> execute() throws Throwable
|
|
{
|
|
// Get distinct candidates
|
|
return usageService.getUsageDeltaNodes();
|
|
}
|
|
};
|
|
|
|
// execute in READ-ONLY txn
|
|
Set<NodeRef> usageNodeRefs = transactionService.getRetryingTransactionHelper().doInTransaction(getUsageNodeRefs, true);
|
|
|
|
int collapseCount = 0;
|
|
for (final NodeRef usageNodeRef : usageNodeRefs)
|
|
{
|
|
Boolean collapsed = TenantUtil.runAsSystemTenant(new TenantRunAsWork<Boolean>()
|
|
{
|
|
public Boolean doWork() throws Exception
|
|
{
|
|
return collapseUsage(usageNodeRef);
|
|
}
|
|
}, tenantService.getDomain(usageNodeRef.getStoreRef().getIdentifier()));
|
|
|
|
if (collapsed)
|
|
{
|
|
collapseCount++;
|
|
}
|
|
}
|
|
|
|
if (logger.isDebugEnabled())
|
|
{
|
|
logger.debug("... collapsed usages for " + collapseCount + " users");
|
|
}
|
|
}
|
|
|
|
private boolean collapseUsage(final NodeRef usageNodeRef)
|
|
{
|
|
RetryingTransactionCallback<Boolean> collapseUsages = new RetryingTransactionCallback<Boolean>()
|
|
{
|
|
public Boolean execute() throws Throwable
|
|
{
|
|
if (!nodeService.exists(usageNodeRef))
|
|
{
|
|
// Ignore
|
|
return false;
|
|
}
|
|
QName nodeType = nodeService.getType(usageNodeRef);
|
|
|
|
if (nodeType.equals(ContentModel.TYPE_PERSON))
|
|
{
|
|
NodeRef personNodeRef = usageNodeRef;
|
|
String userName = (String)nodeService.getProperty(personNodeRef, ContentModel.PROP_USERNAME);
|
|
|
|
long currentUsage = contentUsageImpl.getUserStoredUsage(personNodeRef);
|
|
if (currentUsage != -1)
|
|
{
|
|
// Collapse the usage deltas
|
|
// Calculate and remove deltas in one go to guard against deletion of
|
|
// deltas from another transaction that have not been included in the
|
|
// calculation
|
|
currentUsage = contentUsageImpl.getUserUsage(personNodeRef, true);
|
|
contentUsageImpl.setUserStoredUsage(personNodeRef, currentUsage);
|
|
|
|
if (logger.isTraceEnabled())
|
|
{
|
|
logger.trace("Collapsed usage: username=" + userName + ", usage=" + currentUsage);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
if (logger.isWarnEnabled())
|
|
{
|
|
logger.warn("Initial usage for user has not yet been calculated: " + userName);
|
|
}
|
|
}
|
|
}
|
|
return true;
|
|
}
|
|
};
|
|
|
|
// execute in READ-WRITE txn
|
|
return transactionService.getRetryingTransactionHelper().doInTransaction(collapseUsages, false);
|
|
}
|
|
}
|