4 Commits

Author	SHA1	Message	Date
Jan Vonka	6e5b951fe5	Merged BRANCHES/DEV/CONV_HEAD to HEAD: ... 48055: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 46833: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30799: THOR-172: Switch Tenant via public API 46836: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30853: Initial implementation of THOR-209. Webscript to get invitation/invitee status. 30855: More on THOR-209. Added siteTenantTitle to the webscript response. 30858: Apply generated cloud license 30859: Miscellaneous tidy-ups and refactorings, additional documentation and some webscript JSON additions. All as part of THOR-209. 30860: Miscellaneous doc improvements around the MT/Activiti workarounds. 30861: Removing unnecessary TenantUtil.runas in test code. 30863: THOR-204. Dev mode option to send invite/sign-up emails to spring-injected address. 30865: Temporarily disable subscriptions (followers) - pending ALF-9957 30866: THOR-175: Set and enforce file space quota for tenant 30868: Deleted obsolete/empty dir 30869: THOR-210: disable jobs that are not used/required (eg. AVM orphan reaper) 30870: THOR-209. Have fixed up issue with getting properties from completed workflow instances. Changed invitation to use pathInstanceId instead of taskId as the 'id' for these workflows. Now consistent with signup. Commented in the test that calls invitee-status.get 30871: THOR-209. Adding the inviteeIsActivated value to the webscript response. 30872: THOR-204. When emails are sent to the dev-only, spring-injected email address, the subject is now prefixed with the orig 30879: THOR-209. Making sure inviteeIsActivated is present for both in-flight and completed workflows. 30883: Resolve THOR-212 30895: THOR-172: Switch Tenant via public API 30896: THOR-209. Renaming some files so that they refer to invitation status rather than invitee status. Also added some documentation to make this dicstinction clearer. This is not a general purpose script to get the status of an invitee to a site. It is only for checking if a particular invitation workflow is complete and then getting some additional state data. 30897: THOR-175: Set and enforce file space quota for tenant 30900: Changing invitation-status webscript to auth=none; runas=Admin to support invitation flow of exteernal users. Part of THOR-209. 46845: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30967: Invite & signup improvemengts 30969: Share Activities 30976: Remove unreliable hosts from isReachableDomain test 48066: Merged DEV/CONV_V413 to DEV/CONV_HEAD (RECORD ONLY) 46857: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35731: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 31149: Initial Commit of Analytics Service 31150: Second draft of Analytics Service 31151: First cut of forms runtime supporting balloons on "blur" event as requested 31163: FORMS RUNTIME CHECKPOINT - before making the yellow mandatory only being displayed "on load and until focused" 31168: Refactored Analytics Service to be static 31170: Forms runtime as agreed in meeting 48067: Merged DEV/CONV_V413 to DEV/CONV_HEAD (RECORD ONLY) 46861: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35752: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 31220: THOR-49. Implementation of Reset Forgotten Password workflow. 31227: (RECORD ONLY) Fix merge error 31237: Add email validation to registration and invite services: 31239: THOR-219: Merge fix (re-disable Repo<->SOLR ssl config) 48069: Merged DEV/CONV_V413 to DEV/CONV_HEAD (RECORD ONLY) 46864: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35754: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 31240: MultiSelectAutoComplete now has configurable validation (& tooltips) 31241: Tenant site count usage/quota - exposed via Account API 31250: Made events enumerations 31251: Forgot to add AnalyticsEvent class to previous commit 31271: Attempt at fixing test dependencies and remove intermittent test 48070: Merged DEV/CONV_V413 to DEV/CONV_HEAD (NOTE! Added TenantXxxx classes and change in FormUIGet Will be removed in later revisions) 46911: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35757: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 31367: Merged BRANCHES/DEV/THOR1SURF to BRANCHES/DEV/THOR1: 30971: (RECORD ONLY) Creating SURF update branch for THOR1 30979: Commit initial Surf lib changes, Cloud classes and config overrides 30980: Add custom Cloud Surf authenticator, connector, remote store, user and user factory 31015: Renamed classes and references from Cloud to Tenant, custom page view, page view resolvers, URLModel + factory, URLHelper + factory 31076: Successful signup and page redirection 31091: Correct redirects from <application context> and <application context>/<tenant name> URLs 31098: Updated Surf libs 31132: Tenant specific implementation of PathStoreObjectPersister - Surf modelobject cache is now partitioned by the tenant name. 31133: Updated Surf libs and JavaDoc updates 31155: Initial code to handle attempted access to unauthorised tenants, secondary tenants added to TenantUser and page/activations filter rule 31210: Fixed 401 & 409 errors on remote GET/POST calls. Logout redirection support. 31229: Signup and invitiation completion updates 31242: Fixed up invitation, signup and tenant switching problems 31270: Fixed forms issue (can now create folders in doc lib) 31277: THOR-207. Invitation workflows now run in the inviter's tenant rather than the default tenant. This is checked in on a side-branch because the invitation email's accept/reject links include the tenantId and this tenant-aware Share URL is not yet supported on the THOR1 branch. I removed various TenantUtil.runAsWork calls which were causing the workflow to run on the default tenant rather then the current tenant. SendCloudInvitationEmailDelegate.createInvitationUrl now includes the tenantId in the Share URL it generates. Added new test cases at the Java API level. (Was formerly just at REST API level). 31286: (RECORD ONLY) Reset solrcore.properties files 31297: Fixed FlashUpload problem 31298: Fixed application context only login 31302: Fixed no user profile image url issue 31306: Updates to TenantUserFactory to defensively handle missing tenant data 31326: Repo switch tenant fixes: 31356: Resolve switch tenant niggles, with assistance from Erik: 48072: Merged DEV/CONV_V413 to DEV/CONV_HEAD 46934: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 46930: Adding extension point to forms runtime's FormUIGet for modifying submission url 46937: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35762: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 31408: Latest Spring Surf Libs (including SubComponentEvaluator param tokenization fix for THOR) 31409: Tenant usage/quota -> person count 31412: RM module cleanup & almost finsihed THOR-287 & THOR-288 31434: Fix Thor Share eclipse project 48073: CONV: Fix slingshot eclipse .classpath (add freemarker dep) 48074: Merged DEV/CONV_V413 to DEV/CONV_HEAD 46940: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 35766: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 31450: Additional DB query support in Repo/Core 31451: Tenant people count (internal + total) usage/quota 31453: Fix issue uploading small files which resulted in zero byte content 31456: Fix paging and total count (1000+) when listing accounts 31457: THOR-312. Addition of NETWORK_ADMINS group authority. 31461: THOR-314. I've overridden people.get with a cloud-specific template. This adds an isExternal JSON field to each person object. 31463: THOR-316 webscript filter on people.get for isInternal, isExternal. Overridden people.get.desc.xml and .js in the cloud module in order to add query param and add additional filtering. 31464: Base work for THOR-178 "F5: Existing user has forgotten password and needs to reset it" 31468: THOR-321 Create cloud:networkAdmin aspect. 31469: THOR-315 Return isNetworkAdmin in overridden people.get webscript. 31470: THOR-275: Add simple caching (for PropertyUniqueContext - used via AttributeService) 31471: THOR-318 people.get has new cloud query parameter 'networkAdmin' 31477: THOR-275: temp build fix 31479: THOR-324 Demote user from admin. New method on RegistrationService to demote a user from NetworkAdmin and tests. 31484: THOR-319. Fixing maxResults on people.get when internal/external/admin filtering is applied. This issue is not really resolved, but I've commented the code to illuminate the issue. 31485: THOR-275: fix build/test 31486: Working forgot password for THOR-178 (problem accessing the reset-password email link though) 31488: THOR-184: Disable user usages 31495: F156: Allow super system admin to login to any tenant 31496: Fix for personExists since hiding admin 31500: THOR-178 31501: THOR-329 Add a get-reset-password status webscript. 31503: Finished forgot password flow THOR-178 31507: THOR-328: add fixed adjustment (for people usage) 31508: Back out some of the hidden admin changes 31509: Revert mistaken check 31510: THOR-326 Changes to DAO layer to allow update of account type. 31513: Cloud Console updates 31514: Switch Network now uses tenants from the user object (instead of making a remote call) 31515: THOR-326 Changes to the REST & Service layer to allow update of account type. 48075: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: (effectively record-only - no changes) 46849: Merged PATCHES/V4.1.3 to DEV/CONV_V413 46779: ALF-17967: Error in org.alfresco.repo.workflow.WorkflowServiceImpl.getPooledTasks on StartUp. - Improved fix that uses the bridge table cache if it is available - Groups queried for pooled tasks still limited to 100 by default but can be configured with system.workflow.maxAuthoritiesForPooledTasks - Overall number of results can be cut off with system.workflow.maxPooledTasks 48076: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 46855: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 35706: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 31049: THOR-175: set and enforce per-tenant quota 31053: THOR-204: Add dev email mode option 48077: Merged DEV/CONV_V413 to DEV/CONV_HEAD (RECORD ONLY) 46944: Merge fallout - fix compile error. 48078: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: (already fixed - no changes) 46858: Fix compile error 48079: Merged DEV/CONV_V413 to DEV/CONV_HEAD 46953: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35767: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 31516: Hidden admin - attempt 2 31517: THOR-326. Update to REST-cient rcq file following 31515, which allows for account upgrade. 31518: THOR-326. DaveC asked me to move the paid business account type out of test config and into product config. 31519: After tenant switch the client side resources are more sensitive (new requires /res) which it didn't before. This solves the webpreview bug and some other minor stuff. 31520: THOR-175: Set and enforce file space quota for tenant 31522: THOR-330. Return Account Class data in Account REST API. 31523: THOR-330. Added new rsp data into desc.xml sample response. 31524: THOR-322: refactor tenant file usage/quota 31525: Skip activity post lookups that have exceptions 31526: Root webdav to st:sites for now (as per current beta.alfresco.com) 31528: THOR-323 & THOR-324 Promotion and demotion of users to/from NetworkAdmin. 31534: Account Summary now also displays name & summary 31535: Fix for THOR-320. Alfresco logo image in the various Cloud emails is broken. 31538: Account Summary now handles -2 & MultiSelectAutoComplete doesn't bounce when selecting first item 31540: Implementation of THOR-335 webscript for account-types.get 31541: Account Summary now displays date correctly 31542: Some paths to client side resources that were missing "/res" in the path 31547: Various label changes according to Kathryns docs & some new login/forgot password links in invite/signup forms 31555: Refactored Analytics Service to send JSON Analytics properties 31557: Some changes to cloud email templates following feedback from Kathryn, Erik. 31558: THOR-322: refactor tenant file usage/quota 31559: Turned 'sign up' email URLs into links rather than text. Yes, we'll make these buttons at some point but I just want them to be clickable for now. 48080: Merged DEV/CONV_V413 to DEV/CONV_HEAD (UI ONLY) 46954: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35771: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 31563: THOR-123: modules are no longer started for each tenant 31566: Update account class display names: 31567: THOR-123: temp' put back "applyToTenants=true" ... 31575: THOR-123: pre-req 31579: Fix issue where setting a preference meant that the person could no longer login: 31581: Addition of isNetworkAdmin, accountClassName and accountClassDisplayName to the metadata.get webscript, as required by Erik. 31582: Re-enabling RenditionServiceIntegrationTest which was failing. See THOR-106. 31584: THOR-123: pre-req 31585: THOR-347: disable test (pending this JIRA) - ChainingUserRegistrySynchronizerTest 31590: Account changes 31591: Upgrade accound button is now a mailto link pointing to sales@alfresco.com 31592: Added isNetworkAdmin 31593: Made sure tooltips are hidden when a dialog/overly is showed/hidden 31594: Disabling test again pending proper fix. THOR-106 31595: Reduce log level 31600: THOR-123: mark modules with "applyToTenants=false" 31601: Tooltips now dissapear when panel/overlays are destroyed (not only hidden) 48081: Merged DEV/CONV_V413 to DEV/CONV_HEAD 46955: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35779: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 31605: (RECORD ONLY) THOR-336. Fixing /res/themes URLs in activity emails. Fix /res/themes URL in newly located activity emails. 48088: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 46874: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 35709: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 31054: Fix for email templates (getDirectReadableChannel -> File does not exist) 46875: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 35711: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 31055: Re-enable activity feed notifications and subscriptions (followers) 48094: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 46894: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 35759: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 31386: Added some tenancy-awareness to ActionService. 31388: Addition of accountTypeId to metadata.get webscript. 31391: Fix for unreported issue that arises from the invitation workflow having moved from the system to the inviter tenant. 31392: Build fixes: Add pseudo-support for tenant switching in web script test f/w 31393: The final fix for the 'external user invites other external user' scenario. 31398: Tenant usage/quota - site count 31405: Build fix for failing ActionService tests. Compensating actions were not running on the correct tenant. 31407: Resolve THOR-248: Extensions is not deployed as part of the build 48095: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: (repo pre-merge) 46911: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35757: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 31367: Merged BRANCHES/DEV/THOR1SURF to BRANCHES/DEV/THOR1: 30971: (RECORD ONLY) Creating SURF update branch for THOR1 30979: Commit initial Surf lib changes, Cloud classes and config overrides 30980: Add custom Cloud Surf authenticator, connector, remote store, user and user factory 31015: Renamed classes and references from Cloud to Tenant, custom page view, page view resolvers, URLModel + factory, URLHelper + factory 31076: Successful signup and page redirection 31091: Correct redirects from <application context> and <application context>/<tenant name> URLs 31098: Updated Surf libs 31132: Tenant specific implementation of PathStoreObjectPersister - Surf modelobject cache is now partitioned by the tenant name. 31133: Updated Surf libs and JavaDoc updates 31155: Initial code to handle attempted access to unauthorised tenants, secondary tenants added to TenantUser and page/activations filter rule 31210: Fixed 401 & 409 errors on remote GET/POST calls. Logout redirection support. 31229: Signup and invitiation completion updates 31242: Fixed up invitation, signup and tenant switching problems 31270: Fixed forms issue (can now create folders in doc lib) 31277: THOR-207. Invitation workflows now run in the inviter's tenant rather than the default tenant. This is checked in on a side-branch because the invitation email's accept/reject links include the tenantId and this tenant-aware Share URL is not yet supported on the THOR1 branch. I removed various TenantUtil.runAsWork calls which were causing the workflow to run on the default tenant rather then the current tenant. SendCloudInvitationEmailDelegate.createInvitationUrl now includes the tenantId in the Share URL it generates. Added new test cases at the Java API level. (Was formerly just at REST API level). 31286: (RECORD ONLY) Reset solrcore.properties files 31297: Fixed FlashUpload problem 31298: Fixed application context only login 31302: Fixed no user profile image url issue 31306: Updates to TenantUserFactory to defensively handle missing tenant data 31326: Repo switch tenant fixes: 31356: Resolve switch tenant niggles, with assistance from Erik: 48109: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 46917: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts (not mergeinfo/slingshot/web-framework-commons) 35766: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 46918: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts (not mergeinfo/slingshot) 35767: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 46919: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 35768: Fix compile issue from merge 46921: Merge fallout - fix compile error. 46949: Test fallout 47126: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts 35954: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1: 35960: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1: 35961: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1: 35962: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1: 35963: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1: 35964: Spring Surf library refresh 35995: Fix merge issue 35999: Fix merge issue 47144: Fix merge/test failures (WCMTestSuite) 47539: CLOUD-1375 - fix WCM unit test fallout: SandboxServiceImplTest.testDeleteSandbox + WebProjectServiceImplTest.testDeleteWebProject 48111: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 46954: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35771: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 31563: THOR-123: modules are no longer started for each tenant 31566: Update account class display names: 31567: THOR-123: temp' put back "applyToTenants=true" ... 31575: THOR-123: pre-req 31579: Fix issue where setting a preference meant that the person could no longer login: 31581: Addition of isNetworkAdmin, accountClassName and accountClassDisplayName to the metadata.get webscript, as required by Erik. 31582: Re-enabling RenditionServiceIntegrationTest which was failing. See THOR-106. 31584: THOR-123: pre-req 31585: THOR-347: disable test (pending this JIRA) - ChainingUserRegistrySynchronizerTest 31590: Account changes 31591: Upgrade accound button is now a mailto link pointing to sales@alfresco.com 31592: Added isNetworkAdmin 31593: Made sure tooltips are hidden when a dialog/overly is showed/hidden 31594: Disabling test again pending proper fix. THOR-106 31595: Reduce log level 31600: THOR-123: mark modules with "applyToTenants=false" 31601: Tooltips now dissapear when panel/overlays are destroyed (not only hidden) 46956: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35782: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 31607: "Hide everything but the doclib" customizations - Dashlets adjustments * Addons RSS feed - hidden * Site Calendar - hidden * Content I'm editing - added <@markup> extension points so blog, wiki & forum sections are hidden by cloud extension module * Site Data List - hidden * Site Links - hidden * Wiki - hidden * User Calendar - hidden - URL rewrites * Forgot & reset password urls now prettyfied, not using "-default-/" - Duplicated slingshot presets to avoid future slingshot changes popping up in the cloud 31611: MT: fix ability to delete a disabled tenant 31612: THOR-339: Disable/enable logins for a network (account update) 31621: THOR-106. Taking a failing test class out again, pending fix. Hmmmm. 31623: THOR-357 - support shared CMIS dictionary 48112: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: (no changes) 46957: Test fallout 48113: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: (no changes - already pre-merged) 46911: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35757: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 31367: Merged BRANCHES/DEV/THOR1SURF to BRANCHES/DEV/THOR1: 30971: (RECORD ONLY) Creating SURF update branch for THOR1 30979: Commit initial Surf lib changes, Cloud classes and config overrides 30980: Add custom Cloud Surf authenticator, connector, remote store, user and user factory 31015: Renamed classes and references from Cloud to Tenant, custom page view, page view resolvers, URLModel + factory, URLHelper + factory 31076: Successful signup and page redirection 31091: Correct redirects from <application context> and <application context>/<tenant name> URLs 31098: Updated Surf libs 31132: Tenant specific implementation of PathStoreObjectPersister - Surf modelobject cache is now partitioned by the tenant name. 31133: Updated Surf libs and JavaDoc updates 31155: Initial code to handle attempted access to unauthorised tenants, secondary tenants added to TenantUser and page/activations filter rule 31210: Fixed 401 & 409 errors on remote GET/POST calls. Logout redirection support. 31229: Signup and invitiation completion updates 31242: Fixed up invitation, signup and tenant switching problems 31270: Fixed forms issue (can now create folders in doc lib) 31277: THOR-207. Invitation workflows now run in the inviter's tenant rather than the default tenant. This is checked in on a side-branch because the invitation email's accept/reject links include the tenantId and this tenant-aware Share URL is not yet supported on the THOR1 branch. I removed various TenantUtil.runAsWork calls which were causing the workflow to run on the default tenant rather then the current tenant. SendCloudInvitationEmailDelegate.createInvitationUrl now includes the tenantId in the Share URL it generates. Added new test cases at the Java API level. (Was formerly just at REST API level). 31286: (RECORD ONLY) Reset solrcore.properties files 31297: Fixed FlashUpload problem 31298: Fixed application context only login 31302: Fixed no user profile image url issue 31306: Updates to TenantUserFactory to defensively handle missing tenant data 31326: Repo switch tenant fixes: 31356: Resolve switch tenant niggles, with assistance from Erik: 48114: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 46962: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 40147: (RECORD ONLY) French: Cloud Translation update from Gloria (based on EN rev38372) 42709: (RECORD ONLY) FRENCH: Translation updates based on EN r42416 42871: (RECORD ONLY) GERMAN: Cloud Translation, based on r 42416 42879: (RECORD ONLY) SPANISH: Cloud Translation, based on r 42416 42890: (RECORD ONLY) ITALIAN: Cloud Translation, based on r 42416 43879: (RECORD ONLY) FRENCH: Translation updates based on EN r43703 43983: (RECORD ONLY) GERMAN: Translation updates based on EN r43703 43984: (RECORD ONLY) SPANISH: Translation updates based on EN r43703 43985: (RECORD ONLY) FRENCH: Translation updates based on EN r43703, includes file missing from previous commit. 43986: (RECORD ONLY) ITALIAN: Translation updates based on EN r43703. 43987: (RECORD ONLY) JAPANESE: Translation updates based on EN r43703. 44031: (RECORD ONLY) JAPANESE: Translation updates based on EN r43703. Corrects file missed from previous commit. 44032: (RECORD ONLY) GERMAN: Translation updates based on EN r43703. Corrects missing line break. 45329: (RECORD ONLY) FRENCH: Cloud translation updates based on EN r45266 45330: (RECORD ONLY) GERMAN: Cloud translation updates based on EN r45266 45332: (RECORD ONLY) SPANISH: Cloud translation updates based on EN r45266 45333: (RECORD ONLY) JAPANESE: Cloud translation updates based on EN r45266 45427: (RECORD ONLY) SPANISH: Cloud 1 translation updates based on EN r45266 45718: (RECORD ONLY) ITALIAN: Translation updates based on EN r45266 (missed from previous bundle import) 45838: (RECORD ONLY) FRENCH: Cloud Translation update based on EN r45266 45966: (RECORD ONLY) Translation update to fix CLOUD-1270 in FR and ES 46365: (RECORD ONLY) ALL LANG: Translation updates based on EN r46289 46366: (RECORD ONLY) ALL LANG: Updates copyright year to 2013 46377: (RECORD ONLY) ALL LANG: Adds strings missing from previous commit. 47192: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: (record-only - WebDAV mostly resolved as part of 36117 merge) 36408: (RECORD ONLY) Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 36404: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1: 36060: THOR-1373: Proxied WebDAV must generate correct URLs when URL-rewriting is used. 36083: THOR-1373: Proxied WebDAV must generate correct URLs when URL-rewriting is used. 47369: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 41180: (RECORD ONLY) Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1: 40482: ALF-13998: 'No items' error is highlighted in red, even that is not sever error. - ALF-15453: Incorrect manage permissions working for a file/folder Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1: 40486: ALF-15453: Incorrect manage permissions working for a file/folder 47377: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 41048: (RECORD ONLY) Merged DEV/V4.1-BUG-FIX to DEV/CLOUD1 40382: Fix for ALF-15491 SOLR is generating queries for lucene style cross-language support 40632: Fix for ALF-15487 Search not working for queries containing 3-digit versions Fix for ALF-15356 SOLR doesn't support searching by cm:name of file with underscore and dots 40662: Eclipse classpath fixes 41032: Fix for ALF-15753 Infinite loop during Solr ACL indexing when ACL Changeset batch is empty 47393: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: Merged DEV/CLOUD1-BUG-FIX into DEV/CLOUD1: 41674: ALF-15967: Using START_USER_ID_ instead of "initiator" property to query process instances started by user X to prevent extra joins + removed unused constants 41650: Fixed CLOUD-667: Merged fix for ALF-14438 into CLOUD1-BUG-FIX + using START_USER_ID_ instead of custom "initiator" property to query initiator to boost performance even more 47412: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 42252: (RECORD ONLY) Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1 42233: Fix for ALF-16164 Cloud monitoring of SOLR is CPU intensive due to its repeated use of the SOLR stats page and related CLOUD-760 Cloud monitoring of SOLR is CPU intensive due to its repeated use of the SOLR stats page 47429: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 42200: Merged DEV/CLOUD1-BUG-FIX into DEV/CLOUD1: Record-only (r41650 and r41674) 47433: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: CLOUD-808: Fix for timer deploying MT-process when shared is required caused test to fail 47435: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: Merged BRANCHES/DEV/CLOUD1_CORS to BRANCHES/DEV/CLOUD1: 43100: Update the salesforce amp to include the CORS Filter 43101: Update web.xml to enable to the CORS Filter with filter-mapping 43117: Add updated amp with removed CORS Filter. CORS Filter is now available in 3rd-party libs 43118: [CLOUD-724] Add CORS Filter jar to 3rd-party libs 43119: [CLOUD-724] Add missing jar java-property-utils-1.6.jar to 3rd-party libs 47485: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 44203: (RECORD ONLY) Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1 44200: Probable fix for ALF-16895 SOLR: Cannot find files after restart and reindex solr 44276: (RECORD ONLY) Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1 44275: Part 2 for ALF-16895 SOLR: Cannot find files after restart and reindex solr - fix initial cache state to cope with duplicate leaf/aux doc entries. 44314: (RECORD ONLY) Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1 44312: Part 3 for ALF-16895 SOLR: Cannot find files after restart and reindex solr - fix incremental cache state to cope with duplicate leaf/aux doc entries. 47523: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 44573: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/CLOUD1: 44572: Clean up of unused files. 44576: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1_CORS to BRANCHES/DEV/CLOUD1: 44518: [CLOUD-955] Change CORS filter-mapping to use servelet instead of url 44691: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1_CORS to BRANCHES/DEV/CLOUD1: 44688: (RECORD ONLY) Rebase CLOUD1_CORS with CLOUD1 44689: [CLOUD-1072] Add public api url to CORS filter mapping. Move CORS filter mapping to live above the publicapi filter mappings. OPTIONS calls made to the CORS filter should be evaluated before Layer7 authentication. 47548: Merged DEV/CLOUD2 to DEV/CONV_V413 46931: Overriding form runtime's submissionUrl using extesnion point in FormUIGet 46984: Overriding entire sent-invites.js (instead of modifying the core slingshot code) with a copy of the core code modified to work with the cloud invite apis. 46986: Overriding help pages config in cloud-config.xml (rather than modifying the core files!) 47553: Merged DEV/CLOUD2 to DEV/CONV_V413 47421: Overriding entire sent-invites.get ftl & properties (instead of modifying the core slingshot code) with a copy of the core code modified to fit the cloud requirements. 47442: Add web overlay for share + tune embedded librairies 47455: Add dependency on jetty-webapp to compile the tests 48115: CONV: Fix cache defs (propertyUniqueContextCache & siteNodeRefCache) 48117: Merged DEV/CONV_V413 to DEV/CONV_HEAD 46959: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35790: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 31624: Resolve THOR-302: transformation-client-1.0.0-SNAPSHOT.jar not in alfresco/WEB-INF/lib: 31632: More reliable test, hopefully 31644: Fix unreported issue in aws-context.xml.sample (not well-formed XML) 31645: Customized invite links to use "cloud dialog" instead of "invite page" for the following components: 31662: New Analytics events and tests 31663: New Analytics events and tests 31678: Addition of isExternal data to site membership webscripts. 48118: Merged DEV/CONV_V413 to DEV/CONV_HEAD 46960: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35791: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 31684: THOR-367 - #1 Within Site - Remove all page components other than site dashboard, document library and members - Remove customize site 31685: New lightweight webscript to retrieve user/network metadata about the currently authenticated user in the current tenant. 31693: THOR-365: Private site cannot be access (since surf-config is not imported) - causes: Could not resolve view with name ... 31695: THOR-367 - #2 Document Library - remove Create Content... menu - remove actions: manage aspects, change type, publish, manage rules (for folders) - document-details page: remove publishing history panel 31697: For reference only: update description of cmis/test webscript 48119: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 46972: Fix test fallout (re: THOR-293) 48120: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: (repo pre-merge)§ 47001: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35798: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 31805: Adding utility method to our CollectionUtils class that I need as part of pending invitations work (THOR-373). 31809: Parameterized signup url & email 31812: THOR-373 Pending invitations. 31814: Made changes to way aid is captured ready for allowing events to override aid if needed 31820: Mapping of network admin to system admin part 1: 35801:Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 31829: Fixed THOR-352 "Incorrect validation of emails on "Forgot Password" page" 31830: (RECORD ONLY) Exclude ExportDbTest; issues with MySQL 31831: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1: 31784: Fix up unit test. 31833: Email validation now allows 7 character long top level domain (so we can do tests with example) 31834: New form colors for invalid & mandatory fields 31837: THOR-327 - remove bootstrapped guest / guest@<tenant> 31838: THOR-327 - remove bootstrapped guest / guest@<tenant> 31844: Added missing headers to Java files. 31845: Mapping of network admin to system admin part 2: 31846: Addition of very basic test script for the Script API of AnalyticsService. 35803: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 31853: Forms refactor first cut - for review 31855: THOR-387. Analytics event for user activation is sent. 31858: THOR-387. Fixing a corner-case bug in SendAnalyticsRequest. 31863: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1: 31841: Build Fix 31868: THOR-361: Fix /service/index 31881: THOR-387. Adding analytics event for site invitation. 31882: THOR-387. Fixing analytics event for site invitation. 31883: THOR-66: disable some of the /alfresco (web.xml) servlet mappings 31884: THOR-387. Analytic event callouts for site invitation response. 31899: Revert solrcore.properties checkin 31900: THOR-249: override edition interceptor 31901: Fix for THOR-396. Spelling mistake on signup screen. 31902: Resolve THOR-251: Update the Help URLs for Cloud 31904: Resolve THOR-403: -system- tenant not found logged from server 31918: Create site form tweak (manual form.validate() call required since javascript is changing a another fields value) 31919: Logout page refactoring 31925: Create site now resets form before show using forms-runtime's new "reset" method 31926: Disable flash upload 31927: THOR-363: increase initial file quota 31930: Updated SimpleDB service so you can set the SimpleDB domain to record events too 47003: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35804: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 31933: THOR-387. Analytics. Added analytic call for account registration (the initial signup, not the activation, which was added previously). This adds a new mandatory parameter to the signup webscript: "source" as well as various new optional parameters. The same parameter is now mandatory on the RegistrationService. Impacts on test code. Changed the rest-client .rcq file to show new required parameter. Changed AnalyticsProperties to take the Object wrappers for primitives as these are optional and so we need to be able to pass null. Added a new (hidden) field to Erik's signup Share page to send an appropriate value for the signup. 31939: THOR-404: disable JBPM 31943: THOR-387. Analytics. I've overridden upload.post.js to add analytics data for file uploads. 31946: Fixed THOR-385 "Account summary file usage bar does not display for any theme other than the default theme" 31947: Fixed THOR-308 "Invite user drop-down works incorrectly" 31948: Resolve THOR-384: It is impossible to create user administrator@'domain': 31949: Follow-up fix for case sensitive user names 31953: THOR-311: It is impossible to create workflow when 'Send Email Notifications' flag is checked: 31959: Removing change-password override since user shall be able to change his password 31961: Fix tests after recent username/email address changes 31966: Grey Theme 31979: Dropping Analytics logging level down to 'warn' from 'debug'. 31982: Fixed THOR-419 "UI edits required" 31983: Fixed THOR-419 "UI edits required" part 2 32003: THOR-422. Spurious error logging during signup/registration (not activation). This was because the analytics event action code assumed the user exists, which they don't do at registration, of course. 32004: Resolve undefined undefined seen in invite signup dialog 32006: Restricted tentant component now displays dialog instead of gray page 32007: THOR-300: fix AWS config 32013: Fixed THOR-353 "No validation for the fields on the "Reset Password" page" 32014: Fixed THOR-423 "Removing the yellow "Welcome to your dashboard, firstname, lastname" causes error" 32018: Made sure new cloud theme (greyTheme) also has new theme border & bgs (making the account quota being displayed) 48122: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 47007: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 35817: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32250: (RECORD ONLY) Merged /HEAD to BRANCHES/DEV/THOR1: (ok'ed with DC/DG) 31750: Solr: Fix owner Id cache 31751: Fix for ALF-11104: add authenticated user to authorisations list in PermissionService + fix inconsistency in AuthorityService 31760: Correct Fix for SOLR owner ID cache 32172: Fixes for: ALF-11521 Protect SOLR running against the wrong Alfresco DB ALF-11602 Solr Core Tracker - does not need to re-init CMIS dictionary (when there are no model changes) ALF-11621 SOLR old versions of tracked models are not getting deleted when models are updated 32234: Fix for ALF-11568 SOLR indexing is ignoring properties that are indexed but not tokenised and not stored - was WCMQS navigation is broken 32256: THOR-488. Tidy up account types. 32258: Login analytics event. 32260: Reduce logging on startup for enabled tenants (see also THOR-475 / THOR-81) 32262: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1: 32139: Fix for ALF-11599 - Section ''Others are Editing'' shows documents that should not be present 48123: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: (repo pre-merge) 47038: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35811: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32019: Merged rev 32016 from THORSURF1 32021: THOR-428: Fix activity feed email notifications (to contain network/tenant ctx) 32024: Fixed "THOR-424 'Upload File' button is disabled in FF for the second and futher uploads" 32026: Restricted tenant page now has link back to users home dashboard so he doesn't feel stuck 32029: Fixed GetRequest test to ignore uid's that aren't emails (like admin) 32030: THOR-310: Override getCacheKey method from AbstractCachedViewResolver to ensure that each tenant gets their own cached copy of each Share page (this ensures that nested Component config gets processed for all tenants) 32031: Resolve THOR-417 Workflow notification emails do not take into account tenant in their urls back to Share 47039: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35812: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32041: Label changes according to Kathryn's "UI Text_scenario 5.docx" 32052: THOR-405: Fix 'contentstore.deleted' to be on S3 (albeit co-mingled) 32058: Removed unnecessary borders from profile pages 32065: Fix build issue where cloud share war was not being cleaned before build 32066: Fix those pesky solrcore properties 32071: THOR-461: fix following email notification (to contain network/tenant ctx) 32076: Fix to disable error on unit tests 32077: Added logging to NullPointerException fix 35814: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32103: Finally! A fix for THOR-193. :) 32119: Fix for setting theme as network admin 32120: Improved text on upgrade account page 32124: Refactored CloudInvitationService Integration Tests to allow for easier expansion and then I expanded. 32130: Fix for THOR-457. Already have an account email template needs updating/fixing. 32135: THOR-464 Fix "ThumbnailRegistry init does not scale with # of tenants" 32140: Apply Beta logos and adjust about dialog for cloud 35815: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32144: THOR-438: Latest Spring Surf libs (fix relative URI login redirect problem caused by un-encoded URI) 32147: THOR-475 - improvement(s) to trim time to create tenant 32148: THOR-475 - improvement(s) to trim time to create tenant 32154: GreyTheme updates 32157: THOR-430: Forgot password dialog: UI text not what was suggested 32159: GreyTheme updates 32174: THOR-454 - User can find content stored in Company Home/Data Dictionary via Advanced Search 32176: Signup page now cloud.alfresco.com 32179: THOR-475 - improvement(s) to trim time to create tenant 32184: Remove jargon from workflow names and descriptions 32185: Pesky solrcore.properties 35816: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32188: THOR-478: Updated Spring Surf libs - fixed relative URL redirect after login including support for @ symbol in URL 32195: Fix for THOR-379. Pending invitations UI show invitee emails as links to profile pages - even for non-existent users. Added yet more data to the CloudInvitation REST API: inviteeIsMember which tells caller whether the invitee is already a member of the tenant in which the invitation is running. Returning this flag through the Java API & REST API Tweaks to the Share JS so that it renders a <span> for invitees who are not members and an <a> for those who are. 32198: Replace workflow text with task related text 32202: Resolve THOR-481: Moving or copying content always shows error popup but always succeeds 32204: Build fix 32238: THOR-290: Configurable google-analytics tracking code script insertion 32239: Tidying up some UI text. Missing apostrophes, invitation instead of invite. 32241: THOR-471: Added GetSatisfaction feedback widget 35818: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32266: Addition of createSite analytics recording. 32268: THOR-505: Disable (turnoff autostart) of unused subsystems 32270: Adding in some theme colors that dissapeared (will make the quota bar get displayed again) 32272: Resolve THOR-354: (None) displayed for network administrators 32273: THOR-499: New Relic monitoring updates 32279: Implemented THOR-508 "Accept terms & conditions checkbox & link on the complete profile pages" 32280: Fixed THOR-474 "Password Strength indicator does not conform with other leading website password indicators" 48125: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: (repo pre-merge) 47053: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32377: (RECORD ONLY) THOR-565: fix unfortunate type that affects activity permissions (for connected users - either via site membership or followers) 32378: CollectionUtils method for collection intersection. Should be merged to HEAD. 32383: THOR-572: remove unused JBPM servlets (deployprocess, workflowdefinitionimage) 32384: Fixed THOR-549 "Google Analytics Installed but not seeing any events raised on GA reports" 32389: Fix for THOR-567 "userprofile broken" 32401: THOR-525 - fix MT-specific issue (deleting site does not clear associated activities within tenant) 32409: THOR-66: disable WebDAVServlet (does not need to load-on-startup) + a few others 32414: Theme updates from linton 32423: Fixed THOR-661 "Limit number of simultaneous connections in drag n drop upload" 32424: THOR-81: support for signup/activate scaling tests 48126: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 47058: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts (not mergeinfo/slingshot/web-framework-commons/3rd-party) 35827: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 35828: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 35829: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 35830: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 35831: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 35832: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 48129: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 47067: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts 35844: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 35845: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 35846: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 35847: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 35848: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 35849: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 35850: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 35853: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 35854: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 35855: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 47069: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts 35860: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 33057: Refactored Slingshot overrides so that they are now in the Thor-Share private module. This has been done to reduce conflict issues when merging back into HEAD. The overrides are now in the correct locations (the only files that could not be moved to the private module are urlrewrite.xml and surf.xml). 35870: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: (part 1 - repository project) 33022: THOR-662: Email templates should load/resolve (initially) from classpath 47071: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts 35877: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 33090: ALF-10826: hidden aspect 33091: THOR-416: fix surf-config folder (appears where it shouldn't) 33093: Sweep through email templates. 47072: Fix merge error (FeedCleaner) 47073: Fix merge error (WorkflowTestSuite) 47074: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts 35881: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 33104: Tweak to invitation email template 33112: Refactored impl of THOR-694 so that content limit of 25Mb is on by default in THOR for both local FS and S3-based FS. Changed ContentLimitProvider bean to take String limit, rather than long - to allow empty string value on core Alfresco. Set the limit to the empty string in core Alfresco, which means 'no limit'. Applied the limit always. Set the limit to 25Mb in Thor/alfresco-global.properties Fixed a minor bug in error reporting due to previous exception renaming. 47076: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts 35885: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 33134: THOR-874: Updated Surf libs Fixes ArrayIndexOutOfBoundsException caused by multiple threads apply i18n extensions to a WebScript 33135: Missing WebScripts sources JAR from r33134 33153: Resolve THOR-551: Password Hashes Need Review 33154: Update to latest email blacklist 33155: Fixed THOR-534 "Login Box shows scroll bars" 33156: Build fix for tests failing due to recent password changes 33157: Build fix for updated email blacklist 33172: THOR-776: Re-implement Share override as guided by Erik 33173: THOR-831: Text in Someone 35886: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 33174: Latest SpringSurf libs - improved RemoteClient reused of connections per request thread. 33176: THOR-833: Search: clicking on All Sites returns no results 48131: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 47098: (RECORD ONLY) Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35895: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 34105: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1: 33267: (RECORD ONLY) Created branch THOR1_SPRINTS (from THOR1 r33255) 33269: Snapshot of simple redeploy shell script (for AWS mini-dev/test env) 33272: JMeter test script 34106: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1: 33313: THOR-928: Added caching for i18n bundles provided by extensibility modules (latest Surf libs, r980) 48133: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 47097: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts 35906: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 35907: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 47099: Fix merge/compile error. 47103: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts 35913: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1: 35914: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1: 35915: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1: 35916: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1: 35917: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1: 47111: Fix merge error 47115: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts 35930: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1: 35933: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1: 35934: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1: 47132: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts 36053: 1st pass at upgrading to latest Spring Surf 36059: Fix CloudInvitationService tests for cloud1 47133: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 48135: Merged DEV/CONV_V413 to DEV/CONV_HEAD 46977: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35792: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 31724: Can't compare pages using page.url.uri anymore since that doesn't include the tentant, now skips that part of the url and uses page.id instead. 31733: Add account info to user network web script 31736: Refactored RegistrationServiceImpl.promote... so that it uses the presence of cloud:personExternal aspect to prevent promotion of external users rather than account-based data. 35794: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 31744: Account relates to url & various Share features now hidden in cloud 31746: 1/5 for THOR-341 "F147: Share features are disabled for external network member" 35796:Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 31756: THOR-265: Currently the first user to sign up to a dmain becomes the domain admin, and can view the full admin console. Is this going to change? 31771: Added stub for SimpleDBAnalytics Service 31772: Final interfaces and integration with SimpleDB for Analytics 31774: Modified landing_time key for MixPanel 31776: Implemented #3 for THOR-341 "F147: Share features are disabled for external network member" 31777: Resolve test classpath since introduction of new thor libs 31779: Implemented #3 for THOR-341 "F147: Share features are disabled for external network member" part 2 31781: Resolve issue getting access to account settings when network admin of paid business account 31783: Implemented #2 for THOR-341 "F147: Share features are disabled for external network member" 31794: Minor changes after review with DavidC and NeilM 31797: Collaboration title improvement: Now hiding the html elements used to build the menu until the menu is created so ui doesn't bump and look ugly. 31799: Part #6 of THOR-367 "F60: Remove Share features not required for Cloud" - 6) Document Selectors - root is Sites folder 31801: Removed ugly "extra" borders around some of the input fields in the user profile form 31802: Fixed part #7 of THOR-367 "F60: Remove Share features not required for Cloud" - 7) Edit Profile - remove edit email from edit profile form 31804: Fixed part #5 of THOR-367 "F60: Remove Share features not required for Cloud" - 5) Move... / Copy... dialog - remove repository - remove my user home 48136: Merged DEV/CONV_V413 to DEV/CONV_HEAD 47001: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35798: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 31805: Adding utility method to our CollectionUtils class that I need as part of pending invitations work (THOR-373). 31809: Parameterized signup url & email 31812: THOR-373 Pending invitations. 31814: Made changes to way aid is captured ready for allowing events to override aid if needed 31820: Mapping of network admin to system admin part 1: 35801:Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 31829: Fixed THOR-352 "Incorrect validation of emails on "Forgot Password" page" 31830: (RECORD ONLY) Exclude ExportDbTest; issues with MySQL 31831: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1: 31784: Fix up unit test. 31833: Email validation now allows 7 character long top level domain (so we can do tests with example) 31834: New form colors for invalid & mandatory fields 31837: THOR-327 - remove bootstrapped guest / guest@<tenant> 31838: THOR-327 - remove bootstrapped guest / guest@<tenant> 31844: Added missing headers to Java files. 31845: Mapping of network admin to system admin part 2: 31846: Addition of very basic test script for the Script API of AnalyticsService. 35803: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 31853: Forms refactor first cut - for review 31855: THOR-387. Analytics event for user activation is sent. 31858: THOR-387. Fixing a corner-case bug in SendAnalyticsRequest. 31863: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1: 31841: Build Fix 31868: THOR-361: Fix /service/index 31881: THOR-387. Adding analytics event for site invitation. 31882: THOR-387. Fixing analytics event for site invitation. 31883: THOR-66: disable some of the /alfresco (web.xml) servlet mappings 31884: THOR-387. Analytic event callouts for site invitation response. 31899: Revert solrcore.properties checkin 31900: THOR-249: override edition interceptor 31901: Fix for THOR-396. Spelling mistake on signup screen. 31902: Resolve THOR-251: Update the Help URLs for Cloud 31904: Resolve THOR-403: -system- tenant not found logged from server 31918: Create site form tweak (manual form.validate() call required since javascript is changing a another fields value) 31919: Logout page refactoring 31925: Create site now resets form before show using forms-runtime's new "reset" method 31926: Disable flash upload 31927: THOR-363: increase initial file quota 31930: Updated SimpleDB service so you can set the SimpleDB domain to record events too 48137: Merged DEV/CONV_V413 to DEV/CONV_HEAD 47003: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35804: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 31933: THOR-387. Analytics. Added analytic call for account registration (the initial signup, not the activation, which was added previously). This adds a new mandatory parameter to the signup webscript: "source" as well as various new optional parameters. The same parameter is now mandatory on the RegistrationService. Impacts on test code. Changed the rest-client .rcq file to show new required parameter. Changed AnalyticsProperties to take the Object wrappers for primitives as these are optional and so we need to be able to pass null. Added a new (hidden) field to Erik's signup Share page to send an appropriate value for the signup. 31939: THOR-404: disable JBPM 31943: THOR-387. Analytics. I've overridden upload.post.js to add analytics data for file uploads. 31946: Fixed THOR-385 "Account summary file usage bar does not display for any theme other than the default theme" 31947: Fixed THOR-308 "Invite user drop-down works incorrectly" 31948: Resolve THOR-384: It is impossible to create user administrator@'domain': 31949: Follow-up fix for case sensitive user names 31953: THOR-311: It is impossible to create workflow when 'Send Email Notifications' flag is checked: 31959: Removing change-password override since user shall be able to change his password 31961: Fix tests after recent username/email address changes 31966: Grey Theme 31979: Dropping Analytics logging level down to 'warn' from 'debug'. 31982: Fixed THOR-419 "UI edits required" 31983: Fixed THOR-419 "UI edits required" part 2 32003: THOR-422. Spurious error logging during signup/registration (not activation). This was because the analytics event action code assumed the user exists, which they don't do at registration, of course. 32004: Resolve undefined undefined seen in invite signup dialog 32006: Restricted tentant component now displays dialog instead of gray page 32007: THOR-300: fix AWS config 32013: Fixed THOR-353 "No validation for the fields on the "Reset Password" page" 32014: Fixed THOR-423 "Removing the yellow "Welcome to your dashboard, firstname, lastname" causes error" 32018: Made sure new cloud theme (greyTheme) also has new theme border & bgs (making the account quota being displayed) 48147: CONV: fix merge issue - remove duplicate prop def (contentLimitProvider) 48148: Merged DEV/CONV_V413 to DEV/CONV_HEAD merge fix for r48072 48149: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 47111: Fix merge error 47115: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts 35930: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1: 35933: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1: 35934: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1: 47132: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts 36053: 1st pass at upgrading to latest Spring Surf 36059: Fix CloudInvitationService tests for cloud1 47133: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 48150: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: (effectively RECORD ONLY - no changes) 47173: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 36232: MT - fix pop of tenant ctx (to match push) 48154: Merged DEV/CONV_V413 to DEV/CONV_HEAD 47038: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35811: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32019: Merged rev 32016 from THORSURF1 32021: THOR-428: Fix activity feed email notifications (to contain network/tenant ctx) 32024: Fixed "THOR-424 'Upload File' button is disabled in FF for the second and futher uploads" 32026: Restricted tenant page now has link back to users home dashboard so he doesn't feel stuck 32029: Fixed GetRequest test to ignore uid's that aren't emails (like admin) 32030: THOR-310: Override getCacheKey method from AbstractCachedViewResolver to ensure that each tenant gets their own cached copy of each Share page (this ensures that nested Component config gets processed for all tenants) 32031: Resolve THOR-417 Workflow notification emails do not take into account tenant in their urls back to Share 47039: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35812: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32041: Label changes according to Kathryn's "UI Text_scenario 5.docx" 32052: THOR-405: Fix 'contentstore.deleted' to be on S3 (albeit co-mingled) 32058: Removed unnecessary borders from profile pages 32065: Fix build issue where cloud share war was not being cleaned before build 32066: Fix those pesky solrcore properties 32071: THOR-461: fix following email notification (to contain network/tenant ctx) 32076: Fix to disable error on unit tests 32077: Added logging to NullPointerException fix 35814: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32103: Finally! A fix for THOR-193. :) 32119: Fix for setting theme as network admin 32120: Improved text on upgrade account page 32124: Refactored CloudInvitationService Integration Tests to allow for easier expansion and then I expanded. 32130: Fix for THOR-457. Already have an account email template needs updating/fixing. 32135: THOR-464 Fix "ThumbnailRegistry init does not scale with # of tenants" 32140: Apply Beta logos and adjust about dialog for cloud 35815: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32144: THOR-438: Latest Spring Surf libs (fix relative URI login redirect problem caused by un-encoded URI) 32147: THOR-475 - improvement(s) to trim time to create tenant 32148: THOR-475 - improvement(s) to trim time to create tenant 32154: GreyTheme updates 32157: THOR-430: Forgot password dialog: UI text not what was suggested 32159: GreyTheme updates 32174: THOR-454 - User can find content stored in Company Home/Data Dictionary via Advanced Search 32176: Signup page now cloud.alfresco.com 32179: THOR-475 - improvement(s) to trim time to create tenant 32184: Remove jargon from workflow names and descriptions 32185: Pesky solrcore.properties 35816: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32188: THOR-478: Updated Spring Surf libs - fixed relative URL redirect after login including support for @ symbol in URL 32195: Fix for THOR-379. Pending invitations UI show invitee emails as links to profile pages - even for non-existent users. Added yet more data to the CloudInvitation REST API: inviteeIsMember which tells caller whether the invitee is already a member of the tenant in which the invitation is running. Returning this flag through the Java API & REST API Tweaks to the Share JS so that it renders a <span> for invitees who are not members and an <a> for those who are. 32198: Replace workflow text with task related text 32202: Resolve THOR-481: Moving or copying content always shows error popup but always succeeds 32204: Build fix 32238: THOR-290: Configurable google-analytics tracking code script insertion 32239: Tidying up some UI text. Missing apostrophes, invitation instead of invite. 32241: THOR-471: Added GetSatisfaction feedback widget 35818: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32266: Addition of createSite analytics recording. 32268: THOR-505: Disable (turnoff autostart) of unused subsystems 32270: Adding in some theme colors that dissapeared (will make the quota bar get displayed again) 32272: Resolve THOR-354: (None) displayed for network administrators 32273: THOR-499: New Relic monitoring updates 32279: Implemented THOR-508 "Accept terms & conditions checkbox & link on the complete profile pages" 32280: Fixed THOR-474 "Password Strength indicator does not conform with other leading website password indicators" 47053: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32377: (RECORD ONLY) THOR-565: fix unfortunate type that affects activity permissions (for connected users - either via site membership or followers) 32378: CollectionUtils method for collection intersection. Should be merged to HEAD. 32383: THOR-572: remove unused JBPM servlets (deployprocess, workflowdefinitionimage) 32384: Fixed THOR-549 "Google Analytics Installed but not seeing any events raised on GA reports" 32389: Fix for THOR-567 "userprofile broken" 32401: THOR-525 - fix MT-specific issue (deleting site does not clear associated activities within tenant) 32409: THOR-66: disable WebDAVServlet (does not need to load-on-startup) + a few others 32414: Theme updates from linton 32423: Fixed THOR-661 "Limit number of simultaneous connections in drag n drop upload" 32424: THOR-81: support for signup/activate scaling tests 48157: Merged DEV/CONV_V413 to DEV/CONV_HEAD Fixing merge issue from r48135 48158: Merged DEV/CONV_V413 to DEV/CONV_HEAD (RECORD ONLY) 47046: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32281: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1 (ok'd with DC): 32242: ALF-11664 Moderated sites should use site.public.group (from SysAdminParams) for setting the group with general access, as Public sites already do, rather than hard coding the EVERYONE group 32283: Added "guest" to the list of blocked usernames, thereby showing failure to register guest@tenant.com, rather than allowing it and failing to activate the account later. 32285: THOR-505: Disable (turnoff autostart) of unused subsystems 32286: Fix NPE in AnalyticsProperties when empty json provided 32287: THOR-508 "Accept terms & conditions checkbox & link on the complete profile pages" 32289: Miscellaneous changes to account types & classes. 32290: Change "recent activities" email notification interval from hourly to daily 32292: Resolve THOR-516: Check all email template URLs point to cloud.alfresco.com not www.alfresco.me 32293: THOR-517. Insert Signup Analytics Event into Site Invite process. 32305: Fixed THOR-306 "Invite user autocomplete not working correctly" 32308: THOR-529: Red "No items" in doc lib when adding 1st document into a x-network site (WebDAV error in log) 32309: Fixed THOR-306 "Invite user autocomplete not working correctly" 32314: THOR-520: Change workflow in tooltip text to task 32318: THOR-532: Improve auto-generate of home site shortname (in case of clash) 32339: Updated analytics events to include parameter 32342: Additional debug logging as part of THOR-544. 32376: THOR-574: Accept invite while logged in displays 'you've declined...' message 48163: Merge CONV_V413 to CONV_HEAD 46713: Set Maven version in POM files to 4.1.3-CONV-SNAPSHOT 46741: Deploy SPP jar file (aka VTI) into Maven repository as well 47440 RECORD ONLY: Declare dependency on Surf 1.2.0-SNAPSHOT in Maven poms 47450 RECORD ONLY: Bring Chemistry OpenCMIS libs back into the wars 47579 RECORD ONLY: Switch Chemistry OpenCMIS version to a custom 0.8.0-20120706 47646: POM dependency: use 4.2-min version of netcdf rather than 4.2, which embeds an old commons-codec 47683: Create a jar holding the sharepoint config, for use with CLOUD2 47740 RECORD ONLY: Merge V4.1-BUG-FIX to CONV_V413 46360: ALF-17697: Create proper source jars, to deploy to Maven repository 47964: Filter servlet-api from dependencies 48166: Merged DEV/CONV_V413 to DEV/CONV_HEAD 47064: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35827: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32446: Fixed THOR-658 "File Upload Limits" 32455: Tweak logging (S3 exists check -> debug) 32462: Move tenant enabled check from low level services to web script entry point: 32467: THOR-666: Improve startTenants - do not need to re-update enable/disable flag on startup 32474: JMeter test script updates (#3) 32485: Fix to ensure the HTML upload POSTed response can return html content type. 32486: JMeter test script updates (#4) 47084: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35828: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32491: Fix account signup since change to tenant authentication (which is now slightly stricter: 32518: Fix for mixed cased usernames login problems 32523: Add db pool validate query 32546: Minor - remove unecessary call to getObjectDetails (to avoid calling twice for non-existent object) 32556: Fixed tenant url edge cases and followed up a fix started by DavidC for signup logins 32560: Fixed tenant url edge cases and followed up a fix started by DavidC for signup logins - part 2 35829: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32571: Resolve THOR-653: Uploads consume disk space in /var/cache/tomcat6/ 32572: Fixed THOR-563 "UI: CSS / layout issue on profile page" 35830:Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32577: THOR-682: refactor Tenant/S3 routing content store (it is now self-routing based on S3 content url) 32580: Added missing init-method attributes to key CachingContentStore components. 32583: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1: 32321: ALF-11700: Possible to generate feed entries with malformed NodeRefs 32593: THOR-688 Analytics to support various URLs not just "website". Addition of optional sourceUrl paramater to account-signup analytics. 32603: Added file size limitation and hooked in html upload to the form validations w backgrounds and tooltips. 32629: THOR-199: Fix create user (activate) sometimes has to retry - due to: "Deadlock ... alfresco.permissions.insert_AclMember-Inline" 32654: THOR-692: Disable (auto) home folder creation 35831: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32661: Latest SpringSurf libs: 35832: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32666: Build: add cloud/cloud-share to ant clean-modules/clean 32672: Ensure that application context is available for TenantAlfrescoAuthenticator in TenantUserFactory 32675: THOR-536: Added TenantPageTypeViewResolver 32686: JMeter test script updates (#5) 32700: THOR-689: DevTest: 2 uploads failed (out of 10000) - missing retry ? 35844:Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32702: JMeter test script update 32718: THOR-691: Feed Notifier sends emails on startup of Server 32756: Fixed THOR-556 "Can't view members in a public Site" 35845: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: (+ resolved conflicts w/ 4.0.1) 32032: THOR-370: Add tenant-switching to /cmisatom (OpenCMIS-based v4.x impl => AlfrescoCmisService) 35846: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32759: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1 32757: Fix for ALF-9365 32761: Changed restricted tenant to appear as page not found 32763: THOR-792: Ensure that failed login returns to login page 32769: Updated networks icon 32770: Authentication updates: Unauthenticated requests to inaccessible tenants (either that don't exist or not authorized to access) will be prompted for authentication and if credentials are valid the "Page Not Found" page will be shown, but authentication will have completed and user can return to their home dashboard via link provided 32785: Fix for THOR-798 32789: THOR-796: reduce startup time (1000s of tenants) 35847: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32790: THOR-480: Spring Surf lib updates - ensure that i18n properties extensions degrade the specificity of the locale to ensure that no message keys are shown (unless the message genuinely doesn't exist) 32798: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1: (fix for THOR-721) 32245: Unit tests for ALF-10343, with the problematic parts commented out pending a fix 32251: ALF-11664 site.public.group (via SysAdminParams.SitePublicGroup) should be used when updating site visibilities, as it is for creating sites 35848: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32805: Latest SpringSurf libs: 47085: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35849: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32807: Fixed invalid network switching URLs 32808: Updated Spring Surf libs to that revert invalid changes to relativeUri determining method 32837: Set Alfresco connector reconnect timeout to zero 32856: Fix for THOR-801. Trying to access the archive as 'admin' gives error. 35850: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 32858: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1: (pull in some pre-reqs for cleaner merge of ALF-10826) 31864: ALF-10686 - Original modification date is lost when files are copied into Alfresco via CIFS 31934: Update stale File State Cache. 32068: ALF-10941 - CIFS Open file from excel 32097: build fix. 32131: ALF-10902 - No friendly notification occurs when Editor or Collaborator tries to delete content 32132: Open read-only for attributes only. 32182: ALF-10963 Cannot overwrite files on CIFS share with Notepad++ 32876: THOR-784: Fix 'Accounts API loading is very slow' (get page of accounts) 32939: THOR-480: Latest Spring Surf libs - fix i18n extensibility problems. 32948: THOR-859: Performance: Disable rules service 32953: THOR-863: Performance: loadUserByUsername -> isAdminAuthority 32959: (RECORD ONLY) Merged HEAD to DEV/THOR1 32958: (record-only) Merged Dev/THOR1 to HEAD 32945: Fix for ALF-12122 Some CMIS queries with SOLR are not returning correct results 35853: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 33024: Fixed THOR-670 "Incorrect window title for 'Task History' page" 33027: Missing merge info for r32694 35854: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 33033: Latest SpringSurf libs: 35855: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 33038: Minor: do not bootstrap web script readme x2 into Data Dictionary (when creating tenant) 33039: Resolve THOR-839: Following webscripts doesn't set Content-Type response header 33040: Fixed THOR-817 "Issues with "invite user" email autocomplete field" 33041: Fixed THOR-789 "Mix of languages" 33042: Resolved THOR-849: Upload issue ? - Failed to get content ... (No such file or directory) ... x22 48169: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 47176: (RECORD ONLY) Fix Eclipse .classpath to match Spring Surf libs 48170: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 48168: CONV: Fix NPE in get people CQ 48183: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 47184: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 35989: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1: 34153: Minor: THOR-5: MT-aware immutable singletons (spp/vti) 34161: Prevent session timeout redirect problem resulting from clicking user link in activities feed 34183: Part one of THOR-1129. 34185: Part two of THOR-1129. The Thor-specific parts. 34199: Fix for THOR-106 a failing test case that was switched off. 34202: THOR-106 addendum. Editing build.xml to put the test class back in to the build. 34211: BM: sync ThorTest (additional coverage) 34308: Merged HEAD to THOR1_SPRINTS 34250: Fixed THOR-1137 "Make Spring Surf enable-auto-deploy-modules by default" 34540: Share UI - copyright should be 2012 (related to THOR-1015) 35286: Resolve THOR-1242: Update Beta Logo 48187: Merged DEV/CONV_V413 to DEV/CONV_HEAD 47086: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35860: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 33057: Refactored Slingshot overrides so that they are now in the Thor-Share private module. This has been done to reduce conflict issues when merging back into HEAD. The overrides are now in the correct locations (the only files that could not be moved to the private module are urlrewrite.xml and surf.xml). 35870: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: (part 1 - repository project) 33022: THOR-662: Email templates should load/resolve (initially) from classpath 35877: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 33090: ALF-10826: hidden aspect 33091: THOR-416: fix surf-config folder (appears where it shouldn't) 33093: Sweep through email templates. 35881: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 33104: Tweak to invitation email template 33112: Refactored impl of THOR-694 so that content limit of 25Mb is on by default in THOR for both local FS and S3-based FS. Changed ContentLimitProvider bean to take String limit, rather than long - to allow empty string value on core Alfresco. Set the limit to the empty string in core Alfresco, which means 'no limit'. Applied the limit always. Set the limit to 25Mb in Thor/alfresco-global.properties Fixed a minor bug in error reporting due to previous exception renaming. 35885: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 33134: THOR-874: Updated Surf libs Fixes ArrayIndexOutOfBoundsException caused by multiple threads apply i18n extensions to a WebScript 33135: Missing WebScripts sources JAR from r33134 33153: Resolve THOR-551: Password Hashes Need Review 33154: Update to latest email blacklist 33155: Fixed THOR-534 "Login Box shows scroll bars" 33156: Build fix for tests failing due to recent password changes 33157: Build fix for updated email blacklist 33172: THOR-776: Re-implement Share override as guided by Erik 33173: THOR-831: Text in Someone 47096: Fix merge compile issue 47100: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35906: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 33054: THOR-796: slow startup time (on QA env with ~ 10k tenants) 33055: Implementation of THOR-694. File size upload limit within ContentStore. 35907: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 33213: THOR-833: wip 33214: Allow for workflows which may have a reference to a repo based email template 33228: Added extension points for links in user profile toolbar 33230: Added extension points for links in user profile toolbar part 2 33232: Fixed THOR-907 "Remove Share functionality which allows access to people profiles outside of your site memberships" 33233: Fixed THOR-907 "Remove Share functionality which allows access to people profiles outside of your site memberships" part 2 33234: Extension points in members bar now ft the pattern of user profile toolbar. 33236: Fixed THOR-907 "Remove Share functionality which allows access to people profiles outside of your site memberships" part 3 33241: THOR-908 - wip 33243: THOR-908 / THOR-64 - wip 33253: Fixed THOR-907 "Remove Share functionality which allows access to people profiles outside of your site memberships" part 4 33255: Fixed THOR-907 Remove Share functionality which allows access to people profiles outside of your site memberships part 5 47169: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35913: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1: 33410: Merged form THOR1_SHARE_PERFORMANCE to THOR1_SPRINTS 33111 Branch for testing out new Spring Surf client side resource improvements 33291 Share client side resource handling to avoid stale client side cache part 1 - New spring surf libs with <@script> & <@link> directives that adds the checksum of the file to avoid client cache beoming stale - Refactored most old <script> to become <@script> - Refactored most old <link> to become <@link> - Removed old <@link> macro from alfresco-temaplte.ftl, resources.get.html.ftl & corm-console.ftl (now using the directive instead) - i18n messages now imported by <@generateMessages> directive to avoid stale cache - Added calendar, cookie, resize & uploader yui modues to yui common to decrease the number of .js files requested - Added new YUI module filter that adds "-min.js?v=<YAHOO.VERSION>" to stop a yui resources being stale after a yui upgrade 33307 Share client side resource handling to avoid stale client side cache part 2 - Made TinyMCE avoid becoming stale after a new release 33334 Share client side resource handling to avoid stale client side cache part 2 - New surf libs with <@checksumResource> directive used by ie6.css, ie7.css, ipad.css & tiny_mce.js to avoid manual change of version number in script import 33368 Share client side resource handling to avoid stale client side cache part 3 - Avoiding re-load of .js, .css & images (referenced from a .css) when switching tenants (note images that have been referenced using <img src=""> will get reloaded) 33405 CSS import duplication fix 35914: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1: 33417: Thor JMeter test script tweaks 33420: THOR-1000: Solr tracking: NodeContentGet should not create (empty) temp file if there is no transformer (eg. for image node) 33434: The <#if> statement & <script> element for google analytics wasn't in sync, causing a closing </script> element always being printed. 33440: Latest SpringSurf libs - performance and thread safety improvements. 33458: ThorTest-preReg (JMeter) test update 33460: Latest SpringSurf libs: 33466: THOR-1002: Updated enterprise overlay 33480: Latest SpringSurf libs - Surf performance improvements from Thor high load profiling in Jmeter/Jprofiler 35915: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1: 33493: THOR-979: HTML5 upload support 33505: THOR-983: Preload images, JS and CSS for basic dashboards, document library and document details (from login page) 33518: THOR-979: HTML5 upload tweaks (upload doesn't start automatically when updating to give opportunity to set version type and add comment 33520: THOR-900: Modified header.get.html.ftl to ensure that user name is URL encoded (so that the "@" symbol in the user name becomes "%40" to ensure that timeout redirects work) 33527: THOR-1027: Header Alfresco image now links back to application context and about dialog is now linked from footer Alfresco image 33551: THOR-1007: Fixed upload hang on FireFox when uploading folders 35916: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1: 33556: Merged BRANCHES/DEV/THOR1_INVITATION to BRANCHES/DEV/THOR1_SPRINTS: 33386: Branch for Invitation enhancements 33474: THOR-1006. Part 1. Services-level changes to support invitation enhancements. 33475: THOR-1006. Documentation on the desc.xml. 33476: THOR-1006. Commenting out some unfinished code to avoid any unwanted side-effects. Still to do: get the authentication check working and ensure no unexpected side-effects. 33483: THOR-1006. Completion of basic services changes to support 'accept invitation on alternate email'. Note! The authentication of the alternative email's password is NOT YET IMPLEMENTED due to a repo dependency. This MUST be implemented before merge to THOR1_SPRINTS. I'll create a new JIRA. 33511: Fix for THOR-1017. 33525: THOR-1017. Slight improvement to desc.xml doc. HTTP status codes in response. 33529: Fixed THOR-980 & THOR-1024 & THOR-1025 33553: Fixed THOR-980 "F14: Allow users to login using existing email address if invite is sent to wrong email address and they already have an account" 33571: Fixed HTML5 uploader to work with profile avatar image upload 33585: Thor JMeter test script tweaks 33596: THOR-1035: Enabled HTML5 uploader for application logo upload 33598: THOR-1031: Reduced HTML5 checks for uploader to ensure that it works for Safari on Mac 33603: THOR-1039: Updated UX for HTML5 upload when 0kb files are selected 33606: THOR-1037: Updated variable titles for HTML5/DND upload dialog to support update 35917: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1: 33615: Latest SpringSurf libs - performance and concurrency improvements 33690: Resolve THOR-1003: Forgotten Password email is case sensitive 33692: Merged BRANCHES/DEV/THOR1_PRIVACY to BRANCHES/DEV/THOR1_SPRINTS: 33488: Reversed merge revisions related to THOR-907 - 33232, 33233, 33236 - hand tweaks related to 33253, 33255. 33492: Removed unused import of com.sun... class 33497: Fixes and improvements to user profile page loading - reducing remote calls required and refactoring link build code. Fixed a issue with displaying the Following link on other users profile page. 33506: THOR-1020: people visibility 33509: Reduced remote calls required to build user profile page. 33519: THOR-985, THOR-986 33542: THOR-989 - Added extensibility hooks to People Finder component 33558: THOR-1014: Profile visibility -1st cut for THOR-993 (/api/people) 33564: THOR-1014: Profile visibility - THOR-992 (/webframework/content/metadata?user=) 33569: Implemented THOR-985, THOR-986, THOR-989 33572: Performance improvement to remove the need for a share->repo call for each page or ajax request to resolve account class name. 33579: THOR-1020: cloud people API (re: visibility) 33599: Share Thor performance improvements - removed the need to call /internal/cloud/current-user inside various common components - now using cached data in user object. 33608: THOR-1014: Profile visibility - fix PeopleRestApiTest 33625: THOR-1020: people visibility 33632: THOR-984 - Hide Account Settings screen from External Users. 33636: THOR-1014: profile visibility 33670: THOR-1020/THOR-1014: people/profile visibility 33674: THOR-1047: Privacy REST - subscriptions (follower) API 33688: THOR-1047: Privacy REST - subscriptions (follower) API 33696: Fix for THOR-785 "F272: API call to get the number of accounts" 33698: THOR-1033: Fixed free accounts showing console settings (updated Spring Surf libs) 33700: Committed other Surf updates missing from r33698 (WebScript JARs) to ensure that manifest meta-data isn't misleading 33705: THOR-1052: VersionService: ensureVersioningEnabled 33706: Merged BRANCHES/DEV/THOR1_UPLOADLIMITS to BRANCHES/DEV/THOR1_SPRINTS: 33510: (RECORD ONLY) File Upload Limit enhancements 33656: Account Quotas / File Upload limit pt1 33686: Modified dnd-upload and html-upload WebScripts to retrieve maximum upload size from internal service (and refactored core WebScripts to support override) 33710: THOR-1020: Privacy (People REST API) 33713: THOR-1020: Privacy (People REST API) 33718: THOR-1020: Privacy (People REST API) 33722: Thor JMeter test script 33742: Latest SpringSurf libs - performance improvements and concurrency fixes 35930: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1: 33764: THOR-1021: F287: Account Types can define file size upload limits for the Account which are set when the account is upgraded/downgraded between Account types 33767: Tweaked HTML5 upload dialog so that error messages are handled gracefully 33785: Resolve THOR-457: Already have an account email template needs updating/fixing 33786: Fix to issue spotted by DaveC where switching networks would not correctly refresh user metadata. Also fixed minor encoding issues in related Networks WebScripts. 33792: Merged BRANCHES/DEV/THOR1_PUBLIC_EMAIL to BRANCHES/DEV/THOR1_SPRINTS: 33490: Initial feature branch 33535: Fix to unreported issue whereby DirectoryService.getDefaultAccount returns the home account. 33547: THOR-176. Invite new user (public domain email address) into site. Part 1. 33592: Further work for THOR-176. user metadata REST API now does not return homeTenant if the user is from a public email domain. This conditional removal of the 'homeTenant' JSON property is needed by Share. 33593: THOR-176. Refactor of UserTenant to use AccountClass to check isPublicEmailDomain. 33620: Fix for NPE in UserTenant.isPublicDomainUser(). The admin user has no account-type. 33627: Share updates for public e-mail 33797: THOR-176: consolidate public domain check 33802: Remove temporary option to use double @ login (as per THOR-156) - no longer required 33804: Removed locale from the cachekey used for tenant page view cache. 33810: Merged BRANCHES/DEV/THOR1_BLACKLIST to BRANCHES/DEV/THOR1_SPRINTS: 33709: Blacklist CRUD: THOR-974, THOR-975, THOR-976, THOR-977, THOR-978 (Part 1 - DAO layer) 33711: Blacklist CRUD: THOR-974, THOR-975, THOR-976, THOR-977, THOR-978 (Part 2 - Foundation Service layer) 33747: THOR-974, THOR-975, THOR-976, THOR-977 and THOR-978. REST API for CRUD of blacklisted email domains. 33809: THOR-974, THOR-975, THOR-976, THOR-977, THOR-978 Adding REST-client rcq files for blacklist CRUD. 35933: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1: 33814: Merged BRANCHES/DEV/THOR1_ACCOUNT_SETTINGS to BRANCHES/DEV/THOR1_SPRINTS: 33411: (RECORD ONLY) Thor account settings branch from Thor1_Sprints. 33607: Initial checkin for THOR-972, THOR-971, THOR-410 33621: THOR-972, THOR-971, THOR-410 - added missing files 33639: THOR-971, THOR-972, THOR-410: - add paging properties to the list people web script - default network admin to true and internal to null 33641: Second cut of THOR-964 "F173: Network admin can list users of network (with paging support)" 33642: THOR-972, THOR-971, THOR-410 - changed paging properties in list users 33652: Implemented THOR-964,THOR-965,THOR-965,THOR-966,THOR-967,THOR-968,THOR-969 33653: User action click event now stopped so it doesn't modify the url 33671: THOR-971: webscript implementation 33687: Making premote/demote available for network-admins and not only for admins. check for network admin role already exists in the service code. 33694: THOR-971: - Added analytics handling - Fixed invite share url to include tenant 33699: THOR-963 "F17: Network admin can add a one or more internal users to their network" 33702: THOR-971: - changed the bulk create url - changed the activate email template 33703: Make sure Java-based network admin scripts set the response status to 401 if the authenticated user is not a network admin 33737: THOR-410: - more unit tests - tidy up 33744: (RECORD ONLY) Merged BRANCHES/DEV/THOR1_USER_MANAGEMENT to BRANCHES/DEV/THOR1_ACCOUNT_SETTINGS: 33417: Thor JMeter test script tweaks 33420: THOR-1000: Solr tracking: NodeContentGet should not create (empty) temp file if there is no transformer (eg. for image node) 33434: The <#if> statement & <script> element for google analytics wasn't in sync, causing a closing </script> element always being printed. 33440: Latest SpringSurf libs - performance and thread safety improvements. 33458: ThorTest-preReg (JMeter) test update 33460: Latest SpringSurf libs: 33466: THOR-1002: Updated enterprise overlay 33480: Latest SpringSurf libs - Surf performance improvements from Thor high load profiling in Jmeter/Jprofiler 33493: THOR-979: HTML5 upload support 33505: THOR-983: Preload images, JS and CSS for basic dashboards, document library and document details (from login page) 33518: THOR-979: HTML5 upload tweaks (upload doesn't start automatically when updating to give opportunity to set version type and add comment 33520: THOR-900: Modified header.get.html.ftl to ensure that user name is URL encoded (so that the "@" symbol in the user name becomes "%40" to ensure that timeout redirects work) 33527: THOR-1027: Header Alfresco image now links back to application context and about dialog is now linked from footer Alfresco image 33551: THOR-1007: Fixed upload hang on FireFox when uploading folders 33556: Merged BRANCHES/DEV/THOR1_INVITATION to BRANCHES/DEV/THOR1_SPRINTS: 33386: Branch for Invitation enhancements 33474: THOR-1006. Part 1. Services-level changes to support invitation enhancements. 33475: THOR-1006. Documentation on the desc.xml. 33476: THOR-1006. Commenting out some unfinished code to avoid any unwanted side-effects. Still to do: get the authentication check working and ensure no unexpected side-effects. 33483: THOR-1006. Completion of basic services changes to support 'accept invitation on alternate email'. Note! The authentication of the alternative email's password is NOT YET IMPLEMENTED due to a repo dependency. This MUST be implemented before merge to THOR1_SPRINTS. I'll create a new JIRA. 33511: Fix for THOR-1017. 33525: THOR-1017. Slight improvement to desc.xml doc. HTTP status codes in response. 33529: Fixed THOR-980 & THOR-1024 & THOR-1025 33553: Fixed THOR-980 "F14: Allow users to login using existing email address if invite is sent to wrong email address and they already have an account" 33559: Initial feature branch 33669: First cut of THOR-994 and THOR-995 - remove internal and external user from network. 33685: Making remove-external-user.delete.desc.xml accept a domainName templateArg as well as the existing accountId. 33716: THOR-994 and THOR-995. Remove user from network. Addressing some review comments from DaveC. Refactoring mostly. Also added protection on RegistrationService.deleteUser() to prevent deletion of last NetworkAdmin in network. 33745: Adding NetworkdAdmin protection to the remove-external-user.delete webscript. 33752: Additional fixes for THOR-966 & THOR-969 * Improved messages/dialogs: demoting yourself, demoting last admin, removing last admin * New User Button align layout fix as requested by Imran 33754: Documentation for the remove-external-user.delete webscript. 33756: THOR-410: - unit test tidy 33766: Fix for signup link when already logged in as another user 33769: THOR-963 "F17: Network admin can add a one or more internal users to their network" 33770: Ensure a 403 is returned (rather than 500) when attempt is made to remove last NetworkAdmin in a tenant. 33774: Added padding on top of name for the Manage Users screen as requested by ux 33790: Promote/demote icons from Imran 33815: Fix issue with removal of public email user from last invited network 33817: THOR-1060: Activities Feed - perf tweak to halve the number of generated feed entries 33819: THOR-1060: fix ActivitiesFeed subsystem (re-)name 33820: Merged BRANCHES/DEV/THOR1_ACCOUNT_SETTINGS to BRANCHES/DEV/THOR1_SPRINTS: 33756: THOR-410: - unit test tidy 33766: Fix for signup link when already logged in as another user 33769: THOR-963 "F17: Network admin can add a one or more internal users to their network" 33770: Ensure a 403 is returned (rather than 500) when attempt is made to remove last NetworkAdmin in a tenant. 33774: Added padding on top of name for the Manage Users screen as requested by ux 33790: Promote/demote icons from Imran 33825: People REST API 35934: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1: 33850: (RECORD ONLY) Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS 33843: Fix for ALF-12775 33866: Fix for THOR-1071 33878: Fix the build 33881: THOR-1069: Ensure that invitations can be accepted when a user is already logged in 33882: Resolve THOR-1082: Possible to register email address with invalid domain (according to our tenant id rules) 33883: Resolve THOR-1070: External user's avatar not displayed on the People Finder page. 33884: Fix solrcore.properties 33899: Resolve THOR-1077: Incorrect free space displayed when uploading files which exceeds quota 33922: Resolve THOR-1079: Incorrect behavior of the button "Save and close" to "Send Document (s) For Review" tasks. 33933: Resolve THOR-1088: Hide Account Id from Account Summary Screen 33934: Resolve THOR-1089: Review Account Quota text on Account Summary Screen 33942: Fix for THOR-1094. InvalidDomains FTL couldn't handle NULL notes field. This shouldn't arise in the field as we don't put NULL-valued notes in the DB, but it might matter in some test envs. 33949: Resolve THOR-1093: Incorrect notification title displayed when trying to invite user from another network from Manage Users page 33953: Fix for THOR issue where public users should not be able to see Following and Following Me tabs in their own profile. 35954: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1: 34140: THOR-1098: Prevent resources being requested twice (latest Surf libs) 34153: Minor: THOR-5: MT-aware immutable singletons (spp/vti) 34161: Prevent session timeout redirect problem resulting from clicking user link in activities feed 35960: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1: 34224: Fix for THOR-789 - Mix of languages. The original bug was not never actually completely fixed, added some additional handling in SpringSurf WebScripts View to not override the locale from the original request parameters if it has already been set elsewhere. 34301: (RECORD ONLY) Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS: 34279: NodeDAO: re-parent "lost & found" orphan child nodes (see ALF-12358 & ALF-13066 / SYS-301) 34343: (RECORD ONLY) Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS: 34338: NodeDAO: re-parent "lost & found" orphan child nodes (see ALF-12358 & ALF-13066 / SYS-301) - test fix 34341: NodeDAO: re-parent "lost & found" orphan child nodes (see ALF-12358 & ALF-13066 / SYS-301) - test fix 34388: THOR-953/SYS-294: add db.pool.evict.num.tests option (=> numTestsPerEvictionRun) 34729: (RECORD ONLY) Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS: 31867: Merged DEV/TEMPORARY to V3.4-BUG-FIX 31400: ALF-10764: PDF vs 1.5 cause crash jvm - PDFRenderer library has been updated from 2009-09-27 to 0.9.1 version to support PDF documents of 1.5 version 32061: ALF-11376 Requesting PDFBox 1.6 be included in future service pack release. Upgrading pdfbox,fontbox,jempbox from 1.5.0 to 1.6.0 34731: THOR-1261: repo cluster fix (propertyUniqueContextCache) 34734: THOR-1261: repo cluster fix (propertyUniqueContextCache) 34435: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS: 34434: ALF-13066: Fix for intermittent failure (testConcurrentLinkToDeletedNode) 35961: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1: 34558: THOR-1216: tenant context mismatch (Solr tracking) 34606: THOR-1216: tenant context mismatch 34441: (RECORD ONLY) Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS 33285: Fix for ALF-12336 - Share loses performance if noncachableObjectTypes are defined (page & component) 34489: Fix to remove hazelcast subdir from build.xml for -exploded build - Thor specific merge issue. 34722: Added hazelcast-cloud jar to allow AWS Hazelcast config options for Share clustering on Thor 34848: THOR - specific version of ClusterAwarePathStoreObjectPersister. 34931: Thor specific lookup of Share custom app context files to include the custom-slingshot-cloud-context and custom-slingshot-application-context only and in the order we want. Also updated Hazelcast example config to include AWS by default 35962: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1: 34940: THOR-1288: Extra diagnostics for tracking leaked tenant context on thread: 34187: Updated Surf libs (down grades duplicate dependency warnings to debug info) 34410: THOR-1169: Latest Spring Surf libs to fix missing template CSS probs 34418: (RECORD ONLY) Merged BRANCHES/DEV/BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/BRANCHES/DEV/THOR1_SPRINTS 34316: Method signature change to ConfigService fixes for RepoXMLConfigService 34471: (RECORD ONLY) Merged BRANCHES/V4.0 to BRANCHES/DEV/THOR1_SPRINTS 34468: Fix for ALF-13172 Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V4.0 34467: Fix for ALF-13237 - Change dashboard Layout is not working correctly, original layout is still used after saving changes. 34891: Added missing jug-asl-2.0.0.jar to slingshot deps for Thor 35963: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1: 35087: Minor: remove NOOP (introduced in r30776) 35123: THOR-1288: update leak logger 35124: THOR-1288: prod login failure when using cloud console for (bulk) signups 35132: THOR-1288: build/test fix 35133: THOR-1288: build/test fix 35395: Resolve THOR-1340: Alberto.Vazquez@w.illi.am cannot sign up 35964: Spring Surf library refresh 35995: Fix merge issue 35999: Fix merge issue 36053: 1st pass at upgrading to latest Spring Surf 36059: Fix CloudInvitationService tests for cloud1 48191: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 47185: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: MT - enable ability to get call context if overriding of beginCall/afterCall - eg. for cloud use-case (x-network switching) 48192: Temporarily disable generation of installers, to speed up build git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@48255 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2013-03-18 09:52:08 +00:00
Dave Ward	fb887123ea	Merged V4.1-BUG-FIX to HEAD ... 44918: Fix for ALF-14850 Opencmis getTotalNumItems doesn't return the correct result when setting MaxItemsPerPage - correctly report the max number of items 44927: ALF-16254 ("Leave Site" behaviour for group based site membership) 44931: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (RECORD ONLY) 44930: Merged V3.4 (3.4.12) to V3.4-BUG-FIX 44929: Merged V4.1-BUG-FIX to V3.4 (3.4.12) 42118: ALF-15878 ALF-15741: generate doc and src zip for web-framework-commons and jlan 44939: Remove svn:mergeinfo 44985: Merged DEV to V4.1-BUG-FIX 44981: ALF-17085 : DB2: unexpected index found in database Correcting db structure after upgrade from 3.4. Optional statement was added. 44988: Merged DEV to V4.1-BUG-FIX 44937: ALF-16756: WebDAV: An error occurs on drag&drop content from local machine to alfresco when inbound move rule configured. Add check for content data length during determining existence of content on node. 44989: Merged PATCHES/V4.1.3 to V4.1-BUG-FIX 44984: Merged DEV to PATCHES/V4.1.3 44983: ALF-12425: Can't launch activiti workflow console from Share when external / ntlm / kerberos authentication is used. In activiti-admin.get.js generated an absolute URL . Use url.server + url.context instead of /alfresco. 44986: (RECORD ONLY) Merged DEV to PATCHES/V4.1.3 44937: ALF-16756: WebDAV: An error occurs on drag&drop content from local machine to alfresco when inbound move rule configured. Add check for content data length during determining existence of content on node. 44987: ALF-17331 60k Site Performance: Admin Console | Groups | Browse Groups (include sys groups): Pagination doesn't work correctly 45008: ALF-17300 - ConcurrentModificationException 45011: BDE-103 - Timezone test fail when not run from the UK (at least from Maven build) 45054: Merged from DEV to V4.1-BUG-FIX ALF-13312 - If the license does not exist, please specify in the error message 45055: Fix for ALF-13921. Description of the web project is not updated. 45063: Slight improvement to test code as part of ALF-15413. Changing test code to get companyHome from repositoryHelper rather than Lucene query, which doesn't work on a dev box with ill-configured SOLR/Lucene. 45170: Merged PATCHES\V4.1.3 to BRANCHES\DEV\V4.1-BUG-FIX 45161: Fix for ALF-17341 CLONE - Hyphen not handled correctly in cmis-alfresco search for Aspects/types : " no viable alternative at character 'a' " 45192: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.1-BUG-FIX: 45187: (RECORD ONLY) Fix for ALF-16997 Discrepancies between standalone and cluster ehcache config 45312: Merged V4.0.2 (4.0.2.23-24) to V4.1-BUG-FIX (4.1.4) 44912: MNT-248 - 4.0.2.22 HOT FIX: Extra version is created saving changes in OpenOffice document via CIFS 44964: Merged DEV to PATCHES/V4.0.2 44963: MNT-263 : CLONE - CIFS: Image document version history lost after saving content in Preview on Mac Mountain Lion Fix for "Preview" shuffle scenario on Mac Mountain Lion. New ScenarioDoubleRenameShuffle scenario was added for pattern .*\.sb(-[A-Za-z0-9]*){2}. Unit test for correspomding scenario was added. 45037: Remove PID check from byte range lock list checks. MNT-266. 45286: MNT-277 - CIFS: Input/output error during saving ods file via OpenOffice. (Linux Specific) 45319: NORWEGIAN: Translation updates. 45338: Merged V4.1.3 (4.1.3) to V4.1-BUG-FIX (4.1.4) 45186: ALF-17303: fix naming mismatch when deploying alfresco-enterprise-repository artifactId to Maven 45247: Part 2: Better fix for ALF-16359 Fix SOLR logging in production and other environments 45265: ALF-17337 Read time out when browsing trash can 45298: ALF-17389: Merged: CLOUD1 to V4.1.3 45082: CLOUD-1139: Cloud feednotifier running on 2 boxes - FeedNotifierImpl modified to use reliable lock refresh - Added additional debug logging to AbstractUserNotifier just in case we have to prove duplicate entries are still being processed - For full debug logging set log4j.logger.org.alfresco.repo.activities.feed.FeedNotifier=debug - Happy New Year! 45355: ALF-17389: Fix build error 45357: Fix for ALF-17430 CMIS valid relationships do not check the source and target are valid CMIS docs or folders. 45363: Merge CLOUD1-BUG-FIX to V4.1-BUG-FIX 42576 : Job Locking of PostLookup 45367: Build fix corrections to merge 45363 45381: ALF-17389 : Implementing Activities Job Lock. 45416: Merged V4.1.3 (4.1.3) to V4.1-BUG-FIX (4.1.4) RECORD ONLY 45415: ALF-17389: Merged V4.1-BUG-FIX to V4.1.3 (4.1.3) << Previous merge was to the wrong branch >> 45363: Merge CLOUD1-BUG-FIX to V4.1-BUG-FIX 42576 : Job Locking of PostLookup 45367: Build fix corrections to merge 45363 45381: ALF-17389 : Implementing Activities Job Lock. 45424: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2013_01_05 to BRANCHES/DEV/V4.1-BUG-FIX: 45235: ALF-15604 : Oracle: schema reference files missing nvarchar2 column sizes 45425: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2013_01_05 to BRANCHES/DEV/V4.1-BUG-FIX: 45236: ALF-15604 : Oracle: schema reference files missing nvarchar2 column sizes 45480: ALF-17224: There will not be a "pageList" object in the freemarker model if a wiki page does not exist in a site and the wiki dashlet will cause an error on the site 45482: Fixed ALF-11036, applied the patch, ran the tests. 45485: ALF-17224: If the wiki page which was configured in the wiki dashlet will be deleted the dashlet will cause an error. The result of the call must be checked. 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 45542: Fix for ALF-17443 - Contributors cannot edit their own discussion reply --This line, and th se below, will be ignored-- M root/projects/remote-api/source/java/org/alfresco/repo/web/scripts/discussion/ForumPostPut.java M root/projects/remote-api/source/java/org/alfresco/repo/web/scripts/discussion/DiscussionRestApiTest.java 45550: Merged V3.4-BUG-FIX to V4.1-BUG-FIX 44920: ALF-11315 removed date localisation on blogpost.lib.ftl dates and corrected date format on pubDate within postlist-rss.get.rss.ftl (iso8601 was being used instead of the required RFC822) 44936: Fix build 44967: Merged V3.4 to V3.4-BUG-FIX 44966: Merged PATCHES/V3.4.11 to V3.4 (3.4.12) 44891: ALF-17339: Merged DEV to V3.4.11 (3.4.11.2) 44877: MNT-265: possible improvement to Alfresco SQL query? - Add getOneTxnsByCommitTimeDescending function that makes efficient query to find most recent transaction in time range. 44951: ALF-17325 / MNT-274: Merged HEAD to PATCHES/V3.4.11 33015: ALF-11837 - Alfresco 4.0 SMTP Inbound does not work with messages without From and To Headers. 45191: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX: 45172: Fixed ALF-16140: Blank filetype icon is displayed for tiff image 45436: Merged HEAD to BRANCHES/DEV/V3.4-BUG-FIX: 31107: Google Docs SSL error * Fixed SSL required error that has appeared recently. * Google seemingly no longer supports non secure access to GDoc API. * Default URL's fixed up. 45547: Merged V3.4 to V3.4-BUG-FIX 45166: ALF-17339: Merged V3.4.11 (3.4.11.4) to V3.4 (3.4.12) 45162: Merged DEV to V3.4.11 (3.4.11.4) 44877: MNT-275 Possible issue with MNT-265 fix - SQL from original HF should have used < rather than <= for upper time limit. 45230: Merged DEV to V3.4 (3.4.12) 45203: ALF-16992 : patch.fixAclInheritance is failing on sharedAclsThatDoNotInheritCorrectlyFromThePrimaryParent Ignoring of repeated ACL added 45233: Mark the NFS server as active during startup. ALF-16228. 45287: ALF-12145 Calendar autocomplete for advanced search form incorrectly handles zeros 45380: ALF-17461: There is different size of wcm-bootstrap-context.xml file from installer and archive - Replicated changes from ALF-11644 to Bitrock-installed copy of wcm-bootstrap-context.xml 45454: ALF-17396, ALF-13805: Merged V4.1-BUG-FIX (4.1.4) to V3.4 (3.4.12) Revision: 45452 Author: kroast Date: 16 January 2013 09:59:45 Message: Corrected config check for ALF-16413 - Share asks for Basic-Auth while not needed trying to access RSS feeds (thus breaking SSO). ---- Modified : /alfresco/BRANCHES/DEV/V4.1-BUG-FIX/root/projects/slingshot/source/java/org/alfresco/web/site/servlet/SlingshotFeedController.java 45491: Merge DEV to V3.4 (V3.4.12) 45473: ALF-11956: WCM accessibility DOJO time picker has been fixed to allow selection of hours and minutes, using keyboard. Missing JavaScript key event handlers have been added. CSS class checking has been fixed in 'alfresco.xforms.FocusResolver' in 'xforms.js' to support all versions of IE. Some other minor changes... 45543: Merged V4.1 to V3.4 44743: ALF-17533 / ALF-17117: Created article or publication cant be viewed on WQS site - Further corrections to locking to avoid deadlocks 44682: ALF-17512 / ALF-17118 WQS: Impossible to upload document to publications space - Only first part to do with the transformation failure has been committed. 44653: ALF-17533 / ALF-17117: Created article or publication cant be viewed on WQS site - Missed file from previous checkin 44652: ALF-17533/ ALF-17117: Created article or publication cant be viewed on WQS site - Fixes by Dmitry Vaserin - Removed unnecessary outer read locks from getRelatedAssets and getRelatedAsset to prevent deadlock - Correct markup error when node doesn't have tags 45546: ALF-17512: Corrections to property names by Pavel 45548: Merged V3.4 to V3.4-BUG-FIX (RECORD ONLY) 44977: Merged V3.4-BUG-FIX to V3.4 44936: Fix build 45553: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (RECORD ONLY) 45523: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/V3.4-BUG-FIX: 45482: Fixed ALF-11036, applied the patch, ran the tests. 45557: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (RECORD ONLY) 45556: Merged V3.4 to V3.4-BUG-FIX 45554: Latest translations from Gloria for revision 45205 45568: Merged PATCHES/V4.1.3 to V4.1-BUG-FIX 45421: Merged HEAD to PATCHES\V4.1.3 44243: Merged BRANCHES\DEV\AUTH_BRIDGE to HEAD 43735: Final part of ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups ALF-17489 ALF-17456 45428: ALF-17455 : BM-0013: SOAK01_04: Activities Feed Cleaner query runs for minutes 45489: ALF-17455 : BM-0013: SOAK01_04: Activities Feed Cleaner query runs for minutes 45569: Merged PATCHES/V4.1.3 to V4.1-BUG-FIX (RECORD ONLY) 45564: ALF-17492: WebScript errors must contain useful information - So doth Derek decree - Copied in Surf revision 1217 changes as class local to share.war to avoid pulling in any more untested Surf changes 45591: ALF-17465 (Document "social buttons/actions" not showing in document library page while document is being edited (locked)) 45601: ALF-17433 (Document detail version display incorrect document version when clicking on edit off line) 45611: ALF-17478 - MailMetadataExtracter does not store all Message-Recipient-Address 45622: Merged HEAD to BRANCHES/DEV/V4.1-BUG-FIX: 35614: ALF-17598: CLONE - Add range header support to the webDAV servlet 45633: ALF-17469: JSON message sent back to a client after a category creation is only partially JSON --This line, and th se below, will be ignored-- M category.post.json.ftl 45641: Fix non-ASCII character in source comment 45649: ALF-17556 (Share not redering URL correctly in description field) 45650: Manually merged HEAD to BRANCHES/DEV/V4.1-BUG-FIX: - Changes to StreamContent from merge of THOR1_SPRINTS to HEAD in r34698 45651: Merged HEAD to BRANCHES/DEV/V4.1-BUG-FIX: 45222: ALF-17599: CLONE - Support For HTTP Range Requests in Repository WebScripts - Added HttpRangeProcessor.processRange which takes a WebScriptResponse parameter instead of HttpServletResponse - Changed HttpRangeProcessor.processSingeRange and HttpRangeProcessor.processMultiRange to accept a generic Object parameter then cast to the appropriate WebScriptResponse or HttpServletResponse - Added Javadoc to HttpRangeProcessor.processRange - Changed StreamContent.streamContentImpl to add code from BaseDownloadContentServlet which does the work of processing the range header from the request - Changed StreamContent.streamContentImpl method signature to accept nodeRef and propertyQName parameters needed for multi-range requests - Modified methods which override or call StreamContent.streamContentImpl for new method signature, passing in nodeRef and propertyQName or nulls where appropriate 45655: Merged DEV to V4.1-BUG-FIX (4.1.4) 45565: ALF-17503 : Lucene search with skipcount > hits fails when RM is installed Return a length=0 if a difference of values (count of finded results and results, that need to skip) is < 0 45672: ALF-17452 (Status can't be updated with a blank status) 45682: ALF-17444: Transformation of Outlook files (.msg) doesn't work ootb 45751: Merged DEV to VC4.1-BUG-FIX (4.1.4) 45748: ALF-17517: Document does not revert to previous version if certain rule is applied to the parent folder. Check node existance on ActionExecuterAbstractBase execution. Add unit test for case when inbound rule executed on node that was checked in. 45758: ALF-12264: Fixed issue with pooled-tasks for groups with same name across tenants 45761: Block r45756 from being merged to V4.1-BUG-FIX 45765: Fix for ALF-17153 FTS query parser FTSQueryParser is not debuggable 45810: ALF-17520: Open Document templates are not tranformed properly for thumbnail and preview generation 45828: Additional fix for ALF-17153 FTS query parser FTSQueryParser is not debuggable 45857: ALF-17516 (SHARE: Admin console of users and groups) 45873: Remove so-called intermittent test category, so that only RepositoryStartupTest remains as a gatekeeper 45903: ALF-16611 (When opening My Pages filter, a link to the renamed document becomes red) 45906: ALF-17515: Wrong mimetype name in mimetype-map.xml - Changed macroEnabled to macroenabled 45913: ALF-17462 (In Alfresco explorer invitation to a site does not show the correct options) 45921: Fix for ALF-17421 If a property is both multi-valued and multilingual a ClassCastException is thrown when Solr tries to index the property - support multi-valued ML text but not content 45926: Fix for ALF-17602 lucene.defaultAnalyserResourceBundleName is not injected anywhere in the spring config 46024: Merged V4.1.3 (4.1.3) to V4.1-BUG-FIX (4.1.4) 45585: ALF-17303: alfresco-platform-distribution was not deployed properly to Maven repo 45621: Removed svn:mergeinfo. A 1.7 client should do this automatically. 45669: Fix ALF-17582 - BM-0013: JMeter: Run 02: MT ContentStore caching is not thread safe 45670: Fix ALF-17589 - BM-0013: JMeter: Run 02: CMISAbstractDictionaryService caching of DictionaryRegistry is not thread safe 45692: Config option for ALF-17526 BM-0013: JMeter: Run 02: Improve efficiency of services for SOLRAPIClient.getNodesMetaData - preloading can be controlled + removed incorrect use of the secondary cache that could pull in stale data 45705: Reverted Config option for ALF-17526 BM-0013: JMeter: Run 02: Improve efficiency of services for SOLRAPIClient.getNodesMetaData - preloading can be controlled + removed incorrect use of the secondary cache that could pull in stale data 45716: Fix for ALF-17594 SolrTracker: CMIS model diff (show 1 repeated diff) => CMIS dictionary re-init x2 (every 15 sec) - only refresh the CMIS dictionary if there was an actual model put 45755: Extra support to make clear what causes any difference between SOLR reports ALF-17588 BM-0013: JMeter: Run 02: Deviation was detected in full index check reports for SOLR nodes. - also added RETRY command to retry indexing any nodes that failed with errors. 45803: Fix for ALF-17490 Solr indexation problem with certain acls on a customer environment - AclsGet respects the maximum acls requested and does not silently truncate toe 1024 45829: GERMAN: Translation updates based on EN r45262 45830: SPANISH: Translation updates based on EN r45262 45831: FRENCH: Translation updates based on EN r45262 45832: ITALIAN: Translation updates based on EN r45262 45833: JAPANESE: Translation updates based on EN r45262 45834: DUTCH: Translation updates based on EN r45262 45835: RUSSIAN: Translation updates based on EN r45262 45836: CHINESE: Translation updates based on EN r45262 45858: Fix ALF-17634 -on startup FeedNotifier fetches all people slowly - switch from GetChildren CQ -> GetPeople CQ 45859: Fix ALF-17634 -on startup FeedNotifier fetches all people slowly - reverse fix for this test ... for now, until we re-implement the deprecated method and fix the test case ;-) 45951: Fix for ALF-17687 BM-0013: Soak: Run 02: SolrJSONResultSet must preload nodes - added node preload 45952: SiteServiceImplTest: Added check that size limiting of results is working (and other minor cleanup) 45953: Fixed ALF-17702: BM-0013: Soak: Run 02: getCachedChildAuthorities is not caching results - getChildAssocs specifically checks for 'members' associations (was eliminated by code) - Cache negative results i.e. when there are no children 45969: Part fix for ALF-17526 BM-0013: Soak: Run 02: SOLRAPIClient.getNodesMetaData does N+1 calls to NodeDAO - prependPaths caches nodes for the next layer 45998: Part 2 ALF-17526 BM-0013: Soak: Run 02: SOLRAPIClient.getNodesMetaData does N+1 calls to NodeDAO - make sure bulk node load works and that assocs are cached 45999: Alternative implementation for ALF-17719 BM-0013: Soak: Run 03: Contained authorities cache warmup times are restrictive - bridge table is the default for hasAuthority() - configurable on AuthorityServiceImpl 46000: ALF-17574 BM-0013: JMeter: Run 02: Blocked threads on PDFParser.parse - Found two blocking points in PdfBox to do with loading fonts from the class path (this was the main cause) and the PDFOperator access to a Synchronised map (identified above by Derek). - Note in 1.7.0 of PDFBox generally no font was loaded, but under 1.6.0 it was. This may be a bug in 1.7.0 46001: ALF-17722: Merged V3.4 (3.4.12) to V4.1.3 (4.1.3) 45629: ALF-17536: Stack Specific: Can't transform pdf to jpg - Added TRACE to log env properties using log4j.logger.org.alfresco.util.exec.RuntimeExec=trace 45667: ALF-17536 Can't transform multi page pdf to jpg - issue was introduced by ALF-15436 Alfresco 3.4c + Share + TIFF preview only shows the first page 46018: Merged HEAD to PATCHES/V4.1.3 41904: Fixes bugs uncovered by JDK 7 upgrade - nodeService's interceptors depended on nodeService, resulting in some 'interesting' interceptor ordering in the chain (3 * the normal number in a random order). Now we use a lazy interceptor to break the cycle. - When the Content Language was en_GB and an MLText property contained {en_US, en_GB} it would return the en_US one, not taking country codes into account when available 46023: Follow on to previous check in. Fix up evil cloud sync override of "nodeService" to also not suffer from a cyclic dependency! 46034: Merged V3.4-BUG-FIX (3.4.13) to V4.1-BUG-FIX (4.1.4) 45745: Merge V3.4 (3.4.12) to V3.4-BUG-FIX (3.4.13) 45629: ALF-17536: Stack Specific: Can't transform pdf to jpg - Added TRACE to log env properties using log4j.logger.org.alfresco.util.exec.RuntimeExec=trace 45667: ALF-17536 Can't transform multi page pdf to jpg - issue was introduced by ALF-15436 Alfresco 3.4c + Share + TIFF preview only shows the first page 45724: ALF-17533 CLONE - Created article or publication cant be viewed on WQS site - Further change required to avoid deadlock 45743: Correction to AuditComponentTest - Test was reporting "Incorrect number of audit entries after failed login expected:<1000> but was:<XXX>" where XXX was less than 1000. This was because results was being cleared if all all audit failures were not available in the first loop. The results needed to cleared before the first loop rather than in every loop. For example an XXX value of 830 would simply indicate that the first loop had received 170 audit results and that a second loop was required to get the rest. 45754: Merged V3.4 (3.4.12) to V3.4-BUG-FIX (3.4.13) 45747: Correction to AuditComponentTest - Okay last commit did not work. Try just waiting a bit longer than a second if we don't have all records. 45976: Merged DEV to V3.4-BUG-FIX 45925: ALF-16992 : patch.fixAclInheritance is failing on sharedAclsThatDoNotInheritCorrectlyFromThePrimaryParent Added a detection on cyclic loop for "inherits from" field. 46037: Merged V4.1.3 (4.1.3) to V4.1-BUG-FIX (4.1.4) 46033: Build fixes 46032: ALF-17628 (No information is displayed in My Activities and Site Activities dashlets for content creation) 46095: 46100: ALF-17773, ALF-17774, ALF-17775, ALF-17776: Merged V4.0.2 (4.0.2.26) to V4.1-BUG-FIX (4.1.4) 45469: MNT-280: Merge from HEAD to V4.0.2 (4.0.2.25) 43617: Fix for ALF-16795 CMIS 0.8 TCK - load of large content fails 45875: Merged DEV to V4.0.2 (4.0.2.26) 45874: MNT-282: Mbean error stemming from cmis create. Synchronize initiating ContentStore. Add tenant name to object name of ContentStore MBean for preventing overriding of tenant MBeans. 45904: MNT-285 Content Stream Errors during CMIS load test (Continuation of MNT-280) - Added 'advice' above retrying transactions to supply a ReusableContentStream 45910: MNT-285 Content Stream Errors during CMIS load test (Continuation of MNT-280) - Added unit tests - tests both new TempFileProvider method and AlfrescoCmisStreamInterceptor - Corrections to interceptor 46104: ALF-15843: Upgrade swftools back to 0.9.2 46109: Merged RECORD ONLY V4.1.3 (4.1.3) to V4.1-BUG-FIX (4.1.4) 46106: Merged V4.1-BUG-FIX (4.1.4) to V4.1.3 (4.1.3) 46100: ALF-17773, ALF-17774, ALF-17775, ALF-17776: Merged V4.0.2 (4.0.2.26) to V4.1-BUG-FIX (4.1.4) 45469: MNT-280: Merge from HEAD to V4.0.2 (4.0.2.25) 43617: Fix for ALF-16795 CMIS 0.8 TCK - load of large content fails 45875: Merged DEV to V4.0.2 (4.0.2.26) 45874: MNT-282: Mbean error stemming from cmis create. Synchronize initiating ContentStore. Add tenant name to object name of ContentStore MBean for preventing overriding of tenant MBeans. 45904: MNT-285 Content Stream Errors during CMIS load test (Continuation of MNT-280) - Added 'advice' above retrying transactions to supply a ReusableContentStream 45910: MNT-285 Content Stream Errors during CMIS load test (Continuation of MNT-280) - Added unit tests - tests both new TempFileProvider method and AlfrescoCmisStreamInterceptor - Corrections to interceptor 46087: Merge V4.1-BUG-FIX (4.1.4) to V4.1.3 (4.1.3) 45480: ALF-17224: There will not be a "pageList" object in the freemarker model if a wiki page does not exist in a site and the wiki dashlet will cause an error on the site 46112: Merged (4.1.3) to V4.1-BUG-FIX (4.1.4) 46048: ALF-17727 - BM-0013: Soak: Run 03: Site creation leads to contention on sites container - disable auditable behaviour on "sites" container (when creating a site) 46050: ALF-17727 - BM-0013: Soak: Run 03: Site creation leads to contention on sites container - disable auditable behaviour on "sites" container (when deleting a site) 46055: ALF-17729 - BM-0013: Soak: Run 03: ADMRemoteStore optimization to reduce contention on share folders - disable auditable behaviour on parent folder (when creating / deleting file) 46059: Fixed ALF-17756: Thumbnails are being indexed - Add the cm:indexControl aspect to thumbnails at creation time - Also prevent timestamp propagation when adding or removing thumbnails 46077: Following on from rev 46059 (ALF-17756): Fixed up the mock NodeService.createNode call as we now pass in indexControl properties 46078: Build fix for SiteServiceImplTest.testGroupMembership(SiteServiceImplTest.java:1308) 46079: Additional fix for out of transaction tests 46124: Reverse merge << Will A. did not intend to commit this >> 46095: 46159: Fixed ALF-16889, Enabled cookie support for /wcs/api/login, independent from SSOAuthenticationFilter, on by default. 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 46184: Refactoring a test class to use JUnit Rules - as part of attempt to reproduce ALF-17797. Using JUnit Rules like this will make it much easier to switch users between test methods. Checking in separately from future work as this check-in is a pure refactor. 46185: ALF-17503 : Lucene search with skipcount > hits fails when RM is installed Fix build failures - Correct tests which expected -ve number of rows returned in a resultset 46192: Enhancement to JUnit Rule TemporaryNodes.java as required by fix for ALF-17797. This check-in enhances TemporaryNodes to allow for the easy creation of specific named quick files. Previously you could only easily create a quick file selected by MIME type. Now you can use e.g. 'quickCorrupt.pdf' to get that specific file. 46194: Fix for ALF-17797. AddFailedThumbnailActionExecuter is failing. This check-in adds a test case that reproduces the issue and a fix. The fix was to have the AddFailedThumbnailActionExecuter action runAs system. This is consistent with the behaviour of the create-thumbnail action itself. There is no way via the ActionService to run an action (in this case a compensating action) as a nominated user, and therefore I have had to change the implementation of AddFailedThumbnailActionExecuter.executeImpl so that it always runs-as system. 46202: ALF-17644: Document version was increased after canceling editing. - Also a better fix for ALF-17167 46208: ALF-17517 Document does not revert to previous version if certain rule is applied to the parent folder. - fix build failures (may still be one left) - Not all actions are node based 46230: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (4.1.4) 46227: Filter repository test resources from alfresco.war 46272: ALF-17841: Upgrade 4.0 --> 4.1.4 ClassCastException from OnPropertyUpdateRuleTrigger - Only listen for updates of single-valued content properties and cope with it previously being multi-valued (as can be the case with the devious license property) 46279: ALF-17810: Imagemagick requires installation of Visual C++ redistributables - x86 VC++ 2008 SP1 redistributables now installed to support ImageMagick 46354: ALF-10569: Reversing r32622 as it was due to an invalid interpretation of a Microsoft spec and should be unnecessary for the correct support of WebDAV 'dead properties'. - Correct fix about to be merged in from V3.4-BUG-FIX 46360: ALF-17697: Create proper source jars, to deploy to Maven repository 46361: Merged V3.4-BUG-FIX to V4.1-BUG-FIX 45756: ALF-14722: Repeat merge of V4.1-BUG-FIX to V3.4-BUG-FIX - previous merge in r43028 did not bring over all required changes 42902: Merged DEV to V4.1-BUG-FIX 42519: ALF-13588: Google Doc failed to authenticate after incorrect password being entered for google account Add ability to unregister class behaviours. Unregister googledocs behaviours when subsystem stops. 45948: Merged DEV/WABSON/V4.1-GOOGLEDOCS-BUG-FIX to DEV/V3.4-BUG_FIX 45898: ALF-17704 / ALF-16167: 'Edit Offline' checks out document in Google docs - Edit in Google Docs action is now decoupled from Edit Offline action - The checkout to Google Docs is only performed if a new parameter 'gdc' is set as a paramter when calling the action web script - This paramter causes the web script to call a new method checkoutToGoogleDocs() on ScriptNode if the parameter is set - The new method simply calls the existing checkout() method after setting a custom property on the transaction - The Google Docs policies now check for the presence of this transaction property before sending the document to Google 45976: ALF-17876: Merged DEV to V3.4-BUG-FIX 45925: ALF-16992 : patch.fixAclInheritance is failing on sharedAclsThatDoNotInheritCorrectlyFromThePrimaryParent Added a detection on cyclic loop for "inherits from" field. 46041: ALF-17877: Merged DEV to V3.4-BUG-FIX (with corrections) 46013: ALF-17662 : The deleted via Sharepoint document is not removed from Alfresco but hidden aspect is added for it Documents marked with sys:hidden aspect should be invisible through SPP protocol and should be treated as nonexistent. 46054: ALF-17878 / ALF-17633 add alfresco-mmt.jar in the SDK distribution 46173: ALF-17879 / ALF-17806: Merged PATCHES/V3.4.10 to V3.4-BUG-FIX 46099: MNT-293: Merged V4.0-BUG-FIX to PATCHES/V3.4.10 37969: Fixes for: ALF-12772 'Path not found' error in Share if user has no permissions to parent folders in breadcrumb ALF-14527 Share - Error to display documents if user has no access to the parent folder - Share now correctly supports accessing documents and folders (and details page actions) where the user does not have Read permissions on the parent node. 46101: MNT-293: AccessDenied using CMIS when user does not have access to parent folder - Fix by Vasily 46125: MNT-293: Correct Kev's logic to do permission checks after resolving a path as system 46127: Merged V3.4 to PATCHES/V3.4.10 45743: Correction to AuditComponentTest - Test was reporting "Incorrect number of audit entries after failed login expected:<1000> but was:<XXX>" where XXX was less than 1000. This was because results was being cleared if all all audit failures were not available in the first loop. The results needed to cleared before the first loop rather than in every loop. For example an XXX value of 830 would simply indicate that the first loop had received 170 audit results and that a second loop was required to get the rest. 45747: Correction to AuditComponentTest - Okay last commit did not work. Try just waiting a bit longer than a second if we don't have all records. 46195: ALF-17880 / ALF-17378: Web content is not editable after cancelling the Edit Web Content Wizard - Fix by Andrey 46227: Filter repository test resources from alfresco.war 46324: Merged DEV to V3.4-BUG-FIX (with improvements) 45602: ALF-10569 / ALF-17519 : SPP is setting residual properties with an unknown name space (urn:schemas-microsoft-com) Implemented special case for handling dead webdav properties. New webdav:object aspect was introduced. It is used to store all dead properties that may be set on resource. 46353: ALF-17881 / ALF-17272: TooManyClauses error due to syntax error in the query generated from UIComponentSelector - Fixed typo in Lucene query generation introduced in r20310 46362: ALF-17876: Re-fix typo introduced in V3.4-BUG-FIX merge 46363: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (RECORD ONLY) 46285: Merged V4.1-BUG-FIX to V3.4-BUG-FIX 46279: ALF-17810: Imagemagick requires installation of Visual C++ redistributables - x86 VC++ 2008 SP1 redistributables now installed to support ImageMagick 46325: ALF-17863: Merged V4.1-BUG-FIX to V3.4-BUG-FIX 43649: ALF-16756: WebDAV: An error occurs on drag&drop content from local machine to alfresco when inbound move rule configured. 43651: ALF-16756: Fixed typos - I took this code in good faith! 44988: Merged DEV to V4.1-BUG-FIX 44937: ALF-16756: WebDAV: An error occurs on drag&drop content from local machine to alfresco when inbound move rule configured. Add check for content data length during determining existence of content on node. 46395: Merged V4.1.3 (4.1.3) to V4.1-BUG-FIX (4.1.4) 46121: Fixed code warnings 46123: Further improvements on ALF-17702: BM-0013: Soak: Run 02: getCachedChildAuthorities is not caching result - Reduced cache entry size - Removed binary sort search for authority entries - PS: This is one of the most heavily used code paths in the system 46153: Merged DEV to V4.1.3 (4.1.3) << Lots of other changes in addition to merged code>> 46093: ALF-16149 : CLONE - User search retrieves all users from the DB regardless of search criteria - Re-implemented deprecated method PersonServiceImpl.getPeople(...) to use getPeopleCQ or FTS search - Replaced calls to deprecated getPeople with calls to other one where it would end up being called anyway. - Fixed PersonServiceTests - Fixed GetPeopleCannedQuery to use totalResultCount - tests failed otherwise - Added warning to PersonService.getPeopleFilteredByProperty(...) if PROP_FIRSTNAME, PROP_LASTNAME, PROP_USERNAME were not being used. This was the one place that 'could' called the deprecated getPeople(...) method with other properties. Other properties are not included in the search values. 46178: ALF-17796 - BM-0013: Soak: Run 04: Contention on folder 'user' containing users - disable auditable behaviour on parent folders (see also ALF-17729) 46244: Fix for ALF-17801 BM-0013: Soak: Run 04: ConcurrentModificationException in AbstractLuceneQueryParser - consistently name anonymous constraints defined on properties 46265: ALF-17799 - BM-0013: Soak: Run 04: Regular timeouts getting site memberships - initial fix: make sure limit cut-off is also applied when processing "groups to expand" 46286: Fix for ALF-17801 BM-0013: Soak: Run 04: ConcurrentModificationException in AbstractLuceneQueryParser - build fixes for 1) Anonymous over-ridden constraints defined to contain the wrong property definition (no matter) 2) but above causes name collision on over-ridden anonymous constraints on properties 3) fix -over ride order to set inherited property definition info before over-ridding the property 46290: ALF-17799 - BM-0013: Soak: Run 04: Regular timeouts getting site memberships - fix SiteActivityTest fallout (and adhere to current API contract) 46315: ALF-17788: WebSphere: QueryException occurs during the clean startup - Corrected regression where FeedNotifier tries to scroll past the end of a result set 46316: ALF-17702: Fixed regression of MNT-279 fix - Avoid sequential search across massive user sets when evaluating ACLs 46350: Update Maven POM files - Upgrade version to 4.1.3 - Upgrade pdfbox to 1.7.0-alfresco-20130130, to catch up after r46000 fixing ALF-17574 46370: ALF-17613: Merged V4.0.2 (4.0.2.27) to V4.1.3 (4.1.3) 46368: MNT-298 HF - Replace file by drag-and-drop over CIFS on Mac OS X and passthru/LDAP-AD gets "is in use" message and deletes the file 46421: Fix for ALF-17886. DeleteRenditionActionExecuter Acces is denied. With test of course. 46438: ALF-17622 (Activities with Google Docs are not displayed in My Site Activities and Site Activities dashlets) 46445: Fix for ALF-17327 Cannot retrieve documents with a Japanese keyword. 46457: ALF-17904 (GoogleDocs action doesn't work in doclib view) 46482: Fix for ALF-17858. NPE in formService webscript. 46497: Fix for ALF-15371 Instances of java.util.Map interface cannot be accessed in JavaScript The fix was to have getDefaultValue(Class) return the map.toString. It was previously returning null. 46533: ALF-17286: SPP (Cluster specific):Document workspace is not browseable via Share if alfresco.host is pointing to balancer host - Ensure that concurrency conditions from AclDAO get propagagedby NodeDAO 46540: Fix for ALF-17397 searching based on property value that contains dashes doesn't work in a crossloanguage context using Solr - fixed - also added support for query/index time analysis control for the default cross-language analyser. - Not required to resolve the bug but may be useful to reduce query complexity (e.g. do not generate concatenated tokens for query) which could have been used as a work around for this bug if available. 46546: Merged DEV to V4.1-BUG-FIX 46494: ALF-17899 TempFileProvider.createTempFile() is not debugable Added debug logs. 46562: ALF-17917: Corrected internationalization of Imap Home folder - Unfinished business from ALF-15700 46563: Fix for ALF-17572 - Grey background in 'Google Docs Theme' when uploading files with IE8 46564: Fix for ALF-17150 - Edit Online action missing in Share for some mime types (incorrect mimetype for PowerPoint files with SLDM extension) 46565: ALF-17917: Correction to previous fix - Use distinct key spaces.imap_home.childname, because spaces.imapConfig.childname was already being used for other purposes 46568: Fix for ALF-17757 and ALF-1101 RSS Dashlet cannot display RSS feed produced by Shareӳ blog / RSS Feed Dashlet unable to read internal Alfesco Share site RSS Feeds - Fix implementation from Will Abson NOTE: there is a cavet, suggest SSO style config as per ALF-16413 to avoid basic auth pop-up when displaying some feeds. 46624: removed 46625: Undo last commit 46626: Merged V4.1.1 (4.1.1.21) to V4.1-BUG-FIX (4.1.4) 46602: ALF-17953: Alfresco constantly running full GCs - Possible fix to TikaPoweredContentTransformer to make it wrap FileContentReaders as TikaInputStreams which can be cast to Files and appear not to need reading into memory in their entirety in uncompressed form! - Fix also required to TikaOfficeDetectParser to avoid it wrapping a TikaInputStream unnecessarily 46629: RECORD ONLY Merged V4.1.3 (4.1.3) to V4.1-BUG-FIX (4.1.4) 46622: ALF-17968: Merged V4.0.2 (4.1.1.21) to V4.1.3 (4.1.3) 46602: ALF-17953: Alfresco constantly running full GCs - Possible fix to TikaPoweredContentTransformer to make it wrap FileContentReaders as TikaInputStreams which can be cast to Files and appear not to need reading into memory in their entirety in uncompressed form! - Fix also required to TikaOfficeDetectParser to avoid it wrapping a TikaInputStream unnecessarily 46607: ALF-17953 Alfresco constantly running full GC's - some java.lang.threads holding around 9Gb of memory - Added transformation limits to the 8 TikaPoweredContentTransformer based transformers, so that the maxSourceSizeKBytes can be set for each transformer and for each source mimetype used by each transformer. - maxSourceSizeKBytes set to 40MB for the newer 2007 MS office types (4 char ext). 46619: ALF-17953 Alfresco constantly running full GC's - some java.lang.threads holding around 9Gb of memory - Changed maxSourceSizeKBytes values from 40MB back to -1 for the newer 2007 MS office types (4 char ext). 46636: Fix for ALF-13442 Tomcat memory leak warnings occur during the shutdown 46679: Merged DEV to V4.1-BUG-FIX (4.1.4) 46659: ALF-17631 : Errors/Exception during stress tests of CMIS GET children RetryingTransactionHelper has now ability to handle pre-configured exceptions as retriable in addition to default list of exceptions. 46683: Merge PATCHES/V4.1.3 to V4.1-BUG-FIX (4.1.4) 46637: Update the notice.txt and licenses with the latest modifications Add Microsoft Visual C++ 2008 Redistributable Package in the notice.txt 46693: RECORD ONLY Merged V3.4-BUG-FIX (3.4.13) to V4.1-BUG-FIX (4.1.4) 46692: ALF-17984: Merged V3.4.12 (3.4.12.2) to V3.4-BUG-FIX (3.4.13) 46680: MNT-307: DEV to V3.4.12 (3.4.12.2) 46659: ALF-17631 : Errors/Exception during stress tests of CMIS GET children RetryingTransactionHelper has now ability to handle pre-configured exceptions as retriable in addition to default list of exceptions. - Change to opencmis-context.xml on DEV (based on 4.1.4) was made to cmis-ws-context.xml on V3.4.12 46694: Merged DEV to V4.1-BUG-FIX (4.1.4) 46686: ALF-17631 : Errors/Exception during stress tests of CMIS GET children Unit test add for RetryingTransactionHelper to test extra exceptions are rertied correctly. 46724: create-site.css and create-site.js will be included in the header (share-config.xml) therefore there is no reason to include them in the freemarker templates. 46759: Merged DEV to V4.1-BUG-FIX (4.1.4) 46734: ALF-17873 Missing versionLabel property after Version2ServiceImpl.restore() 1. In Version2ServiceImpl.restore() to props Map was added ContentModel.PROP_VERSION_LABEL property. 2. In VersionServiceImplTest.testRestore() was added the check that ContentModel.PROP_VERSION_LABEL property is correct. 46760: Merged DEV to V4.1-BUG-FIX (4.1.4) 46433: ALF-16883: Incorrect message occurred when delete Workspace if document is locked. Not possible to change MS Office message - have improved alfresco log message 46782: ALF-17317 4.0.2.23 HOT FIX: OpenOffice server conversion failed 46783: ALF-17546 OOXMLThumbnailContentTransformer is not registered to handle special Office document types, such as templates and macro-enabled variants of document / template 46797: Restore missing mergeinfo accidentally removed in r46562 46799: ALF-17546 OOXMLThumbnailContentTransformer is not registered to handle special Office document types, such as templates and macro-enabled variants of document / template - typo in mimetype case 46916: ALF-17174 pdf2swf supports converting N first pages but alfresco does not support it via the pageLimit 46933: ALF-8144: Drastically improving performance using lazy-loaded WorklfowTask properties and path + improved the way share pages workflow-tasks to prevent building full model for unneeded tasks 46946: ALF-18000: Startup script depends on the working directory where it is run - Changed vti.properties to vti.server.ssl.keystore=${dir.keystore}/vti.ssl.keystore 46995: Improvement related to ALF-17380 Solr queries running slowly - reader -> acl cache is built on demand (and warmed via authority warming) - this will mean it is not eagerly built for the archive store where it would be little used, and could be configured off for this case 47032: ALF-17804: cmisatom URL (opencmis backed by Apache Chemistry OpenCMIS) does not support External authentication - Now it supports all kinds of authentication because it sits behind Alfresco's authentication filters - Fix researched by Alex Mukha 47033: Merged V3.4-BUG-FIX to V4.1-BUG-FIX 46453: ALF-18122 / ALF-17708: Incorrect behavior of "Show/Hide Breadcrumb" button when RM is installed - ContentService.getReader() now triggers a transaction retry if content is found to have disappeared under its feet due to eager content cleaning 46495: ALF-18122 / ALF-17708: Incorrect behavior of "Show/Hide Breadcrumb" button when RM is installed - lower impact fix will only throw retryable exception if stream is accessed 46822: ALF-18123: Merge Dev to V3.4-BUG-FIX ALF-17408 : Content is not displayed in imap folder after recovering 46823: ALF-18124 / ALF-18091: Fix for MNT-311 - authentication challenge not present when users open direct links below /share/proxy/alfresco/cmis/i 46927: ALF-18124 / ALF-18091: Merged PATCHES/V3.4.10 to V3.4-BUG-FIX 46925: Merged V3.4-BUG-FIX to PATCHES/V3.4.10 (with correction) 46823: Fix for MNT-311 - authentication challenge not present when users open direct links below /share/proxy/alfresco/cmis/*/content 46942: ALF-17990: Fix security descriptors for new FileFolderService isHidden setHidden methods 47021: ALF-18125: Merged DEV to V3.4-BUG-FIX 46825: ALF-17681 : Lucene Search queries with PATH doesn't work in tenants A JUnit test was implemented to show that the PATH Lucene indexes are not created correctly for tenants. 46968: ALF-17681 : Lucene Search queries with PATH doesn't work in tenants The creation of PATH indexes is now made in context of multi tenant System user to run the reindexing process correctly in unauthenticated threads. 47034: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (RECORD ONLY) 47030: ALF-16102: Merged PATCHES/V3.4.10 to V3.4-BUG-FIX (RECORD ONLY) 41755: ALF-16013: Merged V4.1-BUG-FIX to PATCHES/V3.4.10 41539: ALF-15899: Inbound email does not support multiple recipient folders - Fix by Dmitry Vaserin 47031: ALF-18121: Merged PATCHES/V3.4.11 to V3.4-BUG-FIX 46978: MNT-320: Merged HEAD to PATCHES/V3.4.11: 36623: ALF-10243: form-service date-control now allows configuring only to send date-component of date-only formfields (timezone and time-component is reset server-side to prevent unnecesairy timezone-issues) 47035: Merged PATCHES/V4.1.3 to V4.1-BUG-FIX 46398: Fix for ALF-17889 Alfresco failing as constraint in extension model cannot be defined - use the namespace from the containing model and not the over-ridden property. 46426: Merged BRANCHES/DEV/V4.1-BUG-FIX to PATCHES/V4.1.3: 46421: Fix for ALF-17886. DeleteRenditionActionExecuter Acces is denied. 46446: ALF-17864: BM-0013: Soak: Run 05: SiteService.listSites(username, size) performance (=> via listSitesImpl) - isAuthorityContained made to prune its search drastically - it caches hits and misses speeding up the search in a deeply nested group hierarchy such as SAP's - To avoid huge memory impact with lots of duplicate copies of authority names a pool of authority names is shared across all threads - getContainingAuthoritesInZone reinstated for site listing as it warms the same caches as the ACLs - Derek's latest tests with the changes applied showed a good speed up 46501: ALF-17929: BM-0013: Soak: Run 06: /api/sites/{shortname}/memberships/{authorityname} / SiteServiceImpl.getMembersRoleInfo performance poor - Possible fix to regression caused by ALF-16254 - A very inefficient route was being taken towards checking a user's indirect site role 46502: ALF-17930: BM-0013: Soak: Run 06: ConcurrentModificationException in AuthorityDAOImpl - Don't try to mutate the set returned by getContainingAuthorities() 46503: ALF-17929: BM-0013: Soak: Run 06: /api/sites/{shortname}/memberships/{authorityname} / SiteServiceImpl.getMembersRoleInfo performance poor - Further optimizations to prevent unnecessary recursion in AuthorityDAOImpl.listAuthorities() 46506: ALF-17929: BM-0013: Soak: Run 06: /api/sites/{shortname}/memberships/{authorityname} / SiteServiceImpl.getMembersRoleInfo performance poor - Fixed typo producing invalid membership results 46627: ALF-17967: Error in org.alfresco.repo.workflow.WorkflowServiceImpl.getPooledTasks on StartUp. - Logic error in org.alfresco.repo.workflow.WorkflowServiceImpl.getPooledTasks() introduced in ALF-14861 / r45421 - Rather than fixing the screwy logic (which I think would cause a major performance hit) I'm reinstating the 4.1.2 "cut off after 100 groups" behaviour 46630: Merged 4.1-BUG-FIX to PATCHES/V4.1.3 46562: ALF-17917: Corrected internationalization of Imap Home folder - Unfinished business from ALF-15700 46565: ALF-17917: Correction to previous fix - Use distinct key spaces.imap_home.childname, because spaces.imapConfig.childname was already being used for other purposes 46779: ALF-17967: Error in org.alfresco.repo.workflow.WorkflowServiceImpl.getPooledTasks on StartUp. - Improved fix that uses the bridge table cache if it is available - Groups queried for pooled tasks still limited to 100 by default but can be configured with system.workflow.maxAuthoritiesForPooledTasks - Overall number of results can be cut off with system.workflow.maxPooledTasks 47013: Fix HiddenAspect to NOT use permission-checking NodeService - Should fix ALF-17605: CLONE - Severe performance problems with Group ACL checking under stress test 47018: (RECORD ONLY) Disabled EmailServiceImplTest.testEmailContributorsAuthority pending ALF-17979 47036: Merged PATCHES/V4.1.2 to V4.1-BUG-FIX 46180: Merged DEV to PATCHES/V4.1.2 46170: MNT-299 : CLONE - Activity feeds get not generated in private sites for added files if username in LDAP-AD contains uppercase letters Improved debug logging for Activity Feed and Activity Post DAOs. 47037: ALF-17973 (Incorrect name (title.single/title.multi) for "cloud target selection" window when RM is installed) 47042: RM-601 (Copy/Move dialog causes an error in firebug console) 47047: DE: Translation update based on EN r46507 47048: SPANISH: Translation update based on EN r46507 47049: FRENCH: Translation update based on EN r46507 47050: ITALIAN: Translation update based on EN r46507 47051: NORWEGIAN: Translation update based on EN r46507 47052: JAPANESE: Translation update based on EN r46507 47089: ALF-17089 (Displaying Url Name instead of site Name in Select form) 47102: New Norwegian translations from Gloria plus Bitrock configuration to enable them 47110: ALF-10243: Merged V3.4-BUG-FIX to V4.1-BUG-FIX 47105: ALF-18121: Merged PATCHES/V3.4.11 to V3.4-BUG-FIX 47040: MNT-323: Fixed issue with passing empty due date when starting workflow 47101: MNT-320: also applied fix to wcmquickstart module 47109: ALF-18121: Merged PATCHES/V3.4.11 to V3.4-BUG-FIX 47106: MNT-320: Merged V4.1-BUG-FIX to PATCHES/V3.4.11 41010: ALF-15697: Not possible to start workflow not specifying the Due Date - Regression caused by ALF-10243 47135: DUTCH: Translation update based on EN r46507 47137: RUSSIAN: Translation update based on EN r46507 47138: CHINESE: Translation update based on EN r46507 47141: Fix for ALF-17979 EmailServiceImplTest intermittently failing 47147: Part 2 of ALF-17979 EmailServiceImplTest intermittently failing - fix related cache to avoid any future issue 47148: ALF-17804: Fix NPE 47171: ALF-18060: removing obsolete expensive sorting and preventing too many variable-queries to be performed when listing COMPLETED WorkflowTask git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@47186 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2013-02-27 11:56:13 +00:00
Dave Ward	27f6cb89b8	Merged V4.1-BUG-FIX to HEAD ... 40031: Fix from Dave Ward for ALF-15353 - Lock status is not showning on document details page for a document which is being edited online. 40037: ALF-13609: Merged PATCHES/4.0.2 to V4.1-BUG-FIX (4.1.1) 40032: ALF-13609: listSites() causes an exception for non-privileged users when no sites are present. - Add catch for AccessDeniedException on getAllSetPermissions() call. Assumes private site for this condition. 40075: ALF-13194: Make Share work again when guest authentication is disabled in the authentication chain - When share makes a call to the restrictions API with guest=true it must get a 401 response if there is no guest - Fix by Alex Mukha 40112: ALF-9254: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1) 40111: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration - Patched jooconverter to handle non western characters in text files, by using the same properties that JOD uses. 40073: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration - Refactored JodContentTransformer and OpenOfficeContentTransformerWorker. Moved common code into OOoContentTransformerHelper, including fixes that existed on only one or the other. - For text files, change file encoding from SHIT JIS (and others) to UFT-8, as OpenOffice/LibreOffice do not support this as an input. They do support it in other file types but not text. JOD now works, but OOo still has problems. 40146: ALF-15030: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1) 40145: ALF-15411 CLONE pdf2swf ID Table overflow / This file is too complex to render- SWF only supports 65536 shapes at once - split swf.encoder.params into two parts rather than a comma separated list. Have tested against a number of Mike's test files. Quality appears the same. 40151: ALF-15402: Upgrade yuicompressor used to compress JavaScript to 2.4.7, using the same version as the one we package 40153: ALF-13998: 'No items' error is highlighted in red, even that is not sever error. 40158: Merge DEV to V4.1-BUG-FIX ALF-14323 - CLONE - IMAP: Cannot attach two attachments with the same name. 40162: Merged V4.1 (4.1.0) to V4.1-BUG-FIX (4.1.1) MORE TO FOLLOW 39493: CloudSync: ALF-15203 - when creating a folder sync, do not setup sync for existing "working copy" nodes (only the original ones) 39490: Changing the icon for creating a new folder in the cloud 39486: Chinese translation update from Gloria, based on EN rev38987 39485: Dutch translation update from Gloria, based on EN rev38987 39483: Japanese translation update from Gloria, based on EN rev38987 39482: German translation update from Gloria, based on EN rev38987 39478: (ALF-15197) CloudSync: SyncAdminServiceImplTest.lockSSD failing - causing other tests and 39470: CloudSync: ALF-15188 - Regress' in Unsync - further fallout (this time from ALF-14373 - moved syncTime to syncSetMemberNodeAspect) 39465: ALF-15141 If a push takes a network over quota, a ContentQuotaException will be raised. Catch this on cloud, and return QUOTA_LIMIT_VIOLATION to the client 39464: ALF-14847 Remove the obsolete old style audit token code 39462: Remove unused imports, and improve log message/exception wrapping, for when the catch-all is enabled 39461: The actions panel in the folder details page didn't receive the metadateRefresh event 39454: CloudSync: ALF-15188 - Regress' in Unsync - fallout from ALF-14872 - wip - fixes blocker but needs further investigation as to why remote Unsync is failing with "Content no longer exists on the remote system" - TODO: ALF-14655 + ALF-14712 39452: Avoid NPE due to unboxing a null java.lang.Boolean 39446: SyncTrackerComponent - rework code to set and reset remote system status. 39445: Cloud Sync UI Updates: - Sync Status now shows transient Errors - Sync Status "More info" link has been removed - Text updates 39444: removed a "hot" trace message. 39443: ALF-14975 - Error if some files are locked while multi sync 39442: ALF-14908: Update Sync status dialogue to include the local root folder for indirectly synced nodes. 39441: Use SyncNodeException.wrapUnhandledException, so that the cause details are available for transport 39440: ALF-15155 Have SyncNodeExceptions of type UNKNOWN transport back the causing exception's message, class and stacktraces, and have CloudSyncMemberNodeTransportImpl print a WARN for this when recevied 39439: missed check in - just a message key 39438: Interceptors on the CloudConnectorService will wrap raw exceptions, so ensure downstream code expects this 39436: Fixes the problem when the default tenant is not enabled for sync and there are no secondary tenants 39434: ALF-14980 - Services: auth errors on a per node basis 39431: More - work around code for SyncTrackerComponent. 39430: ALF-14531: F22 sub-task: Add create folder button to folder picker 39428: ALF-15113 Remove the stubbed CloudSync subsystem. Although the subsystem config was gone, there was still some spring config which attempted to import it during bootstrap. 39426: ALF-14598. This change should ensure that the syncOwner is correctly set on nodes pushed to cloud. 39425: Put set and reset of sync failed attribute into its own transaction. 39420: ALF-15167 - Version history sync status message displaying US date format 39419: Work around for syncSetDefinitionTransport.pullChangedSSDs not returning RemoteSystemUnavailableException 39418: Test code improvements. Using my new TemporaryMockOverride rule to clean up spring beans. 39414: CloudSync: change annoying debug message to trace ... - ... we should not pollute the sync "debug" log with continuous stream of unhelpful messages ;-) 39413: CloudSync: ALF-15130 - for checkout, copy sync aspect and properties to "Working Copy" (but not for non-checkout "Copy") - additional fix for directly synced node (issue raised by DW) 39411: Updated the properties for cloud sync related messages 39410: Fixes api mapping for POST cloud passthrough. 39407: ALF-14906: Makes sync status dialogue working copy aware & provides link to original document. 39400: some code was in an log if statement. 39399: ALF-14980 - Services: Add {stuff} needed to display comms and auth errors on a per node basis. 39397: Merged HEAD to BRANCHES/V4.1: 39395: Adding a new JUnit rule to help with cleaning up spring singleton beans whose backend services have been mocked out. 39386: ALF-14901: Fxx sub-task: UI - tgt folder picker should allow drill-down for sync-enabled Networks only 39385: CloudSync: F24 - fix add "sub-folder" on target (when sync'ing sub-folders) - raised by MF 39384: Rename the parent declarative webscript to AbstractCloudSyncDeclarativeWebScript, and add a new AbstractCloudSyncAbstractWebScript parent for the few sync related webscripts that need to be AbstractWebScript rather than DeclarativeWebScript 39382: I like code that compiles. This code compiles. 39380: Test code refactor. We've now got a green bar for AllSyncServiceTests. 39378: More test refactoring in an attempt to get AllSyncServiceTests passing. Extracted common code and state from two REST API tests. 39377: ALF-14901: Fxx sub-task: UI - tgt folder picker should allow drill-down for sync-enabled Networks only 39376: Changes to tests. I'm trying to get AllSyncServiceTests to pass as a suite. This check-in fixes a few failures, now two remaining. 39371: CloudSync: fix cloud fallout from new lic/key (ALF-14846) - pt 1 39368: Italian translation update from Gloria, based on EN rev38987 39367: French translation update from Gloria, based on EN rev38987 39366: Spanish translation update from Gloria, based on EN rev38987 39356: ALF-14906: "Sync Pending" status is shown immediately following a "Request Sync" action. 39348: ALF-14530 Complete the implementation, and add a REST level unit test 39347: ALF-14889: Adds proxy passthrough config for create folder webscript. 39344: ALF-14373 Moved syncTime to syncSetMemberNodeAspect. There may be a little more to do in this task. 39343: Hide the sync filters in the dashlets if the sync is disabled. 39342: CloudSync: stop push looping due to unknown (non-transient) error ! - related to ALF-14872 - eg. in this case ALF-15141 which is not yet explicitly handled ... - TODO: SyncNodeExceptionType.UNKNOWN should handle error message (+ stacktrace ?) - for push or pull (for latter, needs to be transported) 39339: Unsync confirmation text for document/folder changed. The user will be informed that deleting a folder will also delete any content under this folder. 39338: ALF-14909: Update Share delete confirmation dialogue to show extra confirmation text if the node is synced 39337: Add example request JSON to the webscript description 39335: ALF-14530 Webscript to create folders 39328: stress that a cloud network is: FREE 10GB 39322: ALF-14921: CloudSync - F63 / F64 - Recently Modified Dashlet Updates 39320: ALF-14501 - allow UI to determine if sync has been requested on a node 39316: ALF-14920: CloudSync - F61 / F62 - Synced content display on My Documents Dashlet 39312: Debug messages. 39308: Adds folder specific lock messages. 39306: CloudSync: ALF-15130 - for checkout, copy sync aspect and properties to "Working Copy" (but not for non-checkout "Copy") 39305: Turns off sync panel when sync is disabled. 39304: CloudSync: minor: turn down log level 39303: Updates the text to use the correct term for the cloud instance (Alfresco in the cloud). 39300: Cloud Sync Evaluator config & Doc Lib banner updates: - ALF-14981: Adds support for sync:transientError aspect - ALF-14981: Adds Doc Lib banner for transient errors - ALF-15128: Corrects behaviours on working copies (WIP) 39296: ALF-15025 - Always enable the sync change monitor policies - even when off. 39292: ALF-15091 Add unit test covering the case of auditing and transporting MLText properties 39291: ALF-15025 - Cloud Sync now depends upon the key in the license. No key - no sync. 39283: When fetching the properties to be transfered, mark us as being ML-aware as we want to transfer the full MLText object (and not just the current locale) 39279: Adds back in property that went awol in r39265 39275: ALF-15104 Switch the tenant information webscript to be an AbstractWebScript, to make extensions of the JSON (eg for Cloud) easier and cleaner 39273: Switches off Sync filters if sync is off. 39272: Adds support for evaluators to Doc Lib filters. 39265: Merged /integrations/GoogleDocs/BRANCHES/THOR1_SPRINTS_GOOGLEDOCS to BRANCHES/V4.1 36307 Fixed THOR-1402 "Need a callback option for Create Content menu" - Will be revisited to add better comments 36350 Fixed THOR-1402 "Need a callback option for Create Content menu" part 2 - Changed callback obj to match action object better: { nodeRef, node, jsNode } - Better code documentation - Removed dev/test code - Improved error config handling 36358 THOR-1402 "Need a callback option for Create Content menu" part 3 - Changed "link" parameter to "href" (instead of "page") to match actions. 39256 Consistency fix of doclib & repo toolbar templates after work on THOR-1402 39260 Bugfix for "destination" parameter not being resolved correctly THOR-1402 39261: ALF-15056: Handle Multiple errors in Sync Status box 39215: CloudSync: F4 - fix ALF-15106: non-deeply synced folders should not add subsequent child (sub-) folders to sync set 39209: ALF-15113. Removing the unused, stub subsystem 'CloudSync'. 39207: ALF-15015 follow-up: make sure the first enterprise test that runs has no specific license, since we just reset the database 39184: Fixes broken sync URLs 39180: ALF-15054: CSS Updates 39171: Re-enable test (ALF-15096) 39170: Missing commit, 400-499 errors need the response details (ALF-15096) 39168: Completion of ALF-14335. This check-in removes the old URL patterns and so all clients must now be using the new /enterprise/sync URLs. 39162: CloudSync: comment-out unit test pending ALF-15096 39160: ALF-15054: CSS Updates 39144: Have SyncChangeMonitorTest remove the mock when done, which allows several more tests to pass in the suite 39114: Fixes: ALF-14990: Folder Picker issues (caused by multiple instances being displayed with different contexts) 39113: ALF-14557: Auth Dialogue updates 39112: ALF-15061: Makes Lock message and icon generic - not all locks are for local edits now. 39107: ALF-15054: CSS Updates 39097: Try to re-order tests to have more pass, and improve error detection in one 39093: Add in the missing sync 39091: CloudSync: ALF-15075 - Regress: unable to pull single node update (file sync) - follow-on fix to allow initial push :-) - fallout from ALF-14853 39080: Complete conflict transport of exceptions unit tests 39079: Fix webscript parent definitions, to avoid NPE on missing required service 39077: Improve Pull error reporting, and add tests for the transport level catch/encoding/decoding/throw of exceptions (to compliment existing tests) 39076: ALF-15013 ALF-15015: Reset database before running enterprise tests, otherwise SecurityTestSuite leaves it in a bad state 39073: ALF-15050 test affescted by locked sync set implementation. 39072: CloudSync: ALF-15075 - Regress: unable to pull single node update (file sync) - fallout from ALF-14853 39068: ALF-14893 - work around order of versions issue. 39066: Tweak how we switch to the default authenticator for one test 39059: ALF-15054: Added the actions "Sync", "Unsync" and "Request sync" to the header of the sync panel 39054: More debug for move node problem. 39041: ALF-15064 : Sync locked nodes (on src) - need to be able to bypass lock when requesting sync ... 39040: Turn off locked sync sets for SyncAdminServiceRestApiTest 39034: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/V4.1: 39030: CloudSync: ALF-14899 - cloud target Sync API should restrict to Enterprise Network(s) only 39033: CloudSync: minor - fix failed node count (debug logging) 39032: ALF-14557: CSS Fixes to Auth Dialogue (WIP) 39024: ALF-14225: Adds tracking to URL. 39018: If the other end sent their noderef, return it to them 39011: ALF-14225: Refactor Welcome Dashlet to show 4 columns, the 4th one of which is always the cloud sign up text. 39009: Extra validation before doing JSON parsing 39008: ALF-15015 Avoid having a custom ServletAuthenticatorFactory trampled in a MT environment 39005: Attach the sources for spring-webscripts-1.0.0-tests 38991: update should not move node if localparentnoderef is not specified. 38962: Added a new unit test for end to end conflict. 38961: CloudSync: ALF-15040 / ALF-15021 - Uploading file larger than content limit (max file size) for given network (eg. 50 Mb to a Free Network) causes error loop - wip 38960: ALF-15050 : CloudSync: failing test(s) - due to locking ?? (SyncAdminServiceImplTest / org.alfresco.enterprise.repo.sync.audit.SyncAuditServiceIntegrationTest) 38958: CloudSync: fix NPE (CloudSyncConfirmPost line 139) 38956: Chinese Translation for 4.1 38955: box-shadow doesn't work with IE6-IE8. It was not possible to see the borders of the info balloon. 38951: Removed "folder-sync.js" and "folder-sync.css" to avoid code duplication. The same methods and styles are defined in "document-sync.js" and "document-sync.css". 38940: The sync panel in document details page were not refreshed when the document was synced or unsynced from the document details page. 38937: ALF-14859: Adds Icons for cloud version (requires cloud overrides to display them) 38935: ALF-15006: Adds the missing config required to include the actions-util.js file in the list of ones to be concatenated 38929: Add a toString() method to aid debugging 38928: ALF-14952: update Unsync dialog to enable UI option to allow user to request delete of remote nodes (ie. from target) 38925: Updates the sync status message logic a bit - now displays the sync attempted time if the first sync fails (previously showed "Sync pending") 38922: ALF-14677 - Synced nodes marked as locked On Premise, need to be unlocked on unsync Also Locks created and deleted by sync set owner. 38921: Removes the action util methods from the global name space and adds them to Alfresco.util 38919: CloudSync: ALF-15040 / ALF-15021 - Uploading file larger than 50 Mb to a Free Network causes error loop 38918: File size upload limit within ContentStore. - required for cloud sync (ALF-15040) - fix default (no limit) 38915: File size upload limit within ContentStore. - required for cloud sync (ALF-15040) - fix merge issue (Spring config) 38914: File size upload limit within ContentStore. - partial merge - "sourced from" THOR1+CLOUD1 - required for cloud sync (ALF-15040) 33055: File size upload limit within ContentStore 35995: Fix merge issue 38912: Locking attribute on Sync Set - First cut - add new method on Lock Service + re-enable pull unit test. 38906: The buttons won't be created on the cloud side, so avoid js error 38905: CloudSync: test fix - fallout from r38888 (ALF-15029) 38902: ALF-14549: CSS fix for window resizing problems 38898: More unit test debug logging, to aid with making sense of the logs on the Bamboo-only failure 38895: Extra debugging and checking, to help narrow down why this test fails on Bamboo 38892: ALF-14908 (No need to pass the "siteId" with the URL) 38890: We don't need to pass the "syncOwner" with the URL anymore. We receive the needed information from the server and this avoids an extra call to build the "syncOwnerFullName". 38888: CloudSync: F4/F24 - ALF-15029 - working copies (eg. via Edit Offline ... within a folder sync) should not be synced ! 38887: ALF-14908: Checking "isDirectSync" before comparing the value, because "isDirectSync" can be undefined 38886: ALF-14908: Update Sync status dialogue to include the local root folder for indirectly synced nodes 38882: CloudSync: F13/F14/F24 - ALF-14778 - "request sync" of a folder/sub-folder SSMN - will request the sync of the folder node itself (whether failed or not) - recurse and request sync of all SSMNs below but only if failed (irrespective of SSD) 38873: Reverses failed merge attempt in r38846. 38872: ALF-14907: "localRootNodeName" added 38871: Adds edition check before calling enterprise only webscript. Sets sync to OFF for non enterprise editions. 38866: Have the setup methods try harder to ensure a clean, empty setup for the area under test, to avoid issues with other tests on Bamboo leaving test data behind which then confuses things 38863: CloudSync: minor: improve SyncTracker logging (push/pull) 38862: ALF-14335 consolidate Sync REST APIs. I've added new URLs to all sync webscripts (except cloud-sync.post.desc.xml as it's singshot) which start with '/enterprise/sync' I have not removed the existing URLs as I'll give the new ones time to go through the dev/QA/PM system. I will likely delete the old URLs in a week or so. I have also changed the URL patterns in code in all the places where I see an obvious and risk-free change. This may be them all. 38855: Ignore testPull - does not work in automated build. 38854: ALF-14549: Add Sync panel to Folder Details Page 38851: Renamed the sync util methods 38850: ALF-14549: Added a panel to folder details page 38848: merge conflict fixed 38846: Merged from integrations/GoogleDocs/BRANCHES/THOR1_SPRINTS_GOOGLEDOCS to alfresco/BRANCHES/V4.1: - 31695 THOR-367 - #2 Document Library - 36307 Fixed THOR-1402 "Need a callback option for Create Content menu"- Will be revisited to add better comments - 36350 Fixed THOR-1402 "Need a callback option for Create Content menu" part 2- Changed callback obj to match action object better: { nodeRef, node, jsNode } - 36358 THOR-1402 "Need a callback option for Create Content menu" part 3- Changed "link" parameter to "href" (instead of "page") to match actions. (Changes by Erik, required for Google Docs minus changes made to privatemodules ) 38844: I have changed all occurrences of 'master' and 'slave' to 'source' and 'target' and these are the terms we should use to identify the two Alfresco instances in future. I believe that the only place this has leaked out into the remote API is at syncsetdefinition.post, which had a 'lockMasterCopy' parameter. This is now renamed to 'lockSourceCopy'. However, as that parameter was not supported on the back end, existing client software should continue to work. 38839: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/V4.1: 38835: CloudSync: minor cleanup (remove some obsolete code) 38838: ALF-14907 Adding syncOwner firstName, lastName, userName and local root nodeRef to the remotesyncednode.get webscript. 38837: Extra sanity checks 38805: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/V4.1: 38775: CloudSync: F24 subtask - ALF-14853 - move nodes "within" existing sync folder hierarchy 38782: ALF-14549: Add Sync panel to Doc Details Page 38784: ALF-14549: (css fix) 38798: Cloud sync component test - try injecting (lower case) transport bean directly. 38799: Fix for community builds which do not have enterprise/repository.properties 38802: Remove dev webscript that was incorrectly merged across (reverse merges r35946) 38774: Fix broken merge of r35436 from BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/V4.1: - Extends Doc Lib indicator config to support javascript actions on icon click (method had been refactored for ALF-12955) 38773: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/V4.1: 38703: Sync Tracker Component - First integration test of end to end push. 38704: CloudSync: F31/F32 - add option to request delete of node(s) on target when unsync'ing 38706: CloudSync: F24 - fix "rename" of a synced subfolder 38712: build fix? 38713: missed check in 38714: ALF-14549: Add Sync panel to Doc Details Page 38737: Sync Tracker Component Test - New test knocked over by changes to add person service. 38743: CloudSync: F24 sub-task: ALF-14731 - fix SyncTracker (PUSH) such that nodes are processed in event order (earliest event for each node) 38761: ALF-14549 (Added a new evaluator so that the sync panel will be only shown when the node has been synced) 38763: ALF-14549 (Reverting the code from r38761 because the sync panel should be shown whether or not the node is synced) 38767: Sync Tracker Component test - first pull. 38769: CloudSync: delete + ano '=> delete 38700: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/V4.1: 38685: ALF-14910: Sync Status dialogue's {status} info needs to be rendered on the server 38686: CloudSync: ALF-14779: push delete 38687: Fixes: ALF-14871 - Uses a server side redirect for view in cloud URL (rather than returning JSON) to avoid pop up blockers and funny new window behaviour associated with window.open 38699: A few more little bits missing from merges 38698: Enterprise Repository.Properties needs to be included in a way that works for community builds (which won't have one) 38691: Enterprise shouldn't be in core community services 38690: Avoid double merge issue 38689: Couple of context changes that got lost in merging 38688: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/V4.1: 38527: ALF-14549: Add Sync panel to Doc Details Page 38537: ALF-14549: Add Sync panel to Doc Details Page 38551: CloudSync: F24 - includeSubFolders (on SSD) 38553: Do extra valdiation of cloud URLs when setting on the connector, and handle re-doing the RemoteTicketService initialization automatically if the URL or Key is changed at runtime (eg by a unit test) 38555: ALF-14534: Add "include subfolders" HTML checkbox to cloud folder picker 38557: Fixes bug where folder picker may keep spinning when loading folders. 38562: CloudSync: F24 - includeSubFolders (on SSD) 38563: ALF-14893 - Bug from sprint 4 demo with conflict versioning. 38565: CloudSync: F24 - includeSubFolders (on SSD) 38568: Bug fix 38571: ALF-14534: Add "include subfolders" HTML checkbox to cloud folder picker 38605: ALF-14542: Add "Request Sync" button to sync info dialogue 38617: ALF-14542: Add "Request Sync" button to sync info dialogue 38620: Add NodeServicePolicies.BeforeMoveNodePolicy (4.1) 38628: Add NodeServicePolicies.BeforeMoveNodePolicy (4.1) 38629: ALF-14779: push delete 38656: ALF-14598 Removed syncCreatorPerson property from code & replaced it with syncCreatorUsername. The d:noderef property is temporarily retained in the content model in order not to break anyone's DBs. It will be removed in a week or so. SyncTrackerComponent uses this userName when considering pushes/pulls but does check if the person exists. 38658: Hides the sync action in the repository view 38660: CloudSync: minor (change log level) 38661: ALF-14779: push delete 38671: CloudSync: quick workaround fix for syncCreatorUsername 38684: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/V4.1: 38248: CloudSync: ALF-14708 - fetch for pull error handling 38250: CloudSync: fix test (AuditToken NPE) 38253: Fixed web script voodo for /sync/config - working for real now. 38255: ALF-14525: CloudSync: Folder Sync - UI to enable current folder in Document Library to be synced 38256: ALF-14551: Evaluator to determine if indicator icon should be displayed 38258: Bug fixing for indicators. Synced idicator should not be shown if the sync failed idicator is shown. Also PropertyValueEvaluator has been deleted. The same result can be achieved with ValueEvaluator. 38263: CloudSync: F29/F38 - Unsync web script: minor improvement - make use of common isDirectSyncSetMemberNode 38264: CloudSync: ALF-14708 - fetch for pull error handling 38265: CloudSync: F24 - recursive folders (wip) 38267: CloudSync: ALF-14788 (F29/F38 sub-task) unsync of node (file or folder) should auto re-sync if it is below ano' parent folder sync 38270: ALF-14625 remove sync:conflict aspect and props. 38271: ALF-14541: CloudSync: Folder Sync - ensure sync'ed folder on target does not appear in source selector (when choosing target folder) 38273: FIxes: ALF-14789 - minor bug in sync status dialogue 38286: CloudSync: update AuditToken transport (pt I) 38291: CloudSync: ALF-14790 - F4 sub-task - for pull of new node from tgt to src 38301: Cloud Sync Status webscript updates: Finishes off: ALF-14593. 38304: Adds Share support for access to "Big Switch" to turn Cloud Sync on/off & change mode. From Kevin. ALF-14773 38315: CloudSync: update AuditToken transport (pt II) 38317: CloudSync: update AuditToken transport (pt III) - fix unit test 38324: MT: fix InvalidNodeRefException.getNodeRef() 38325: CloudSync: create SSD - minor: logging + header lic 38326: CloudSync: delete SSD - fix "transport" (use param not body for delete method) 38333: ALF-14373. Added syncOwner property to SSMN aspect - this is copied from the SSD noderef when the member node is synced 38335: CloudSync: ALF-14455 - push the SSD_TO_DELETE event to target 38350: ALF-14545: Add error message for sync failed 38351: ALF-14545: Add error message for sync failed 38352: Reverted last commit (Deleted properties by mistake) 38353: ALF-14394 cloud sync: Error details need to be returned over web scripts. 38357: ALF-14760 - CloudSync: file sync with permission failure - AccessDenied on target causes repeated loop on source . 38358: ALF-14760 - CloudSync: file sync with permission failure - AccessDenied on target causes repeated loop on source . 38359: CloudSync: F24 - recursive folders (wip) 38361: Bug fix for ALF-14545 (Cannot get the sync info if the content was successfully synced) 38363: Adds syncMode to JS controller and improves error catching if nodeRef can't be found. 38366: ALF-14751 - Localise sync version message 38370: ALF-14666 - CloudSync: REGRESS - push/pull *update* no longer seems to work (metadata or content) 38371: added enterprise repository.properties 38374: Bug fix for ALF-14545 (css fix) 38376: CloudSync: pull - invalid node 38380: ALF-14550: Cloud view for sync info dialogue 38386: Added the enterprise/repository.properties 38390: CloudSync: pull of new (folder) node from tgt to src 38392: ALF-14608 - Synced (pulled) content must record a path to the Cloud nodeAdd the remote path to the version message 38403: CloudSync: test fix (CloudTransportWebScriptsTest testPullChangedNodesForSSD) 38404: Beefed up null detection on adding path. 38407: Cloud Sync Evaluator and permissions sweep 38411: Added TARGET_FOLDER_NOT_FOUND for Sync Service Create 38418: ALF-14615 - Add global properties for CloudSync feature 38422: ALF-14552: Changed the icon 38429: ALF-14679 - The TransportService must transfer the locale of a document on sync 38436: Adds proper syncOwner display to sync status dialogue. ALF-14293 38437: Cleans up syncMode JSON. 38445: Fixes error time display (ALF-14293) 38446: CloudSync: minor (F24) - prevent indirect folder move for now (in same way as indirect file) - ie. cannot unsync indirect node 38449: Minor Sync Status: - fixes template issue - minor css updates - adds support for "you" rather than current user's fullname in dialogue 38461: CloudSync: temp build/tests fix - fallout from r38418 (ALF-14615) 38469: ALF-14525: CloudSync: Folder Sync - UI to enable current folder in Document Library to be synced. 38474: ALF-14525: CloudSync: Folder Sync - UI to enable current folder in Document Library to be synced. (Fixed the problem with an evaluator rather then fixing it in the JS side) 38682: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/V4.1: 38023: First pass at json based exception transport 38036: CloudSync: F25.5 - directSync prop 38045: CloudSync: fix couple of NPEs - one for SyncNodeException transport and one for F25.5 (existing node / unboxing) 38046: CloudSync: follow-on to r38045 - F25.5 (existing node / unboxing) 38047: CloudSync: follow-on fix for F25.5 / ALF-14695 (existing node / unboxing) 38052: CloudSync: minor test fix - CloudTransportWebScriptsTest.testPushFolder 38055: ALF-14604 - First cut of "doing the right thing" with versions. 38056: CloudSync: F25.5 - directSync prop 38057: CloudSync: (Folder) Unsync (F29 / F38) 38058: ALF-14604 - First cut of "doing the right thing" with versions. 38059: Undo incorrect check in from r38055 38061: ALF-14690 : Add time stamp property to sync:failed aspect. 38062: ALF-14525: CloudSync: Folder Sync - UI to enable current folder in Document Library to be synced 38064: Different message for sync conflict. ALF-14607 : Synced (successfully pulled) content must lead to version creation 38066: ALF-14541: CloudSync: Folder Sync - ensure sync'ed folder on target does not appear in source selector (when choosing target folder) 38068: ALF-14690 - correction to model 38073: Failing property was added 38105: Sync Status updates: - Correct Handling for status text (minus missing syncOwner and errorTime properties) - Fixes link handling within the dialogue - Adds sync:failed banner to DocLib (as per wireframes) 38106: s/Sync'ed/Synced/ 38107: return statement was missing 38116: CloudSync: F4 (folder sync - immediate files) - ALF-14745: skip files that are already SSMNs 38120: ALF-14555: Upload indicator icon and indicator config 38121: ALF-14604 - Turn auto version off (model defaults to true) 38122: ALF-14525: Change the icon and the text for the button 38125: Remove sync node ref on returning node not exists error from cloud. 38132: Small bug fix - previous change to disable autoVersionOnUpdateOfProps was over-writing cm:modified 38133: Adding javadoc of exception types so I know which one is which. 38163: Adds link to DocDetails page (ALF-14546) 38165: Better error handling if the remote nodeRef can't be found. 38173: CloudSync: ALF-14501 (F13 / F14) - Request Sync 38175: ALF-14556: Refactor dialogue to be based on the DAM info popup 38176: ALF-14556: Refactor dialogue to be based on the DAM info popup (Merge conflict fixed) 38180: ALF-14540: Add "Request Sync" doc lib action 38187: Changed the properties for Request sync 38188: Fix for ALF-14657 Add targetParentNodeRef to remotesyncednode webscript. 38191: ALF-14542: Add "Request Sync" button to sync info dialogue 38199: ALF-14575 - Wire up big switch to turn on or off Cloud Sync - addition of the big switch - does nothing at the moment. 38200: ALF-14540: Add "Request Sync" doc lib action 38201: Sync Change Monitor not enabled if big switch is "OFF" 38202: Sync Tracker does nothing if not on premise. 38205: CloudSync: ALF-14708 - fetch for pull error handling (wip) 38213: Correction to sync tracker component. 38221: ALF-14271 Move the registration of Cloud with the RemoteTicketService to bootstrap, to avoid audit problems during init 38235: Work in progress on Rest call for /sync/config (Hard coded ON_PREMISE - cant get ${syncMode} to work) 38236: minor formatting 38680: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/V4.1: 37715: Check in empty SyncTrackerComponentTest 37716: ALF-14338 - extends unit test for SyncServiceImpl create method 37717: Ignore imcomplete tests checked in by r37715 37721: CloudSync: Folder Sync - ALF-14566: add behaviours to add/remove SSMN 37724: Update SyncNodeException to use an enterprise-only message bundle for the exception detailed error message. This message can potentially also be re-used on the UI 37728: Add unit tests for pushing a cm:folder through the transport. (Works much like an un-versioned node with no content changes) 37734: Start to migrate the remote ssd creation calls out of SyncAdminService, and to CloudSyncSetDefinitionTransport, removing migration TODOs in the process 37735: Migrate the deleteSSD remote call from SyncAdminImpl to CloudSyncSetDefinitionTransport 37736: Have the deleteSSD transport layer properly handle/transport NoSuchSyncSetDefinitionException 37737: Review and add SyncNodeException and NoSuchSyncSetDefinitionException to node level transport webscripts where needed 37741: Refactor on-enterprise sync transport exception handling, to work for both push and pull cases, and start to support the same degree of handling for pull 37767: CloudSync: Folder Sync: ALF-14590 - disallow individual unsync of file (or sub-folder) if member of a folder sync 37785: CloudSync: fix mockito tests (ssmChangeManagementTest) 37787: CloudSync: fix mocked unit test (nodeRef format + authorization) 37791: CloudSync: fix more mocked unit test (nodeRef format + authorization) 37797: The folder picker showed a second button without text when "secondaryTenants" was empty. 37803: Ripped out adding sync:conflict aspect and implemented "cloud wins" conflict resolution. 37820: CloudSync: build/test fixes - TEMP ignore push/pull test - to see if it affects follow-on tests (or not) 37823: CloudSync: Folder Sync - ALF-14566: add behaviours to add/remove SSMN 37843: Typo correction 37844: ALF-14580: View In Cloud action should open links in new window 37846: ALF-14453: CloudSync: Create sync UI - shows site twice and also title shows "title.multi" 37850: CloudCloudSync: Folder Sync: ALF-14624 - create file on target (within sync'ed folder) and then pull to source 37870: ALF-14540: Add "Request Sync" doc lib action 37871: ALF-14543: Add "Request Sync" multi-select action trigger 37883: Support for transporting the node path, for use in messages and displays, and update the tests to cover this 37888: "Sync to cloud" and "Request sync" actions were not available for multi-select action trigger 37890: CloudSync: ALF-14647 - failing unit tests ... 37894: CloudSync: ALF-14651 - after push, the source node may appear modified by "System (User)" 37895: Temporary work around for Transport of SyncNodeException - exception does not contain "cause" its all "precondition failed". 37902: ALF-14292: Add check box to disable auto-sync 37903: ALF-14537: Add HTML checkbox to lock src copy 37908: CloudSync: SyncService.fetchForPull 500 error => map InvalidNodeRefException to SyncNodeException 37909: CloudSync: ALF-14656 - create folders before files (when pushing a sync set) 37912: ALF-14661 & ALF-14662: Add sync:syncSetMemberNode and sync:failed filters to Doc Lib. 37922: Fix up exception messages - must be defined in the message file, not in comments 37923: Tidy up a little the exception building 37924: CloudSync: doFetchAndAction 500 error => map InvalidNodeRefException to SyncNodeException 37944: Swallow SyncNodeException from PULL. 37947: Adding aspects to the node as a requirement for ALF-14541 37949: Cloud Sync F26/F93 (WIP): - Adds View in Cloud link to location if it can't be retrieved: ALF-14464 - Swaps dialogue date rendering from relativeDate to relativeTime w/ hover state: ALF-14539 - Adds support for unsynced nodes: ALF-14528 37951: ALF-14597: Remove previously needed UI conflict indicators 37956: ALF-14554: Create evaluator & update existing evaluators 37957: Merged HEAD to BRANCHES/DEV/CLOUDSYNCLOCAL2: 37952: Added new API methods to template Site helper - to retrieve Share URL stem and Share URL for a given site. 37958: Adds shareURL to metadata object in node data webscript 37961: More debug in SyncServiceImpl 37964: CloudSync: ALF-14271: workaround startup error (init -> bootstrap sequence) for CloudConnectorService/RemoteAlfrescoTicketService 37965: ALF-14666: CloudSync: REGRESS (?) - push update no longer seems to work (metadata or content) 37967: ALF-14440 : Creating sync file when target already has a file of the same name -> causes 500 error Removed a TODO: It is correct to throw an exception rather than over-writing a node. 37970: Fixes JSON that was broken in r37958 38677: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/V4.1: 37534: Transport for double and float property values 37537: CloudSync: SyncServiceImpl - minor: start to cleanup debug logging (to make it more useful / consistent) 37538: Quick fix for the NullPointerException in ALF-14449. 37539: CloudSync: ALF-14378 - pull sync changes - only the target nodeRef is required 37540: Fix up the pull unit test, and add tests checking all the different kinds of property value transport 37542: Add unit tests for notification of a conflict through the transport layer 37553: ALF-14445 After changing the cloud url for use with the local loopback connector, re-init the service to ensure the url passes all the way down the stack 37555: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/CLOUDSYNCLOCAL2: 37554: Follow-on fix to ALF-9661 - do not fire update rule (onDeleteAssociation) if node also no longer exists 37556: ALF-14445 After changing the cloud url for use with the local loopback connector, re-init the service to ensure the url passes all the way down the stack 37558: Fixes "View In Cloud" link 37563: Avoid exceptions in the logs for expected problem cases of Conflict and Not Currently Acceptable (cloud busy etc) 37565: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/CLOUDSYNCLOCAL2: 37564: Pull out some bits to constants, so downstream classes can more easily configure themselves 37567: ALF-14356: Updates look and feel of user profile cloud sync panel as per wireframes. 37574: Call version service to ensure cloud nodes are versioned. 37575: ALF-14430 - First conflict on both ends. 37576: CloudSync: ALF-13948 - F29 (Unsync) 37597: Temporarily disable the failing SyncServiceImplTest.testCreate so we can get green builds 37600: CloudSync: follow-on to r37597 (temporarily disable/ignore unit test) 37611: Fix for: ALF-14461: Site manager can't unsync content. 37616: CloudSync: SyncTracker (push) - ALF-14459: One failed sync causes subsequent (unrelated) syncs to fail 37617: ALF-14464 - For now, slightly ignore "unauthorised" error when attempting to get cloud location. 37619: Stub out some CloudSyncSetDefinitionTransport unit tests, and begin with testing handling of connector exceptions 37622: Unit tests for exceptions from the connector for SyncMemberNodeTransport 37629: ALF-14460 - Content edits of synced documents lead to failed syncs 37631: Reinstate SyncServiceImplTest.create 37639: CloudSync: ALF-14358 - REST API to get SyncSet Changes 37640: CloudSync: ALF-14378 - SyncTracker PULL - remove x2 temp to lookup/set sourceNodeRef ... 37650: CloudSync: ALF-14248 - remove auditing of "create SSD" (since it is now synchronous) and fix up unit tests and other related ref's 37660: CloudSync: fix build/test (SyncAuditServiceRestApiTest.testGetSyncSetChanges) 37669: Enables folder sync actions in the UI 37680: Support, and unit tests, for transporting multivalued node properties, and mltext node properties 37682: ALF-14514 : Added aspect sync:failed 37686: Add unit tests for the Sync Set Definition transport webscripts, and start on tests for the transport of cm:folder 37688: ALF-14338 - Introduce SyncNodeException. 37689: CloudSync: folder sync: ALF-14521 - update SyncSetDefinitionPost 37698: Convert SyncNodeException to be backed by an Enum, so we can effectively transport the different types of problem. Adds an initial list of problem enums, which are message backed (but not yet in properties) 38672: Fix up merge problems 38665: ALF-13260: Mysql does an awful planification of ibatis "select_ChildAssocOfParentByName" query after some heavy load - improved "select_ChildAssocOfParentByName" where clause to engage existing index 38662: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/V4.1: 37061: ALF-14265 - CloudSync: fix failing tests - Activiti/JBPM WorkflowRestApiTest* 37071: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/CLOUDSYNCLOCAL2: 35409: Merged HEAD to BRANCHES/DEV/V4.0-BUG-FIX: 35399: ALF-12874: Schema reference files are out of date. 37072: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/CLOUDSYNCLOCAL2: 35781: Fix for MySQL part of ALF-13150: Performance of Purging Empty Transactions (like 10M) ALF-13839: MySQL: "Failed to purge txns" from DeletedNodeCleanupWorker - Added MySQL override of the NodeDAO for this call with a dedicated DELETE ... JOIN ... for MySQL 37077: Fix how we pull the mimetype and encoding of the content from the content type, and add unit tests for this 37078: Reverse accidental property change 37084: Cloud Sync Push - Work in progress. Adds 2 new methods to the cloud sync member node transport. And an "AuditToken" opaque type. 37118: Implementation of ALF-14324. Get Cloud NodeRef, Network for specified local syncset member node. 37132: ALF-14324 Changed API so that if a remotesyncednode has no matching remoteNodeRef (due to not being synced) then the JSON field is not rendered. It had been rendering an empty string. 37133: ALF-14324. I forgot to check in the associated test code edit for previous checkin. (37132) 37136: Cloud Logins need to occur on the default network (we have no others until after login) 37139: Upgrade to Commons FileUpload 1.2.2, and add in the source 37147: Start on the FileUpload support for the pull case, and begin sending appropriate request data 37150: Added a package-info.java to document the main components of the feature. (Ongoing) 37153: ALF-14324. Tweak to URL for remotesyncednode.get. NodeRef as query param, rather than template arg. 37166: Refactor things to allow for re-use in the Pull code flow, and mostly implement the Pull code. Initial tests added, but needs a real service call to fetch the SyncNodeChangesInfo before the rest can be done 37182: ALF-14334: update CloudSyncSetDefinitionTransport to call REST getSyncSetManifest 37183: ALF-14334: fix "syncsetmanifest" descriptor 37187: ALF-14334: fix build/unit test (tearDown) 37198: Minor: test improvement - fix format of dummy nodeRef 37201: Cloud Sync - Cut over sync jobs. 37203: Changed cron expression. 37206: CloudSyncTrackerComponent - minor locking changes. 37220: SyncTrackerComponent.pushSyncSet - runAs syncCreator 37221: Fixes broken JSON 37227: Add the pull support method to SyncService, stub out some more tests, and add AuditToken related TODOs in appropriate places 37229: Pull unit tests 37237: CloudSync: ALF-14358 - REST API to get SyncSet Changes - list of target nodeRefs (with changes) for a given ssdId 37238: CloudSync: ALF-14312 - REST API to get SyncSet Manifest 37248: ALF-14287: Fixes Cloud Folder picker to work with real cloud instance. 37249: Minor revision bump on JSON-Simple, and attach the source 37251: Implement AuditToken, initially taking SyncChangeEvent objects and storing just the full list of audit IDs for them. AuditToken handles the JSON serialization itself, with the Transport delegating. Adds unit tests 37262: ALF-14287: Fixes handling for invited networks 37277: SyncTrackerComponent.pullSyncSet - runAs syncCreator 37283: ALF-14287: Fixes bug when folder picker is loaded repeatedly. 37285: Store OtherNodeRef as String on the cloud end. 37286: Pass-Through URLs are decoded in the surf layer, so re-encode before requesting 37290: Tweak URL encoding used to not escape / 37294: Update teh json-simple dependency definition to match change yesterday 37306: Update jar names in build files which hard code things 37309: CloudSync: ALF-14358 - REST API to get SyncSet Changes - list of target nodeRefs (with changes) for a given ssdId 37310: SyncTrackerComponent.pullSyncSet - TEMP change to determine/set the sourceNodeRef ... 37314: Fixes build so that it adds client side cloud files to documentlibrary actions js 37316: Stub out the webscript for accepting the confirmation of a pull 37319: Add method to "confirm" (delete) audit ids from an AuditToken 37322: Sync tracker component - Error processing for missing sync set owner 37324: API updates for the Pull Confirm, and start on the transport 37325: Fix compile error - apparent fallout from r37322 (missing svn up ?) 37331: Implement the confirm pull logic in the webscript (calls SyncAuditService to do the real confirmation), and start on unit test for this (more to follow tomorrow) 37342: Minor: SyncTrackerComponent 37349: SyncTrackerComponent.pullSyncSet 37355: CloudSync: SyncTracker - minor: debug logging is quiet when nothing to do ... 37365: CloudSync: ALF-14358 - REST API to get SyncSet Changes 37367: Ongoing work to SyncTrackerComponent. 37376: cloud sync - TODO comment updates 37379: ALF-14292 - Refactor cloud sync status code. 37380: WIP - Doc Lib Synced Content Filters 37381: WIP - View in cloud URL wrapper. 37438: CloudSync: ALF-14358 - REST API to get SyncSet Changes 37440: CloudSync: possible fix for failing unit test (SyncAuditServiceIntegrationTest.queryForSsdManifestAndDetails) -> disable jobs(sync tracker) 37442: CloudSync: temporarily comment out CloudTransportWebScriptsTest.testConfirmPull unit test (NB is updating + fixing) 37446: ALF-14396CloudSync: PULL - fix source modifier (currently appears as "System User") 37461: Add equals method to allow easier unit testing, and a toString to help with debugging 37462: Fix up the confirmPull transaction handling to solve the test failure, then expand out the unit testing to cover this new code 37463: Set conflicted aspect on local node after pull conflict. 37474: Fixes: ALF-14427: Adds missing icon for multi-select sync action. 37476: ALF-14425 - When a synced node is copied, its syncSetMembeNode aspect must not be copied 37486: Start of sync transport refactoring to support pushing conflict and unsync details 37489: Enhances Balloon dialogue to detect other balloon pop ups and hide them to prevent overlapping balloons. 37490: Initial transport support for pushing the details of a conflict over. (Tests to follow) 37494: ALF-14289: Adds Conflict Icon and Balloon. 37495: Stub out un-sync and push conflict tests, full checks to follow 37496: Rework to SyncTrackerComponent to deal with conflicts only on pull. And lock against push and pull of the same node at the same time. 37500: CloudSync: ALF-13948 / ALF-14404 - F29 (Unsync) 37501: Correction to previous check in. 37504: Add unit tests for un-sync and delete 37505: CloudSync: remove obsolete OnPremiseSyncJob (superceded by push/pull jobs) 37507: Unit tests for Push Conflict 37511: Fix for ALF-14428. Metadata are not extracted for synced nodes. 37512: ALF-14279: Displays remote path, including network, site and document. (WIP: Links still need fixing...) 37513: Addendum fix to ALF-14428. Now also sending cm:author and cm:geographic metadata 37520: CloudSync: ALF-13948 / ALF-14404 - F29 (Unsync) 37522: ALF-14283: Missed file from previous commit 37527: SyncTrackerComponent - removed node locking. Realized it was not cluster safe - so the stuff has to work without locking. I think it does now. 37528: ALF-14396 CloudSync: PULL - fix source modifier (currently appears as "System") 37530: Cleans up the cloud folder picker init & removes bug with -default- getting sent as the networkId during SSD create. 38659: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/V4.1: 36246: Start to wire up the transport and on-cloud services 36250: Interface change to SyncService + beginnings of implementation. 36251: Tweak webscript definitions, and add comments to explain a few bits 36253: Start on unit tests for the transport - test framework and suitable mock services for testing 36257: Start on the sync transport unit tests 36258: Bit more on the cloud transport testing, and disable the bit for now that depends on more of the transport being implemented 36261: Sync Service - More implementation. 36280: Added aspect sync:synced to remember when we last successfully synced. 36288: Implement a few more bits of the transport service, fix the way the charset and boundary information is sent, and a bit more of the tests 36293: Nobble the sync webscripts in the unit test to use our mock service, then expand the tests to query+check the mock for what was sent through 36305: First unit test of SyncService.create method. 36315: Update the method signature on SyncAdminService, to match the pattern used by the other services WRT cloud credentials. Then, fix up credentials related TODOs in the service and webscript, and fix tests to match 36319: Test basic integration between sync-sets and the cloud sync transport 36353: Support for encoding and decoding non-content properties, and content properties which have been removed 36359: ALF-13960. Partial implementation. REST API for the creation of SSDs on the Cloud. 36360: Versions of the CloudConnector and CloudSyncOnCloud services suitable for unit tests 36396: Tweak exception inheritence to better fit with transaction rollbacks, and finish the sync occurr/proceed unit tests 36400: Expand the push sync unit test coverage, to include aspects and properties 36401: adding toString method for better debug. 36402: Sync Service: event suppression working so create method now does not report false conflicts. 36403: More sync push tests, content parts still TODO 36410: Fix for failing test cases on Bamboo. 36414: Finish the push content unit tests, including a fix for a missing runAs, and an option not to tidy up temp files immediately so that the unit tests can still find their contents after the transaction 36415: Add unit tests for SyncServiceImpl delete and remove from sync set. 36417: Tweak to SyncAudit event disabling - centralised in SyncChangeMonitor. Required for upcoming changes in SyncAdminService 36420: Preventing auditing of SSD_CREATED when creating Cloud SSDs. 36429: Impl of ALF-14147. Create a CloudSync subsystem. 36439: SyncService - unit test for update. 36462: SyncService Impl - added tests for update content and setting cm:modified + fix for update which forgot to set modified. 36557: Adding audit ids to SyncNodeChangesInfo. Part of ALF-13962. 36558: ALF-13962 Some utility methods on SyncChangeEvent. 36559: ALF-13962 Methods on SyncAdminService to check node membership. 36561: ALF-13960 Ensure that syncsetdefinitions are created in a transaction. 36567: ALF-13962. Conversion of audit entries into required SyncNodeChangesInfo object. 36568: ALF-13962. package-info documentation. 36571: ALF-13962. Expose the properties/aspects configured for tracking - as required by SsmnChangeManagement. 36573: ALF-13962. Addition of extra property in sync model. 36575: ALF-13960, ALF-13961, ALF-13963 36586: Avoid sending dummy credentials when creating a sync set, as real ones are now supported 36644: Fixes syntax error when files are concatenated. 36807: Mark manually merged change 36812: CloudSync: ALF-14250 - record source repo id (related to SSD) with all sync audit entries 36848: CloudSync: ALF-14250 - record source repo id (related to SSD) with all sync audit entries 36856: ALF-14270 Ensure that the sync:syncSetDefinition QName is forcefully created during system startup. 36865: When storing cloud credentials, return information in the json to distinguish the two failure cases 36866: When storing cloud credentials, return information in the json to distinguish the two failure cases 36878: ALF-14270 Move the call to create the remote SSD from the audit event-handling code to a synchronous call within SyncAdminService.createMasterSyncSet() 36897: Adds ALF-14286: Shows user a "validating" message whilst the auth details are being validated. 36903: CloudSync: ALF-14250 - record source repo id (related to SSD) with all sync audit entries 36914: ALF-13961 Minor tweak ro OnPremiseSyncJob (runas in order to have valid SecureContext). 36916: Start to rename CloudSyncTransportService to CloudSyncMemberNodeTransport 36918: Define the SSD Transport Service 36919: Comments out UI toggles for features that don't (yet) exist deeper down the stack. 36921: ALF-14297 This check-in completes the tests for change log entry aggregation and adds detection of non-uniform NodeRefs 36924: Work in progress on sync push and pull jobs 36926: Stub out a dummy implementation of CloudSyncSetDefinitionTransport. (Needs remote webscripts and service calls before it can be properly implemented) 36931: Fix an autounboxing NullPointer error. 36937: ALF-14262 CloudSync: fix failing test cases for CLOUDSYNCLOCAL2 branch 36955: CloudSync: ALF-14298 - SyncAuditService: provide query to get ssd manifest for a given sourceRepoId 36967: Fix CloudTransportWebScriptTest unit tests - contract is null not empty 36975: Some useful collection helper methods that I'm about to use elsewhere. 36979: ALF-14297 Build fix. Refactor of SsmnChangeManagement to respect SyncNodeChangesInfo's use of null collections for 'no change' 36980: Ensure audit entries are deleted on push (old sync job) 36987: Push Job work in progress. 37017: CloudSync: ALF-14312 - REST API (for SyncAuditService) - query to get SyncSet Manifest 37028: Changes to SsmnChangeAggregation so that the ContentReaders are set correctly. 37029: Fixes to failing test cases. 37035: CloudSync: ALF-14298 / ALF-14312 - SyncAuditService: provide query to get SyncSet manifest 37049: Fix failing rest unit test - wire the Mock Cloud Connector up to the WebScripts too, not just the services 38655: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/V4.1: 35946: Do not merge - dev helper webscript for checking chunking and multi-part requests are behaving correctly 36016: Miscellanous minor improvements as part of tidyup. 36017: Trivial changes to non-product code for demo. 36088: Stub out how content changes will be handled 36116: Version Labels, Stub (with a bad name...) service to check about sync allowed + intervals, and much more of the encode/send/webscript/decode code 36157: SyncService methods - no-op implementation. 36163: Fix typo in url generation 36167: adds View In Cloud action 36171: Support sending and getting the local and remote parent noderef (especially important for create) 36175: Add json helper methods for common types 36181: First cut of aspect sync:conflict to mark conflicted nodes. 36182: Extend SyncService API. 36195: Transport support for the list of aspects added/remove 36201: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/CLOUDSYNCLOCAL2: 36193: Pull out the Thread-local HttpClient creation from RemoteClient, and expose. Will go back into Surf at some point 36194: Convert to using the ThreadLocal HttpClient instances, and some extra steps to ensure we always tidy up after ourselves now the instance is shared 36205: Update Services to match new plan agreed yesterday, and start to wire the implementations up to the work Mark is doing 36207: Finish the initial version of the sync push webscript, which largely uses other services to decode the request and have it actioned 36208: Initial support for wrapping a delete/unsync call with all the details, before passing on to the SyncService to perform 36209: Refactor the push webscript, so most of the logic for decoding the request is in a parent class, and then stub out the delete / unsync webscript built on top of the new common abstract parent 36212: Build fix. 36213: Trivial tweaks to test code. 36214: Cleanup of temporary nodes created during test execution. 36215: Changing syncChangeMonitor behaviour binding to onBootstrap rather than during spring init. 36216: Moved audit model for SyncChanges into an enterprise folder. 36217: Build fix (2) 38653: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/V4.1: 35543: Start on the Enterprise/Cloud simple Tenancy information webscript 35551: Make it easier to override bits of TenantInformationGet 35629: Mark merges that have been done 35638: Mark merges that have been done 38651: Mark revisions which were implicitly merged via 4.0bf 38646: Mark revisions which were implicitly merged via 4.0bf 38643: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/V4.1: 35959: Stub out part of the cloud sync transport code and webscripts, which will handle getting changes between the on-premise and cloud repos 36005: UI Updates for Cloud Sync Sprint 2: - Node Path Webscript (WIP) - Adds Sync Status Webscript - Adds Unsync option - Tweaks Doc Lib Indicator action call to include target element (makes it easier to position balloon dialogues). 36006: Start on implementing the transport code, and a few tweaks to the plan as identified by the implementation so far 36013: Broadened the aspect behaviour binding so that it captures all relevant aspect addition/removals. 36015: Missing class from previous checkin (36013) 38642: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/V4.1: 35690: Merged BRANCHES/DEV/V4.0-BUG-FIX/ to BRANCHES/DEV/CLOUDSYNCLOCAL2: 35689: Add the NameSpace constants for the Links model 35697: Improve Network detection, and avoid passing the network parameter on the URL to the cloud 35701: Enable another URL for passthrough 35713: Filling out the data in the REST APIs for POST & GET SyncSetDefinition. 35717: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/CLOUDSYNCLOCAL2: 35716: Make overriding just the Share URL easier (needed for Cloud installs) 38641: Mark r35681 as already merged 38640: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/V4.1: 35615: Cloud Sync: Fixes URLs to temporary APIs. 35642: Mostly implementation of syncsetmembership.delete. 35644: Fixing a failing test case. More fixes to come... 35662: Cloud Proxy Pass-Through for /slingshot/doclib2/node as /cloud/doclib2/node 35681: Merged BRANCHES/DEV/V4.0-BUG-FIX/ to BRANCHES/DEV/CLOUDSYNCLOCAL2: 35679: Fix DataList QName hard-codings by pulling out to a proper Model Java Constants Interface 38639: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/V4.1: 35508: Sync Audit Service progress. 35509: Fixing up some broken imports, no other changes. 35510: Add some debug logging to the cloud connector service, and expand the WebScriptPassThrough tests and underlying auth helper 35544: Remove accidental property change in last commit 35561: Support proxying the Tenant Information webscript to the cloud as the current user 38637: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/V4.1: 35440: Better handling of requests with no request body 35441: More Cloud Connector Pass-Through unit tests, including a dummy webscript (test only) which can be used to check who a request was proxied as 38636: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/V4.1: 35385: Stop aliasing local webscripts into cloud urls, we now have the proper pass-through proxy 35387: Allow Enterprise Remote API tests to see Enterprise WebScripts - fix the Enterprise Remote API classpath in Eclipse, and add BaseEnterpriseWebScriptTest which brings up the server including the entprise context file 35403: REST Unit Test for the Cloud Credentials CRUD WebScripts, and stub out the Cloud WebScript Pass-Through unit tests 35436: Extends Doc Lib indicator config to support javascript actions on icon click 35437: WIP: Indicator config, i18n string and stub function for Cloud Sync status display. 35439: Support a special TESTING method, and have requests done explicitly as Guest if no cloud credentials exist 38635: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/V4.1: 35333: Start on enabling the Cloud Proxy PassThrough for certain key webscripts that the UI needs 35363: Adjusts credentials success check following a change in the API last week. 35382: Adds ability to delete Cloud credentials from the My Profile page. 35383: Removes unused Sync Now function 35384: Adds cloud folder picker JS to combined action files so that sync works without debug mode. 38634: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/V4.1: 35238: Implement the Cloud Credentials Get webscript, powered by the new services, and provide a cloud webscript helper superclass 35282: Cloud Sync Audit. 35283: Enable the credentials get/set webscripts to work (fixing an authentication issue), and initial work on proxy webscript 35287: Cloud Sync Audit. Support for deletion of Sync Audit entries. 35315: Service, WebScript and tests for deleting remote ticket based and cloud credentials 38633: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/V4.1: 35236: Add the CloudConnectorService, which wraps the underlying remote services in a cloud specific way (base url, system id, key etc) 38623: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/V4.1: 34882: First cut of SyncChangeMonitor feature. 35027: Adds ability to select target network & plumbs in the options, makes it easy to add more options. 35110: Adds support for hasAspects and notAspects attributes to Doc Lib multi-item select. 35113: Cloud-Sync: Adds multi-file sync action. 35122: A big chunk of Sync Audit Service work. 38622: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/V4.1: 34717: Merged BRANCHES/DEV/CLOUDSYNCLOCAL to BRANCHES/DEV/CLOUDSYNCLOCAL2: 34403: Adds DocLib action, indicator config and labels, along with start of evaluator config. 34404: Adds action implementation & cloud folder picker alfresco module, with template webscript. Modifies build to include new js file in concatenated doclib action file. 34405: Modifies the Global File picker to make the API calls more extendable (e.g. for use in Cloud Sync). 34481: Adds ability to enter cloud auth details from user profile page. Needs a little bit of refactoring once the APIs have been finalised 34482: Adds Work In Progress on Cloud Auth prompt 34667: WIP: Mocked up APIs - formats mostly merged from demo 34687: Initial cut of part of SyncAdminService which manages CRUD of SyncSetDefinitions. 34688: The most basic documentation the webscript. 34693: Action and Indicator icons from Linton 34694: Inline Cloud Auth Details Dialogue 34695: Cloud Synced Indicator updates 34714: Creates sync set when a folder is chosen. 34744: Fixes bug where multiple actions were triggered for each successive click on the Cloud Sync action 34745: Updates Evaluator with name of actual aspect applied to items in a sync set. 34757: Merged HEAD to BRANCHES/DEV/CLOUDSYNCLOCAL2: 34289: Upgrading JUnit lib to 4.10 to get full Rules support. 34317: Some initial documentation on JUnit Rules samples. 34328: More JUnit rules fun. Added a new rule to help with the creation and automatic cleanup of temporary test nodes. 34759: Merged HEAD to BRANCHES/DEV/CLOUDSYNCLOCAL2: 34290: Fixing Eclipse settings following on from previous JUnit lib upgrade. (rev 34289) 34297: Build fix. Eclipse project was still referring to the old JUnit lib. 34765: Fixes a couple of typos before today's Sprint demo. Success and error messages now correctly display following sync action. 34782: Merged HEAD to BRANCHES/DEV/CLOUDSYNCLOCAL2: 34777: Added enhancement to TemporaryNodes rule to allow for dummy content. 34806: Merged HEAD to BRANCHES/DEV/CLOUDSYNCLOCAL2: 34805: Added a convenience method to the ApplicationContextInit @Rule to allow for easier spring overriding in test code. 34825: Merged HEAD to BRANCHES/DEV/CLOUDSYNCLOCAL2: 34824: Utility methods to get details of property changes (map comparison). 38619: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/V4.1: 36805: Tweak exception inheritence to better fit with transaction rollbacks 36806: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/DEV/V4.0-BUG-FIX: 36556: A useful collection conversion utility method. 38616: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/V4.1: 36366: Tweak to implementation to ensure that on-authentication-failed, the status is updated within a r/w transaction. 36374: Provide more specific exceptions from the Remote Connector Service for client and server errors 37348: ALF-14386 - RemoteConnector: NPE if responseBody is null (eg. HTTP 204) 37411: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/CLOUDSYNCLOCAL2: 37410: ALF-14386 HttpClient returns a null byte array if there is no response body (eg 204), swap that for an empty array to avoid NPEs and better fit the interface contract 38559: Merged PATCHES/V4.0.2 to V4.1 38364: Merged V3.4-BUG-FIX to PATCHES/V4.0.2 36421: ALF-14914: Fix for Mac Lion versioning issue. ALF-12792 (Part 1 of 2) Enable the InfoPassthru and Level2Oplocks server capability flags, InfoPassthru is the flag that fixes the Mac Lion versioning error. Added support for filesystems that do not implement the NTFS streams interface in the CIFS transact rename processing, for the Alfresco repo filesystem. 36422: ALF-14914: Fix for Mac Lion versioning issue. ALF-12792 (Part 2 of 2) Enable the InfoPassthru and Level2Oplocks server capability flags, InfoPassthru is the flag that fixes the Mac Lion versioning error. 36423: ALF-14915: Add support for file size tracking in the file state. ALF-13616 (Part 1 of 2) 36424: ALF-14915: Fix for Mac MS Word file save issue. ALF-13616 (Part 2 of 2) Added live file size tracking to file writing/folder searches so the correct file size is returned before the file is closed. 36491: ALF-14915: Added CIFS transact2 NT passthru levels for set end of file/set allocation size. ALF-13616. Also updated FileInfoLevel with the latest list of NT passthru information levels. 36703: ALF-14916: Fix for Mac Office 2011 Powerpoint save fails on CIFS. ALF-13615. 38367: Merged V4.0-BUG-FIX to PATCHES/V4.0.2 37630: Process queued responses at the end of the thread request run, before re-enabling socket read events. ALF-14179, ALF-14180. 38368: Merged V4.0-BUG-FIX to PATCHES/V4.0.2 37067: ALF-13294 CIFS: When versionable aspect is active, using the Microsoft Word for Mac 2008 option "always create a backup copy" leads to document versions loss 38244: ALF-14785: Merged V4.0-BUG-FIX to V4.1 37482: ALF-14437: Merged HEAD to V4.0-BUG-FIX 37388: ALF-13545: First attempt at digitally signing the Windows installers 37391: ALF-13545: Fix quoting and output directory specification 37393: ALF-13545: Correct deployment installer signcode command git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@40271 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2012-08-10 07:55:53 +00:00
Dave Ward	dbb11a5ce2	Merged V4.0-BUG-FIX to HEAD ... 35366: Fix for ALF-13542 - Notification is not displayed, when you try to create duplicate user. 35538: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/V4.0-BUG-FIX: (pre-req for ALF-13791) 35410: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: - fix merge issue (compilation fix) 35443: Merge build/test fix (record-only) 35463: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30194: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: 29718: ALF-6029: Additional MT fix to force default tenant 29719: THOR-7: Create tenant 35541: Fix for ALF-13723 SOLR does not include the same query unit tests as lucene - added base tests 35547: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/V4.0-BUG-FIX: (ALF-13791) 35511: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30252: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: 29763: THOR-107: MT-aware immutable singletons 29766: THOR-107: MT-aware immutable singletons 29768: THOR-31: MT-aware shared cache 29770: THOR-107: MT-aware immutable singletons 35512: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30253: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: 29771: THOR-31: MT-aware shared cache 29777: THOR-107: MT-aware immutable singletons 29786: THOR-107: MT-aware immutable singletons 29787: THOR-31: MT-aware shared cache (fix MultiTNodeServiceInterceptorTest) 29799: THOR-107: MT-aware immutable singletons 35513: Merge build/test fix 35516: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/CLOUD1: 30026: THOR-5: tenant-aware caches 35517: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30260: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: (core) 29860: THOR-73: prep for HEAD sync/merge-forward 29866: THOR-73: prep for HEAD sync/merge-forward 30026: THOR-5: tenant-aware caches 35520: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30297: THOR-73: Line-endings only 30298: THOR-73: Line-endings only 30300: THOR-73: fix ActivitiWorkflowServiceIntegrationTest 30302: THOR-73: fix SubscriptionServiceActivitiesTest 35528: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30459: THOR-156: prep - consolidate/improve get current user's tenant domain 30469: Fix bootstrap config check when running unit tests (where one tenant already exists) (partial merge only) 35565: MT: fix update tenant entity - pre-req for ALF-13757 35567: Fix merge fallout (compile error) 35569: ALF-13757: MT - minor patch to migrate existing tenants, if any (when upgrading) 35592: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/V4.0-BUG-FIX: (ALF-13791) 34153: Minor: THOR-5: MT-aware immutable singletons (spp/vti) 35598: ALF-11459: Added null-check on in-flight process diagram-generation to prevent error when running headless 35604: ALF-13426 Transformation: DOCX conversion failure <<< Fix split into two parts to make merge of this general part to 3.4.10 simpler. >>> <<< The second part contains 4.0.x specific changes. >>> - Change to ContentServiceImpl to fail over to other available transformers on error (can be turned off with global property content.transformer.failover=false). 35605: ALF-13426 Transformation: DOCX conversion failure <<< Second part >>> - Remove explicit transformation sections for OOXML (added in 4.0.1 ALF-12461) as these are stopping other transformers from being used. Was done originally as a copy paste from another bean that needed an explicit section. - The combination of allowing other transformers (that were used prior to 4.0.1) and fail over from OOXML to these transformers allows to docx fixes that do and do not contain an embedded image to be transformed to png. 35608: fix build 35609: Merged V3.4-BUG-FIX (3.4.10) to V4.0-BUG-FIX (4.0.2) RECORD ONLY 35607: Merged V4.0-BUG-FIX (4.0.2) to V3.4-BUG-FIX (3.4.10) 35604: ALF-13426 Transformation: DOCX conversion failure <<< Fix split into two parts to make merge of this general part to 3.4.10 simpler. >>> <<< The second part contains 4.0.x specific changes. >>> - Change to ContentServiceImpl to fail over to other available transformers on error (can be turned off with global property content.transformer.failover=false). 35619: ALL LANGUAGES: Translation updates based on EN r35407 35630: Merged HEAD to BRANCHES/DEV/V4.0-BUG-FIX: 34289: Upgrading JUnit lib to 4.10 to get full Rules support. 34317: Some initial documentation on JUnit Rules samples. 34328: More JUnit rules fun. Added a new rule to help with the creation and automatic cleanup of temporary test nodes. 34777: Added enhancement to TemporaryNodes rule to allow for dummy content. 34805: Added a convenience method to the ApplicationContextInit @Rule to allow for easier spring overriding in test code. 35621: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to HEAD: 35620: More JUnit Rules Enhancements, covering well known nodes and easier context loading 35631: Fixing some Eclipse junit/lib dependencies which had become out of date - seemingly before my pervious commit (35630). 35640: Fix for ALF-10085 "Adding/removing CMIS Relationship changes last modified date of source object" 35647: Merged BRANCHES/DEV/DAM/V4.0-BUG-FIX-35588 to BRANCHES/DEV/V4.0-BUG-FIX: 35589: Creating new branch from $FROM 35591: Merged BRANCHES/DEV/DAM/V4.0-BUG-FIX-35195 to BRANCHES/DEV/DAM/V4.0-BUG-FIX-35588: 35196: Creating new branch from $FROM 35338: ALF-13734: Move Additional DocumentList Methods to DocumentListViewRenderer - Moved tooltip to simple viewRenderer 35340: ALF-13734: Move Additional DocumentList Methods to DocumentListViewRenderer - Moved fnRenderCellSelected logic to DocumentListViewRenderer - Moved fnRenderCellStatus logic to DocumentListViewRenderer - Moved fnRenderCellDescription logic to DocumentListViewRenderer - Moved fnRenderCellActions logic to DocumentListViewRenderer 35346: ALF-13734: Move Additional DocumentList Methods to DocumentListViewRenderer - Moved onEventHighlightRow logic to DocumentListViewRenderer - Moved onEventUnhighlightRow logic to DocumentListViewRenderer - Moved onActionShowMore logic to DocumentListViewRenderer - Minor private method renaming 35427: ALF-13734: Move Additional DocumentList Methods to DocumentListViewRenderer - Changed check for display of metadata banners and lines to more explicit bannerView and lineView properties which are set to the viewRenderer's name by default, but can now more easily be overridden 35503: ALF-13734: Move Additional DocumentList Methods to DocumentListViewRenderer - Renamed bannerView property to more specific metadataBannerViewName - Renamed lineView property to more specific metadataLineViewName 35583: ALF-13734: Move Additional DocumentList Methods to DocumentListViewRenderer - Added rowClassName property to make finding the row easier in cases where an event trigger element might not be the row itself - Added check for expected row element class name in getDataTableRecordIdFromRowElement, if not present trying getAncestorByClassName with rowClassName property - Moved onFileRenamed to DocumentListViewRenderer - Changed fnActionHandler to use getDataTableRecordIdFromRowElement rather than target.offsetParent - Changed onLikes to use getDataTableRecordIdFromRowElement rather than assume the row parameter is the correct element - Changed onFavourite to use getDataTableRecordIdFromRowElement rather than assume the row parameter is the correct element 35610: ALF-13734: Move Additional DocumentList Methods to DocumentListViewRenderer - Changed method of grabbing container element in selectFiles to use parentElementIdSuffix from current viewRenderer 35650: Fix for ALF-13813 SOLR fails for fuzzy queries 35651: Fix tests for ALF-13813 SOLR fails for fuzzy queries More for ALF-13723 SOLR does not include the same query unit tests as lucene - added tests for Alfresco fts run via the request handler - fixed fuzzy query tests so far ... - report queries that generate errors 35664: ALF-13294 - CIFS: When versionable aspect is active, using the Microsoft Word for Mac 2008 option "always create a backup copy" leads to document versions loss 35679: Fix DataList QName hard-codings by pulling out to a proper Model Java Constants Interface 35689: Add the NameSpace constants for the Links model 35699: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/DEV/V4.0-BUG-FIX: 35698: New WebScript to provide the Share View URL for a given NodeRef (based on the Node Type and SysAdminParams) 35716: Make overriding just the Share URL easier (needed for Cloud installs) 35741: ALF-13819 Remove description+template for a controller-less webscript that was committed by mistake in v3.4 35765: Fixed version of junit.jar in build files 35772: ALF-1994 - Allow user defined white-list of HTML tags for HTML sanitisation process. Spring config added for tags and attributes. 35781: Fix for MySQL part of ALF-13150: Performance of Purging Empty Transactions (like 10M) ALF-13839: MySQL: "Failed to purge txns" from DeletedNodeCleanupWorker - Added MySQL override of the NodeDAO for this call with a dedicated DELETE ... JOIN ... for MySQL 35784: Fix for ALF-13845 SOLR "alfresco" queries are not cached correctly 35785: More for ALF-13723 SOLR does not include the same query unit tests as lucene - duplicated sort and AFTS tests from the lucene sub-system - run queries via request handler - addded new locale tests for d:text ordering 35805: ALF-13828 Method name typo, should be getThumbnailDefinitions not getThumbnailDefintions. (Old method retained, @deprecated, for backwards compatibility) 35806: More debug to setFileInformation 35836: Fix for ALF-13794 Mismatch in SOLRAPIClient and NodeContentGet webscript causes content of type d:content not to get indexed 35862: Fix for ALF-13826 Solr CMIS Query After Delete a Node Throws CmisRuntimeException: Node does not exist - make appropriate methods aware of node existence.... 35867: ALF-13886 Certain errors may lead to no conn model object being available, so check it is there before using it to render the "Return to folder" link 35901: ALF-13474 possibility of deleting compleded workflows + explorer ui cancel action fix 35923: Fix for ALF-13724 Share folder permission management - changes to parent/child folders not accurately reflected 35936: More for ALF-13723 SOLR does not include the same query unit tests as lucene - tests for mltext localised collation 35944: BufferedContentDiskDriver needs to use deviceName and sessionKey to make it unique rather than userName 35949: ALF-13755: MT is configured (but not enabled) by default - note: also related to THOR-248 (effectively means that r31407 becomes a merge record-only) 35951: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/V4.0-BUG-FIX: 34107: record-only (follow on to r35949 - see ALF-13755 / THOR-248) 35953: ALF-12792 - Creation Date and Modification Date initialization for open files. 35968: Follow up to fix for ALF-13839: MySQL: "Failed to purge txns" from DeletedNodeCleanupWorker - Sanity check highlighted transactional resource block in the database - Each cleanup runs its own transactions as required now - See also ALF-13150: Performance of Purging Empty Transactions suffers if the number of unused transactions grows too large (like 10M) 35970: Merged BRANCHES/DEV/DAM/V4.0-BUG-FIX-35924 to BRANCHES/DEV/V4.0-BUG-FIX: 35925: Creating new branch from BRANCHES/DEV/V4.0-BUG-FIX 35966: ALF-13912: Move DocumentList.onHighlightFile UI Logic to DocumentListViewRenderer - Moved DocumentList.onHighlightFile logic to DocumentListViewRenderer - Added DocumentListViewRenderer.getRowElementFromDataTableRecord and DocumentListViewRenderer.getRowSelectElementFromDataTableRecord - Changed onHighlightFile to call those new getRow* methods for easier reuse in view renderer extensions 35979: ALF-10278, ALF-13902: Ending task now done with the right assignee when unassigned (eg. not claimed from pool) or when workflow-owner completes the task assigned to someone else, without claiming first 35981: Fix for ALF-12670 - An exception occurs during creation wiki page Changed Wiki title field limit to the 100 char limit imposed by QName which unfortunately is used by the underlying service to store the field title. 35991: ALF-13901: Incorrect workflow-history gathering/displaying on uncompleted tasks in ended parallel multi-instance activity 35993: ALF-10278, ALF-13902: Fixed failing test (was not using AuthenticationUtil for test-user) 36001: BDE-69: create test-minimal and continuous-minimal Ant targets 36004: Fixes for: ALF-12813 - jsonUtils.toJSONString mangles up Associative Arrays - Added support for nested Java Map/List to jsonUtils ALF-13647 - the first time a ICAL calendar URL is called with kerberos SSO a JSESSIONID cookie is not sent by the client, request fails with a 500 Internal server error - Support for "negotiate" HTTP auth header and general improvements to that area ALF-13877 - Invalid WebScript URLs cause ERROR-level exception stacks - DEBUG only output for "missing" webscripts and invalid API call URLs 36014: ALF-13844: XSLT Filtering Not 100% Secure - added more namespaces to the security filter. - verified that include/import uses the security filter. 36018: ALF-13609: Enterprise installers lay down sample site and users -Added feature to SiteLoadPatch to disable loading. -Added property "disable.sample.site". Set property (system or otherwise) disable.sample.site=true to skip loading the sample site on a new installation. 36031: debug improvement. 36039: ALF-13779: isPooled() implemented correctly now 36044: ALF-13770: Merged V3.4-BUG-FIX (3.4.10) to V4.0-BUG-FIX (4.0.2) 36043: ALF-13769: Merged V3.4.8 (3.4.8.7) to V3.4-BUG-FIX (3.4.10) 35776: ALF-11535 Home Folder Synchronizer fails when destination folder already exists - Don't move home folders that are the same as the provider's root folder or even above it! If the same, these tend to be shared folders. If above, this indicates that an LDAP sync has corrupted the original provider name and has hence changed what we think is the root folder! 36046: ALF-13745: Merged V3.4-BUG-FIX (3.4.10) to V4.0-BUG-FIX (4.0.2) <<< Also added placeholder thumbnails (copies if docx, pptx and xlsx which in turn appear to be copies of the 2003 doc, ppt and xls) >>> 36041: ALF-13667 Additional OpenOffice mimetypes to be added to the mime-type maps - Added mimetypes for docm dotx dotm pptm ppsx ppsm potx potm ppam sldx sldm xltm xlsm xltm xlam xlsb - Added transformation limits to avoid very long running tasks. - Disable Jod and OpenOffice transformers via PDFBox for new types to txt, as there are better options with the exception of potm and xlsb that can only be done by Office. - TransformerDebug include max source size in available transformer list 35958: ALF-13745 Add Support for Microsoft Word File Format DOCM << General TransformationOptionLimits change >> - Addition of TransformationOptionLimitsMap to make it simpler to add lots of TransformationOptionLimits. Only one per line rather than about 10 - Needed for this JIRA as lots of limits are needed - Changes to transformerDebug to make it more obvious which transformers are excluded 36047: Fix for ALF-13925 - UsernamePropertyDecorator incorrectly handles displayName construction 36048: More for ALF-13723 SOLR does not include the same query unit tests as lucene - tests and fixes for internal fields 36061: Fix remoteapi tests by putting back repository tests before, where they belong 36064: ALF-13682 'View Process Diagram' not working if auditing is turned on - modified Auditable annotation on the getWorkflowImage() method which was returning an InputStream so we would not consume the input again. - modified AuditMethodInterceptor to ignore any InputStream and OutputStream values. Implemented as a list of non aubitable classes. Refactored generation of auditable arguments and return value to a method rather than two almost identical in-line copies. 36065: ALF-13756: MT - replace Tenant attributes with Tenant table - update schema comp files for x5 DBs - note: will need to be tested in DB build plans (via schema comp -> when fail on error is enabled) 36066: ALF-13609: Enterprise installers lay down sample site and users -Removed extraneous line of code. -Renamed boolean to "disabled" and associated accessors. -Added property "sample.site.disabled=false" to repository.properties. -To disable loading of the sample site on a new installation, set property (system or otherwise) "sample.site.disabled=true" 36080: Merged BRANCHES/DEV/DAM/V4.0-BUG-FIX-36070 to BRANCHES/DEV/V4.0-BUG-FIX: 36071: Creating new branch from BRANCHES/DEV/V4.0-BUG-FIX 36079: Merged BRANCHES/DEV/DAM/V4.0-BUG-FIX-35924 to BRANCHES/DEV/DAM/V4.0-BUG-FIX-36070: 36069: ALF-13935: Move DocumentList Upload Indicators and Instructions to DocumentListViewRenderer - Created renderEmptyDataSourceHtml method in DocumentListViewRenderer which contains the view logic previously in _setupDataSource - Created _setEmptyDataSourceMessage which actually appends the constructed empty HTML instructions for cases where extensions simply want the same instructions but in a different container - Added firing of Bubbling event postSetupViewRenderers at the end of _setupViewRenderers since all viewRenderers now have to be registered before _setupDataSource is called 36085: More for ALF-13723 SOLR does not include the same query unit tests as lucene - internal fields - paging - security filters 36089: ALF-11725: Replication document with comment fails due to integrity exception - updated script transfer service. 36094: ALF-11725 : config change. 36098: ALF-13719: Javascript addAspect(aspect, properties) does not apply cm:autoVersionOnUpdateProps property value 36105: SESURF-102: Fix dependency handling when use-checksum-dependencies is not enabled. 36107: Tweak wiki page create/update logic, to handle clearing the tags when updating a page when all tags are removed (ALF-10979) 36109: ALF-7874 MimeType definitions for Adobe AfterEffects files 36110: ALF-7874 Upgrade Tika for improved detection of Adobe Premier and AfterEffects 36112: ALF-7874 MimeType definition addition for Adobe Premier files 36133: Merged DEV to V4.0-BUG-FIX 36130: ALF-13988 : apply_amps script no longer works on Mac OSX apply_amps.sh was corrected to resolve "readlink -f" Mac OS problem. 36135: ALF-12330: Editing of completed task now redirects to referring page (if available) + transition-buttons not rendered on completed tasks 36141: Merged V3.4-BUG-FIX to V4.0-BUG-FIX 35641: ALF-13452: Open office startup from Java not working on OSX - Fix from Bitrock in combination with new wrapper in BINARIES 35687: ALF-13520: alfresco.log file ending up in system32 directory - Not anymore! 35736: ALF-13751: Reduce over-agressive traversal of child associations when detecting cyclic groups in LDAP sync - Recurse upwards to topmost parent then recurse downwards - No need to recurse upwards and downwards on every recursion step! 35987: Merged DEV to V3.4-BUG-FIX 35984: ALF-11850 WCM - Incorrect message when copying/cutting assets within a Web Project 1. In ClipboardBean.addClipboardNode(NodeRef ref, NodeRef parent, ClipboardStatus mode) was added check whether the node in the AVM. 2. In webclient.properties was added node_added_clipboard_avm property. 36049: Fix for ALF-9662 To allow admin user to view dashboard of moderated site. 36050: Fix for ALF-13843 - Content creation silently fails when it's being created with already existent name. 36054: Fix for ALF-13231 - Message 'Failure' on workflow cancelation 36055: Fix for ALF-13926 - Intranet compatibility options override share's settings 36102: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX 36097: Fix for ALF-13976 - 404 error handling in Share no longer correctly receives JSON response. OKed by DaveW. 36103: ALF-13578 : CIFS AlfJLANWorker threads (concurrency) - server not responding 36137: Merged V3.4 to V3.4-BUG-FIX 35433: ALF-13021: Folder deletion from Editorial not deleting from Live folder automatically - Fix by Valery - Needs further work for 4.0.x 35488: ALF-13718: Full reindex performance on SQL Server - ORDER BY on child assoc query changed to only include ID (with Derek's permission) - ADMLuceneIndexerImpl altered to not use batch loading in getChildAssocs so as not to blow the transactional caches when reindexing a large hierarchy - ADMLuceneIndexerImpl altered so that it only checks for the existence of child associations when 'lazily' creating parent containers - ADMLuceneTest corrected (with Andy's permission) so that this doesn't throw the unit test out 35505: ALF-13718: Corrected ADMLuceneCategoryTest to clear the 'real' index before creating a fake 'test' index 35809: Merged DEV to V3.4 35800: ALF-10353 : Internet Explorer hangs when using the object picker with a larger number of documents YUI library was modified to use chunked unloading of listeners via a series of setTimeout() functions in event.js for IE 6,7,8. 36101: ALF-13978: Merged V4.0-BUG-FIX to V3.4 36014: ALF-13844: XSLT Filtering Not 100% Secure - added more namespaces to the security filter. - verified that include/import uses the security filter. 36108: ALF-13978: Fixed compilation errors 36129: Merged DEV to V3.4 36123: ALF-13951 : It's impossible to customize dashboard in Alfresco Share A yui-2.8.1-patched library contains a fix for ALF-10353. 36142: Merged V3.4-BUG-FIX to V4.0-BUG-FIX (RECORD ONLY) 35432: ALF-13762: Merged V4.0-BUG-FIX to V3.4-BUG-FIX 35366: Fix for ALF-13542 - Notification is not displayed, when you try to create duplicate user. 35593: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX: 35375: Fix for ALF-13711: "Hidden Aspect applied to Mac powerpoint files." - re-instated previous hidden aspect behaviour - unit tests - also fixed cascade behaviour 36144: Merged V4.0 to V4.0-BUG-FIX 35918: 31473: -- initial commit for ALF-11027 -- enables CE / EE deployment of artifacts to a maven repository -- added necessary ant build files and build properties. -- also added a README 31474: -- added .project to svn:ignore 32534: -- added missing artifacts and fixed wrong ones -- added possibility of custom artifacts labeling (by adding -Dmaven.custom.label), e.g. to allow snapshot / release deployments from working branches -- TODO: document required ~/.m2/settings.xml 32582: -- renamed alfresco-datamodel to alfresco-data-model -- fixed release/snapshot and custom version labeling -- tested with Community, enterprise build undergoing (removed distribute-extras as pre-requisite) 32610: -- tested enterprise only deployment -- removed tabs -- fixed property placeholding -- tested all artifacts 32611: -- added maven-ant-tasks library to automatically load ant maven tasks without dependencies on the ant installation -- added typedef in the main maven.xml 35250: -- reworking on ALF-11027 to enable automated deployment of artifacts to the Maven repo -- following conversations with DaveW implemented the following: - removed classifier (just rely on different groupId, org.alfresco for Community and org.alfresco.enterprise for Enterprise) - Added debugging lines to make sure proper repo / groupId configuration is picked up - enabled SNAPSHOT/RELEASE deployment for both community and enterprise -- updated README-maven-deploy.txt with all instructions on how to run the build 35388: -- added references to Maven settings.xml in the BINARIES as discussed with DaveW 35648: [ALF-11027] Since artifact:mvn does not support settingsFile attribute, switching to embedded command line -gs parameter to specify a custom settings.xml location 35649: [ALF-11027] Since artifact:mvn does not support settingsFile attribute, switching to embedded command line -gs parameter to specify a custom settings.xml location 35652: [ALF-11027] artifact:mvn uses an older Maven version which command line switch is -s instead of -gs 35775: [ALF-11027] Removed DoD and Kofax deployment from enteprise deployment procedure 35783: [ALF-11027] removing custom README and added documentation in line of the tw maven.xml files 35793: Fix comment syntax: no -- allowed there 35802: [ALF-11027] Removed calls to DoD targets 35810: [ALF-11027] Introducing a maven-build-deploy goal to build and deploy at once, maven-deploy now "just does the job 35822: [ALF-11027] Moved the maven setup steps to a maven-env-prerequisites separate target, so it gets executed earlier and defines the task 35851: [ALF-11027] Move targets around to fix the regular, non-continuous build 35894: [ALF-11027] Add maven.do.deploy variable, to control maven deployment from bamboo using parameterised plan 35896: [ALF-11027] Using Bamboo Plan Variables properly 35899: [ALF-11027] Use Bamboo variable to specify release vs snapshot rather than deployment or not 35905: [ALF-11027] Upload source and javadoc jars into Maven repo as well 35912: Upgrade maven-deploy-plugin to 2.7, to be able to deploy Javadoc and Source jars as well 35950: ALF-11027: Fix typo in jlan-embed deployment, removed svn revision from version, removed deployment of jmx-dumper 36145: Merged V4.0 to V4.0-BUG-FIX (RECORD ONLY) 34612: Merged V4.0-BUG-FIX to V4.0 ALF-12740: Update to previous fix (only apply to IE8 and below) 34618: Merged V4.0-BUG-FIX to V4.0 34474: ALF-13169 Tomcat fails to shutdown - fix non daemon Timers 34637: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/V4.0 (4.0.1) 34636: Fix for ALF-13365 SOLR: Recently modified docs dashlet sorts incorrectly 34690: MERGE V4.0_BUG-FIX to V4.0 34226 : ALF-12780 Mac OS X Lion 10.7.2: Editing a document via CIFS and TextEdit removes versionable aspect from this file 34716: Merged V4.0-BUG-FIX to V4.0 34715: Fix for __ShowDetails desktop action returned URL is truncated if hostname too long. ALF-13202. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@36155 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2012-05-08 12:07:00 +00:00