18 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	c1d11e0f3a	Merged V4.1-BUG-FIX to HEAD ... 47745: ALF-18302: Merged V4.0.2 (4.0.2.29) to V4.1-BUG-FIX (4.1.5) 47498: MNT-317: CIFS: Image document version history lost intermittently after saving content in Preview on Mac Mountain Lion - Candidate fix by Dmitry Vaserin 47753: ALF-12264: Domain-filtering also done with new approach of fetching WorklfowTasks 47778: Merged DEV to V4.1-BUG-FIX ALF-18151: CMIS cannot delete folders that have rules applied - Will throw 'CMISConstraintException' exception only if 'ContentModel.ASSOC_CONTAINS' child association exist for the folder what is deleted. - Added and succesfully executed two unit test for openCMIS and CMIS. 47794: ALF-18302: Merged DEV to V4.1-BUG-FIX 47631: MNT-317: CIFS: Image document version history lost intermittently after saving content in Preview on Mac Mountain Lion Add class description describing the shuffle on ScenarioRenameDeleteMove. Add proper unit test. 47795: Merged back build fix from HEAD (thanks Neil) 47803: Merged PATCHES/V4.1.4 to V4.1-BUG-FIX 47680: Merged DEV to PATCHES/V4.1.4 47677: ALF-18270 Cannot open properties of model In FormUIGet.processFieldConstraints() was added check: (fieldConfig != null && fieldConfig.getConstraintDefinitionMap() != null). 47738: ALF-18301: Alfresco fails to start up because of NPE error, when debug logging for 'org.alfresco.repo.cache.AbstractAsynchronouslyRefreshedCache' is enabled - Fix by Dmitry Velichkevich 47754: Merged DEV to PATCHES/V4.1.4 47751: ALF-17644 : Document version was increased after canceling editing. Unnecessary calls for property deletion was removed. 47767: ALF-18088: Add Implementation-Edition + limit Specification-Version to 3 digits in war MANIFEST files 47786: Fixed ALF-18137 "It's impossible to create a new item in the data list." 47804: Merged PATCHES/V4.1.4 to V4.1-BUG-FIX (RECORD ONLY) 47755: Merged V4.1-BUG-FIX to PATCHES/V4.1.4 47753: ALF-12264: Domain-filtering also done with new approach of fetching WorklfowTasks git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@47807 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2013-03-08 14:10:56 +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	a794361ac2	Merged V4.1-BUG-FIX to HEAD ... 43944: Fixes: ALF-16090: fixes view mode for control param showTime. 43964: Fixes: ALF-14758. Adds distinct styling for menus nested 4 levels or deeper to prevent confusion if there's an overlap. 44029: MNT-180 - Clone for Hotfix: Word document on Windows via CIFS becomes locked (Read Only) when network drops temporarily 44040: Merged V3.4-BUF-GIX (3.4.12) to V4.1-BUG-FIX (4.1.3) 44039: Minor changes to TransformerDebug to make output more readable when there are exceptions. - NPE when there is no exception message 44046: MERGE DEV to V4.1-BUG-FIX ALF-16562 : CIFS: Excel document version history lost after saving content in Excel:mac 2011 on Mac Mountain Lion 44115: Changes to standalone file state cache access mode checks to bring them into line with the clustered file state cache. 44160: Fix for ALF-13129, checks to see if the child association already exists on the versioned node. If it exists it doesn't add it again. 44239: ALF-16977: InstallerBuilder 8.5.1 2012-11-29 with layout fix from Bitrock 44319: Latest installer translations from Gloria 44343: Merged V4.1 (4.1.2) to V4.1-BUG-FIX (4.1.3) 44339: ALF-17070: Merged to V4.1 (4.1.2) from V4.1-BUG-FIX (3.4.12) << Regression introduced into 4.0.2 on 12/4/12 r35201 >> 44337: Merged DEV to V3.4-BUG-FIX (3.4.12) 44297: ALF-16935: wcm/avm file picker fails to render selection from folders navigation only works with 127.0.0.1 url - Fix for regression from ALF-11956, connected with setting titles for file picker controls 44316: Merged DEV to V4.1 44094: ALF-16794: CLONE - Webdav: Version history lost after editing content with Mac Word 2011 in Finder Add WebDAV MOVE handling for case when backup is enabled in Mac 2011 Word 44285: ALF-16794: CLONE - Webdav: Version history lost after editing content with Mac Word 2011 in Finder Handle Mac 2011 Word backup in scope of RenameShuffle 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. 44283: Encoding fix by David Webster 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. 44252: Russian fix from Gloria 44200: Probable fix for ALF-16895 SOLR: Cannot find files after restart and reindex solr - still difficult to reproduce 44149: Merged HEAD to V4.1 44037: ALF-16947: prevent dependency to web-framework-commons war to be transitive: this artifact is not generated in Ant build 44039: Version in parent-pom was not changed properly when deploying to Maven repo 44142: ITALIAN: Translation update based on EN r43623, fixes ALF-16609 44107: ALF-16016, ALF-15991, ALF-16180: Russian fixes by Gloria 44078: ALF-16620: Out of memory Error applying CopiedFromAspectPatch - CopiedFromAspectPatch.WorkProvider.getNextWork() was fetching discrete managable chunks - and then blowing up as it continually fetched into the same in-memory HashSet! 44404: Merged DEV to V4.1-BUG-FIX 44378: ALF-16791 : resource bundle deployement for localization does not work with the dynamic approach 1. Split out MessageService message lookup methods into new interface MessageLookup that lives in DataModel 2. Added a simple implementation for SOLR to use 3. Made M2Label look up model labels via a supplied MessageLookup argument 4. Make DictionaryService extend MessageLookup so that it's easy to find a MessageLookup if you've got a DictionaryService 5. Accounted for interface changes throughout. 44421: ALF-17114: Merged V3.4-BUG-FIX (3.4.12) to V4.1-BUG-FIX (4.1.3) 44419: ALF-17045 If GhostScript is not installed, deletion of content is not working - Not just Ghostscript but any thumbnail failure 44422: ALF-16123: "CheckOutCheckInService.checkout fails with DuplicateChildNodeNameException if no working copy label message found in current locale" 44424: Merged V4.1 (4.1.2) to V4.1-BUG-FIX (4.1.3) RECORD ONLY 44423: ALF-17114: Merged V4.1-BUG-FIX (4.1.3) to V4.1 (4.1.2) - got the wrong branch 44421: ALF-17114: Merged V3.4-BUG-FIX (3.4.12) to V4.1-BUG-FIX (4.1.3) 44419: ALF-17045 If GhostScript is not installed, deletion of content is not working - Not just Ghostscript but any thumbnail failure 44447: Merged V4.0.2 (4.0.0.22) to V4.1-BUG-FIX (4.1.3) RECORD ONLY << Recording this as RECORD ONLY as it turns out the DEV code came form V4.1-BUG-FIX r42431 >> 44435: Merged DEV to V4.0.2 (4.0.2.22) 44429: MNT-232: Upgrade from 3.4.9 to 4.0.2 - FAILED - Initialize rootRefs in the property definition to prevent NPE. 44468: Merged V3.4-PATCHES to V4.1-BUG-FIX MNT-211 (Still needs implementing on 4.1) 44470: Fixes: ALF-16878 - don't use IE8's native JSON stringify method. 44511: ALF-16791: Added missing class. 44519: ALF-16791: Fixed broken unit tests 44541: Fix for ALF-17151 SOLR - add support to disable permission checks 44542: MNT-211 Re-implement on 4.1 44548: ALF-16791: Fixed broken SOLR 44559: ALF-17075: "Exporting and importing null MLText values does not work." 44577: Final part for ALF-16558 SOLR tracking does not do incremental updates but one single chunk - fixed code so SolrSearchers are held for as little time as possible 44590: ALF-14523 (Share - Metadata constraint on workflow creation) 44594: ALF-16310: "Calling CancelCheckout() on the original document deletes the document." 44596: ALF-17075: "Exporting and importing null MLText values does not work." - change test name to something more meaningful 44599: ALF-16310: "Calling CancelCheckout() on the original document deletes the document." 44600: ALF-16791: Another omission not covered by unit tests 44603: ALF-14201: upgrade activiti to 5.7-20121211 44605: Added missing vti.server.url.path.prefix property required by commit 43471 Missing due to cherry picked commit, this is implemented as part of 39309 on HEAD. 44606: ALF-14201: upgrade activiti to 5.7-20121211 in Maven poms 44613: ALF-13690 (Share - It's possible to delete site groups via the UI) 44618: ALF-16939: "Error "importStatus.batchWeight is undefined" is thrown when Bulk Importer status webscript is run for XML format" 44621: Merged PATCHES/V4.1.1 to V4.1-BUG-FIX 44620: MNT-247: Merged DEV to PATCHES/V4.1.1 with corrections 44526: ALF-16964: Share alfrescoCookie connector fails when alfresco.authentication.allowGuestLogin=false, use case proxy between share and alfresco Check if external authentication is active in BaseServlet 44628: Solution for ALF-3780 - Dashboard settings not deleted for deleted user. Initial implementation by Dmitry Velichkevich. Surf user config folder and user Surf dynamic component references are removed when user node is deleted via a Delete Node policy. 44632: addition of validation of NetworkFile isClosed property. 44648: Merge V3.4-BUG-FIX to V4.1-BUG-FIX (4.1.3) 44566: ALF-17164: Add SVN revision in version.properties when building in continuous mode 44602: ALF-17164: adding the SCM revision in version.build so that it is displayed also, sneak in the SVN path, so that tracability is complete 44650: BDE-111: Stop creating installers in parallel, it fails on pbld02. Also, revert to zip compression to gain build time 44651: ALF-14348 (Unable to update external blog configuration details) 44654: Merged DEV to V4.1-BUG-FIX 44614: ALF-17119: Possible UI bug - "$$" chars added to permissions for IMAP Attachments folder Added a message bundles for FullControll access role. 44655: Merged DEV to V4.1-BUG-FIX 44593: ALF-14154: Encoding problem when open a file via webdav on Windows XP Ignore user credentials for the OPTIONS request. 44612: ALF-14154 : Encoding problem when open a file via webdav on Windows XP Ignore user credentials for the OPTIONS request. 44666: ALF-12001: Privacy: blog activities - activity is seen for draft blogs - Wrong node was being used for access checks - Fix by Andrey Chernov 44671: Merged V3.4-BUG-FIX to V4.1-BUG-FIX 43939: ALF-17197 / ALF-16917: Merged PATCHES/V3.4.11 to V3.4-BUG-FIX 43896: MNT-198: Activity feeds get not generated in private sites for added files if username in LDAP-AD contains uppercase letters - Now we can cope with a runAs where the username is in the wrong case 44296: ALF-17203 / ALF-17201 / MNT-216 : error saving versionable word documents git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@44675 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2012-12-13 14:16:40 +00:00
Dave Ward	182c29aac2	Merged V4.1-BUG-FIX to HEAD ... 43628: Fix for ALF-16299 - On full user profile, in the 'Sites' tab, the site descriptions are not aligned when a long site description is provided. 43639: ALF-16701: use newly released Spring Surf 1.2.0-M1 rather than a SNAPSHOT 43644: ALF-16527: webscript person.lib.ftl does not include all attributes for users out of the box. - added missing organizationId attribute. 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! 43659: ALF-16006: MT: Document Library is absent after upgrade from 3.4.x to 4.1.x (eg. 3.4.10 -> 4.1.1) - More patch dependencies required 43666: ALF-16833 / MNT-187: Fixed regression in inbound rule firing caused by the fix to ALF-14744 - Inbound rules were not firing for newly created content nodes that had null content properties (e.g. dataListItems) - Now the ALF-14744 fix has been revised so that inbound rules are only not fired for new nodes with zero-length content, as possibly created by the OSX / Windows 7 WebDAV clients during an upload, and only if policy.content.update.ignoreEmpty=true (the default) - OnContentUpdateRuleTrigger removed. Now all content property updates are handled by OnPropertyUpdateRuleTrigger so that we can have this subtle treatment of 'empty' content properties. - Reverted ALF-14744 changes to RuleServiceCoverageTest and added new tests for 'empty' content and ASPECT_NO_CONTENT - Updated RuleTriggerTest in line with changes 43675: Merged V4.1 to V4.1-BUG-FIX 43674: Merged PATCHES/V4.1.1 to V4.1 43673: Merged V3.4-BUG-FIX to PATCHES/V4.1.1 43672: ALF-16834, ALF-16833, MNT-187: Fix unit test failures and 'fine tune' logic to handle multiple updates within a single transaction creating a node 43676: ALF-12324: Can't delete site with WQS content - Don't try to add nodes to the publish queue on site deletion 43689: Fix for ALF-14207 - cm:link not correctly handled in Share's doclist when users don't have permission 43690: Fix for ALF-16538 - Wrong label on change group permission message 43696: ALF-16348 (Inconsistent error message when latest manager leaves a site) 43719: ALF-16031: "CMISChangeLog does not log Created events" 43720: ALF-14137: "When calling CMIS getAllVersions method using the OpenCMIS Browser the PreparedStatement is executed multiple times" 43722: ALF-16352: Re-instated manage permissions action to document list view 43745: Fix for ALF-15351. ContentModelFormProcessor had a TODO to handle associations defined on aspects other than those aspects already on the node for which a form is being submitted. I've added code that, when an association is added to a node, will check if the association is defined on any aspect in the system and if it is, it will let the association be created. 43757: ALF-16171: If a password for admin user is specified with a space in the end during the installation Alfresco startup fails - Added validation that will not allow the specified password to contain leading to trailing white space 43760: Fixed ALF-16317 "Labels not displaying full text when creating a rule on a folder with IE8" part 2 43769: Fix for ALF-13461. Merged PATCHES/V3.4.8 to BRANCHES/DEV/V4.1-BUG-FIX: 43344: MNT-162: Merged DEV to PATCHES/V3.4.8 43254: MNT-162: CLONE - Hidden folder "Comments" is available to searching - Removed last '/' from COMMENT_QNAMEPATH constant. 43770: ALF-15616: Merged V3.4-BUG-FIX (3.4.12) to V4.1-BUG-FIX (4.1.3) 43768: Merged Dev to V3.4-BUG-FIX (3.4.12) 43743: ALF-11956: WCM accessibility The problem with absence of initial focus on the first Web form element has been resolved in 'alfresco.xforms.XForm._loadHandler()'. This method creates all controls, defined in the form. 'alfresco.xforms.FocusResolver._findControl()' has been renamed to a public-like method ('alfresco.xforms.FocusResolver.findControl()'). Also it has been modified to introduce a possibility of searching elements, using root XForms widgets container. Some other minor fixes. 43772: Fixed ALF-16497 "Selected Items drop down box is expanded to the right in IE9" 43787: Merged in Philippe's fix for ALF-16313:unmakeTranslation() called on pivot language gives exception 43794: ALF-16155: "Notification digest accumulates and is repeatedly sent if 1 or more notification email fails" 43805: ALF-16212: Fixes double encoding issue. 43835: Fixed ALF-13595: Patches third party library date.js to prevent infinite loop. 43836: ALF-16480: Merged PATCHES/V4.1.1 to V4.1-BUG-FIX 43252: MNT-166: Document lock not removed after the lock expiry date has been reached - Changed evaluator "evaluator.doclib.metadata.isLocked" to use "evaluator.doclib.indicator.nodeLocked" and "evaluator.doclib.indicator.lockOwner" evaluator. 43253: MNT-165: "Cancel Editing" does not completely remove lock from document - Added documentLibrary cancel editing action for locked documents. 43300: MNT-171: Merged V4.1-BUG-FIX to PATCHES/V4.1.1 (modified) 43096: Fix for ALF-16283 - When document is checked out, 'Edit Online' and 'Upload New Version' options should not be visible on the original document. 43311: MNT-165: "Cancel Editing" does not completely remove lock from document - Fix for page refresh problem when cancel editing on details page 43421: MNT-186: 4.1.1.7 HF: Webscipt error on doclib page, containing locked by other users files - Change evaluator.doclib.metadata.isLocked to break circular dependency 43755: MNT-202: Upload New Version not available for a document that has been edited offline - Upload New Version is now available if editable by user (respecting locks, type of checkout, etc). 43844: ALF-16696: Merged DEV to V4.1-BUG-FIX 43734: Share nodebrowser is unable to access node of a document with MS residual properties - Use localname if no prefix is registered for a namespace uri 43864: Fixed ALF-16320 "Properties side panel collapses after editing properties in document preview window with IE8" 43866: Fixed ALF-16320 "Properties side panel collapses after editing properties in document preview window with IE8" part 2 - Checking using YAHOO.util.Event.getTarget instead 43867: Fixed ALF-16276 "'"Web View' dahslet displays 2 scrollbars in IE8." 43872: Merged V4.1 to V4.1-BUG-FIX 43622: ALF-16757: Sharepoint doesn't work correct with SSO - Fix by Pavel 43633: Latest translations from Gloria (r43623) 43636: Merged PATCHES/V4.1.1 to V4.1 43301: ALF-16811 / MNT-173: SOLR tracking spending too long evaluating paths - Too much time was being spent fetching the individual nodes in each path and there could be potentially thousands - Now we traverse all the ancestor parent associations in the cache before switching shared cache reads off, then bulk load them in one shot! 43303: ALF-16812 / MNT-174: "dictionaryDAO.init() called, yet no namespace registry for domain" after node rejoins cluster - namespaceRegistryCache is secondary to the clustered dictionaryRegistryCache, so can be a non-clustered cache. Synchronization and thread locals already in use so still thread safe. - dictionaryDAO.init() now has sole responsibility of establishing the NamespaceRegistry threadlocal within its locks, so no more risk of cyclic dependencies, race conditions, partial initialization, or registries dropping out of the cache - To avoid being confused by the 'consistent read' behaviour of a transactional cache, DictionaryDAOImpl now reads / writes directly to a shared cache. Again locks and thread locals still used so still thread safe 43334: ALF-16812 / MNT-174: Fixed failing unit tests - Because DictionaryDAOImpl now reads directly from the shared cache we need to reset it on initialization to avoid problems in multi-context unit tests 43337: ALF-16811 / MNT-173: Fix test failure. Cope with IDs of deleted nodes in getCachedAncestors() 43356: ALF-16811 / MNT-173: If we are disabling shared cache reads for the transaction, convert all existing reads and updates to avoid 'consistent read' behaviour giving us a potentially out of date node already accessed - Existing read buckets are simply thrown away - Updates are converted to removes to avoid any assumptions about existing shared cache content - New entries are left alone as they haven't come from the shared cache anyway 43410: ALF-16813 / MNT-185: Web Scripts are being endlessly re-registering in clustered environment - Due to 'consistent read' behaviour of transactional cache - As accesses are regulated by RW locks we can read straight through to the shared cache instead 43565: ALF-16814 / MNT-190: Bmlab Solr Node 2 threw unhandled NullPointerException (and possibly made solr unresponsive) - Added missing return statement 43646: ALF-15755: Rationalization of WebDAVMethod.checkNode() 43681: Merged HEAD to V4.1 43656: Fix for ALF-16683 CMIS: cannot navigate to original document was created through CMIS with CHECKED OUT version state. 43698: Latest Russian translations from Gloria 43838: ALF-16875: Merged V4.1-BUG-FIX to V4.1 43836: ALF-16480: Merged PATCHES/V4.1.1 to V4.1-BUG-FIX 43252: MNT-166: Document lock not removed after the lock expiry date has been reached - Changed evaluator "evaluator.doclib.metadata.isLocked" to use "evaluator.doclib.indicator.nodeLocked" and "evaluator.doclib.indicator.lockOwner" evaluator. 43253: MNT-165: "Cancel Editing" does not completely remove lock from document - Added documentLibrary cancel editing action for locked documents. 43300: MNT-171: Merged V4.1-BUG-FIX to PATCHES/V4.1.1 (modified) 43096: Fix for ALF-16283 - When document is checked out, 'Edit Online' and 'Upload New Version' options should not be visible on the original document. 43311: MNT-165: "Cancel Editing" does not completely remove lock from document - Fix for page refresh problem when cancel editing on details page 43421: MNT-186: 4.1.1.7 HF: Webscipt error on doclib page, containing locked by other users files - Change evaluator.doclib.metadata.isLocked to break circular dependency 43755: ALF-16890 / MNT-202: Upload New Version not available for a document that has been edited offline - Upload New Version is now available if editable by user (respecting locks, type of checkout, etc). 43868: Reverse merging r43838 - Merge in wrong direction introducing duplicate fragment into share-documentlibrary-config.xml 43871: ALF-16890: Merged PATCHES/V4.1.1 to V4.1 43755: MNT-202: Upload New Version not available for a document that has been edited offline - Upload New Version is now available if editable by user (respecting locks, type of checkout, etc). 43873: Merged V4.1 to V4.1-BUG-FIX (RECORD ONLY) 43602: ALF-16254: Merged V4.1-BUG-FIX to V4.1 43598: Merged HEAD to BRANCHES/DEV/V4.1-BUG-FIX 41906: ALF-11378: REST API has been modified to return extra information about a user whether s/he belongs to a group or not. 43612: ALF-16598: Merged V4.1-BUG-FIX to V4.1 43252: MNT-166: Document lock not removed after the lock expiry date has been reached - Changed evaluator "evaluator.doclib.metadata.isLocked" to use "evaluator.doclib.indicator.nodeLocked" and "evaluator.doclib.indicator.lockOwner" evaluator. 43254: MNT-165: "Cancel Editing" does not completely remove lock from document - Added documentLibrary cancel editing action for locked documents. 43300: MNT-171: Merged V4.1-BUG-FIX to PATCHES/V4.1.1 (modified) 43096: Fix for ALF-16283 - When document is checked out, 'Edit Online' and 'Upload New Version' options should not be visible on the original document. 43311: MNT-165: "Cancel Editing" does not completely remove lock from document - Fix for page refresh problem when cancel editing on details page 43421: MNT-186: 4.1.1.7 HF: Webscipt error on doclib page, containing locked by other users files - Change evaluator.doclib.metadata.isLocked to break circular dependency 43615: ALF-16794: Merged V4.1-BUG-FIX to V4.1 43478: MNT-181: Now WebDAV will ALWAYS preserve the original metadata and versions of ANY node that is temporarily 'moved out' in ANY kind of 'shuffle' operation - To make the source node temporarily invisible to WebDAV the client specific HIDDEN aspect features are used - WebDAVHelper.isRenameShuffle() method introduced, to parallel ALF-3856 CIFS fix and using similar system.webdav.renameShufflePattern global property to detect the start of a shuffle - WebDAVHelper converted to use proper dependency injection - CopyMethod has become a simple subclass of MoveMethod as all the hidden aspect munging is done by it - DeleteMethod now preserves hidden nodes - PropFindMethod now ignores hidden nodes - Listing methods will hide hidden nodes from WebDAV 43483: MNT-181: Corrected typo 43523: MNT-181: Corrections - WebDAVLockService.unlock() made 'harmless' to call on already-unlocked nodes - Delete method hides rather than deletes versioned nodes and working copes in case it is called by OSX Finder during a 'replace' operation 43524: MNT-181: Correction - PutMethod now 'unhides' hidden nodes and behaves as though it created them 43570: MNT-181: More corrections researched by Valery - Don't treat all moves to temporary locations as copies - just those from non-temporary locations. Avoids initial upload leaving lots of hidden files around. - Only copy the content, not the whole node including aspects to avoid versioning temporary files! - Don't version on changes to sys:clientVisibilityMask - avoids 'double versioning' - Recognize Mac .TemporaryItems folder and ._ files as temporary 43586: MNT-181: Final correction researched by Valery - Corrected system.webdav.renameShufflePattern so that it matches .TemporaryItems folder and ._ files as a full match 43616: ALF-15755: Merged V4.1-BUG-FIX to V4.1 43591: ALF-16772: If the WebDAV path of a document exceeds 255 characters, documents opened in MSOffice cannot be saved back - Interpret null nodeLockToken as not locked. 43629: Merged V4.1-BUG-FIX to V4.1 (4.1.2) 43498: Fix for ALF-16648 - Alfresco Enterprise artifacts in artifacts.alfresco.com do not provide POM files / dependencies declarations: Merged HEAD to V4.1-BUG-FIX (4.1.2) 43380: -- added site content for alfresco-platform-distribution POM 43379: -- added site documentation for alfresco-platform-distribution POM 43378: -- added site documentation for alfresco-platform-distribution POM -- deployed site for 4.2.b Community at https://artifacts.alfresco.com/nexus/content/repositories/alfresco-docs/alfresco-platform-distribution/latest/index.html -- created repository for Enterprise docs and added url in the appropriate edition properties 43273: Use property to define POI version 42966: ALF-14353 - Added platform distribution POM to standard maven-deploy procedure 42965: ALF-14353 - added alfresco-platform-distribution to provide a Maven release descriptor (dependencyManagement) per each Community / Enterprise release -- moved maven-ant-tasks not to be in the runtime lib -- added platform distribution pom in the SDK folder -- updated maven.xml to deploy filter and deploy the appropriate platform-distribution POM per each releae -- in maven.xml moved configure-release and configure-snapshot goals to maven-env-prerequisites -- updated sdk readme to explain the presence of alfresco-platform-distribution POM 42912: -- updated README header on the POM specifying it's NOT usable to build Alfresco -- make a clear reference to the POMs that get deployed by pom-experimental.xml being usable for development 42842: ALF-14353: Fix artifactId alfresco-jlan -> alfresco-jlan-embed 41883: ALF-14353 - fixed multiple Maven build issues. Now mvn clean install -f pom-experimental.xml works fine. Also deployed Spring Surf 1.2.0-SNAPSHOT so proper Surf version is retrieved 41882: added pre-requisites to build POMs successfully with mvn clean install -f pom-experimental.xml 43634: Merged V4.1-BUG-FIX to V4.1 43386: ALF-13091: Prevent bean post processor propagation to child application contexts. Remove Jsr250BeanPostPorcessor from the CXF configuration, to prevent strange interaction with component scanning. 43641: Merged V4.1-BUG-FIX to V4.1 (4.1.2) 43639: ALF-16701: use newly released Spring Surf 1.2.0-M1 in POM files rather than a SNAPSHOT 43645: Merged V4.1-BUG-FIX to V4.1 43644: ALF-16527: webscript person.lib.ftl does not include all attributes for users out of the box. - added missing organizationId attribute. 43660: Merged V4.1-BUG-FIX to V4.1 43659: ALF-16006: MT: Document Library is absent after upgrade from 3.4.x to 4.1.x (eg. 3.4.10 -> 4.1.1) - More patch dependencies required 43669: Merged V4.1-BUG-FIX to V4.1 43666: ALF-16833 / MNT-187: Fixed regression in inbound rule firing caused by the fix to ALF-14744 - Inbound rules were not firing for newly created content nodes that had null content properties (e.g. dataListItems) - Now the ALF-14744 fix has been revised so that inbound rules are only not fired for new nodes with zero-length content, as possibly created by the OSX / Windows 7 WebDAV clients during an upload, and only if policy.content.update.ignoreEmpty=true (the default) - OnContentUpdateRuleTrigger removed. Now all content property updates are handled by OnPropertyUpdateRuleTrigger so that we can have this subtle treatment of 'empty' content properties. - Reverted ALF-14744 changes to RuleServiceCoverageTest and added new tests for 'empty' content and ASPECT_NO_CONTENT - Updated RuleTriggerTest in line with changes 43697: Merged V4.1-BUG-FIX to V4.1 43689: Fix for ALF-14207 - cm:link not correctly handled in Share's doclist when users don't have permission 43761: Merged V4.1-BUG-FIX to V4.1 43760: Fixed ALF-16317 "Labels not displaying full text when creating a rule on a folder with IE8" part 2 43796: Merged V4.1-BUG-FIX to V4.1 43795: Fix for ALF-16254 - "Leave Site" behaviour for group based site membership: Blah, Blah, Blah! 43883: Fix for ALF-12711. Separated preparation of email message from sending of email message as described in analysis in JIRA. Did not merge the fix provided as MailActionExecuter.java.diff but reimplemented a fix based on that. 43888: ALF-16781: Merged V3.4-BUG-FIX (3.4.12) to V4.1-BUG-FIX (4.1.3) 43887: ALF-16898 CLONE - Transformation Server history shows incorrect transformation "To" type for images - ImageTransformActionExecuter ("Transform and Copy Image") re-factored to use ContentService rather than hard coded to ImageMagick 43900: Merged V4.1 to V4.1-BUG-FIX 43898: Merged PATCHES/V4.1.1 to V4.1 43708: ALF-16903 / MNT-203: ACL changes not propagated between two non clustered Alfresco instances hitting same Solr and Database - Although SOLRTrackingComponentImpl was not trusting the cache when tracking node transactions, it was still trusting the cache for ACL change sets - This mean that when the SOLR node is using an Alfresco out of the cluster (which we are supposed to support) it could see stale ACLs - Fixed this by using the same strategy we use in AbstractNodeDAO - Now the main acl CRUD cache is set to ignore the shared cache during SOLR tracking - All secondary ACL caches are keyed by ACL ID AND version, so it prevents the possibility of retrieving a stale cached ACL for an old version 43713: ALF-16903 / MNT-203: ACL changes not propagated between two non clustered Alfresco instances hitting same Solr and Database - Fix test failures - deleteAccessControlEntries must 'touch' all the ACLs it affects to keep caches valid - createAccessControlList should return the newly-versioned ACL 43736: ALF-16904 / MNT-204: Index showing no progress on Solr server - SAP's tracking thread got stuck indefinitely waiting on a content response after sending a request, probably due to some misbehaving proxy or balancer - Now we make it possible to recover from this - A new alfresco.socketTimeout parameter is now supported in solrcore.properties - It specifies the number of milliseconds SOLR will wait before giving up waiting for data on an HTTP connection - The default is still zero which means wait indefinitely 43759: ALF-16904 / MNT-204: Fixed compilation error 43899: Merged PATCHES/V4.1.1 to V4.1 (RECORD ONLY) 43667: Merged V4.1-BUG-FIX to PATCHES/V4.1.1 43666: ALF-16833 / MNT-187: Fixed regression in inbound rule firing caused by the fix to ALF-14744 - Inbound rules were not firing for newly created content nodes that had null content properties (e.g. dataListItems) - Now the ALF-14744 fix has been revised so that inbound rules are only not fired for new nodes with zero-length content, as possibly created by the OSX / Windows 7 WebDAV clients during an upload, and only if policy.content.update.ignoreEmpty=true (the default) - OnContentUpdateRuleTrigger removed. Now all content property updates are handled by OnPropertyUpdateRuleTrigger so that we can have this subtle treatment of 'empty' content properties. - Reverted ALF-14744 changes to RuleServiceCoverageTest and added new tests for 'empty' content and ASPECT_NO_CONTENT - Updated RuleTriggerTest in line with changes 43901: Merged V3.4-BUG-FIX to V4.1-BUG-FIX 43571: Merged DEV to V3.4-BUG-FIX 43569: ALF-16222: It's impossible to delete a file/message via IMAP using Microsoft Entourage 2008 in MacOSX 10.8 fixed: UID failed.Existing file or folder error on attempt to delete file if deleted items already contains file with the same name. modified: AttachmentExtractor modified to avoid code dublication. 43599: Fix for ALF-16505 - Discussion topics are sorted in ascending order (oldest first and newest last) when selecting 'All topics' 43610: Merged Dev to V3.4-BUGFIX (3.4.12) 43416: ALF-16470: SPP:Meeting recurent events are displayed incorrect in share calendar in all tabs (Day, Week, Month) Incorrect lucene query to search for events (it was search for events ONLY after fromDate, that gets from browser query. And recursive events, that have startDate before browser's query date, wasn't included into summary query for search for events. Start date is incorrect and is sets two times. Interval for month of end date is to small. Recursive event, that was started in previous month, and ends in current month, isn't included into result of search. For events, that ends on next date after start date, displays (view by month) only start date. 43625: ALF-11817: Cope with incomplete lock token headers from Microsoft-WebDAV-MiniRedir without the enclosing <> by just consuming the whole string 43670: ALF-11817: Prevent auto-hidden dot underscore files from reappearing on a put by checking for a shuffle path before 'unhiding' 43746: Merged DEV to V3.4-BUG-FIX (with corrections) 43692: ALF-16808 Webdav: Two versions of document have been added after the document has been rewritten once more via drag and drop action. 1. Checked whether the current content property is empty. 2. Disabled the versionable aspect. 3. Added the new content to the node. 43763: Fix for ALF-14828 - Incorrect behavior on delete action (WCMQS site) 43771: Fix for ALF-12752 - Custom form appearance parameters not accounted for causing ovverlapped textareas xforms changing their height 43773: Merged DEV to V3.4-BUG-FIX (3.4.12) 42010: ALF-14040: Event start/end time displays incorrect on MS Outlook Calendar and Calendar of created Meeting workspace 1) Send a date for "Site Calendar" dashlet in ISO-8601 format (like in v4.1.1), then after transformation to client's time zone it is displayed correct 2) For "My Calendar" dashlet we need to take into account that if the event is "all day event", then date should be used without time zone transformation 43804: ALF-12326 HomeFolderProviderSynchronizer fails to move any user space which has a rule configured on it 43837: Fixes ALF-12145: Date.js patches merged to 3.4 Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/V3.4-BUG-FIX: 36202: ALF-13483: Japanese: Incorrect date handle in a date Input filed Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/V3.4-BUG-FIX: 43835: Fixed ALF-13595: Patches third party library date.js to prevent infinite loop. 43839: ALF-16869: Merged PATCHES/V3.4.8 to V3.4-BUG-FIX 43344: MNT-162: Merged DEV to PATCHES/V3.4.8 43254: MNT-162: CLONE - Hidden folder "Comments" is available to searching - Removed last '/' from COMMENT_QNAMEPATH constant. 43902: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (RECORD ONLY) 43177: Merged DEV to V3.4-BUG-FIX 43087: ALF-16474: Records Management groups were not deleted after removing RM site - Delete Records Management groups on ASPECT_RECORDS_MANAGEMENT_ROOT delete - Backport of RM-190 from RM 2.0 43228: ALF-16266: Merged HEAD to V3.4-BUG-FIX 32846: Fixes: ALF-10519: Issues with translation of roles. 31413: Fixes: ALF-10519 - Internationalises the role names for the repo browser's manage permissions page & makes these available to other pages through common.properties 43229: ALF-16266: Fix conflict data left in the properties file. 43624: ALF-11817: Merged PATCHES/V4.0.2 to V3.4-BUG-FIX 43587: Merged BRANCHES/V4.1-BUG-FIX to PATCHES/V4.0.2 42363: ALF-16213: renaming versioned file results in file being deleted. 43478: MNT-181: Now WebDAV will ALWAYS preserve the original metadata and versions of ANY node that is temporarily 'moved out' in ANY kind of 'shuffle' operation - To make the source node temporarily invisible to WebDAV the client specific HIDDEN aspect features are used - WebDAVHelper.isRenameShuffle() method introduced, to parallel ALF-3856 CIFS fix and using similar system.webdav.renameShufflePattern global property to detect the start of a shuffle - WebDAVHelper converted to use proper dependency injection - CopyMethod has become a simple subclass of MoveMethod as all the hidden aspect munging is done by it - DeleteMethod now preserves hidden nodes - PropFindMethod now ignores hidden nodes - Listing methods will hide hidden nodes from WebDAV 43483: MNT-181: Corrected typo 43523: MNT-181: Corrections - WebDAVLockService.unlock() made 'harmless' to call on already-unlocked nodes - Delete method hides rather than deletes versioned nodes and working copies in case it is called by OSX Finder during a 'replace' operation 43524: MNT-181: Correction - PutMethod now 'unhides' hidden nodes and behaves as though it created them 43570: MNT-181: More corrections researched by Valery - Don't treat all moves to temporary locations as copies - just those from non-temporary locations. Avoids initial upload leaving lots of hidden files around. - Only copy the content, not the whole node including aspects to avoid versioning temporary files! - Don't version on changes to sys:clientVisibilityMask - avoids 'double versioning' - Recognize Mac .TemporaryItems folder and ._ files as temporary 43586: MNT-181: Final correction researched by Valery - Corrected system.webdav.renameShufflePattern so that it matches .TemporaryItems folder and ._ files as a full match 43671: ALF-16834: Merged V4.1-BUG-FIX to V3.4-BUG-FIX 43666: ALF-16833 / MNT-187: Fixed regression in inbound rule firing caused by the fix to ALF-14744 - Inbound rules were not firing for newly created content nodes that had null content properties (e.g. dataListItems) - Now the ALF-14744 fix has been revised so that inbound rules are only not fired for new nodes with zero-length content, as possibly created by the OSX / Windows 7 WebDAV clients during an upload, and only if policy.content.update.ignoreEmpty=true (the default) - OnContentUpdateRuleTrigger removed. Now all content property updates are handled by OnPropertyUpdateRuleTrigger so that we can have this subtle treatment of 'empty' content properties. - Reverted ALF-14744 changes to RuleServiceCoverageTest and added new tests for 'empty' content and ASPECT_NO_CONTENT - Updated RuleTriggerTest in line with changes 43842: Merged V4.0-BUG-FIX to V3.4-BUG-FIX 33387: ALF-12492 - Email with empty subject sent to Alfresco by SMTP cause Null pointer Exception 43843: ALF-16717: Merged V4.1-BUG-FIX to V3.4-BUG-FIX 43314: ALF-16575 - Email server does not accept email where Subject ends with a period git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@43914 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2012-11-23 16:46:57 +00:00
Andrew Hind	8642f05890	Fix for ALF-16795 CMIS 0.8 TCK - load of large content fails ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@43617 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2012-11-14 19:59:59 +00:00
Andrew Hind	e89f432587	Fix for ALF-16785 CMIS 0.8 TCK - acl propagation test fails ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@43607 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2012-11-14 13:56:19 +00:00
Dave Ward	b794365eaa	Merged V4.1-BUG-FIX to HEAD ... 42933: ALF-15328 could we add a sample log4j file in 'extension'? 42935: ALF-16455: Merged V3.4-BUG-FIX (3.4.12) to V4.1-BUG-FIX (4.1.2) 42934: ALF-16454 TransformerDebug id values have gaps 42955: ALF-15328 could we add a sample log4j file in 'extension'? - missing j in file name 42982: Merged DEV to V4.1-BUG-FIX 42873: ALF-16194: Checkout/Checkin leaves Lockable aspect on which disables autoVersionOnUpdateProps DoNothingCopyBehaviourCallback policy has been set for lockable aspect (implemented in LockServiceImpl); Unit test has been added. 43000: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_10_19 to BRANCHES/DEV/V4.1-BUG-FIX: 42936: ALF-11573: It's impossible to Modify settings for document versions 43010: ALF-16006 MT: Document Library is absent after upgrade from 3.4.x to 4.1.x (eg. 3.4.10 -> 4.1.1) - applied patch suggested in JIRA 43017: ALF-16457: "CmisObjectNotFoundException: No corresponding type found! Not a CMIS object?" thrown by AlfrescoCmisServiceImpl.getChildren - Check CMISNodeInfo for invalid type before processing. 43019: ALF-14353: Upgrade Activiti dependencies in Maven build 43022: ALF-14353: Upgrade Activiti dependencies in Maven build 43027: Merged DEV to V4.1-BUG-FIX 42426: ALF-15577: " does not support the method HEAD " when opening a MS Access file with "View In Browser" 43029: Merged DEV to 4.1-BUG-FIX (4.1.2) 42988: ALF-15791: Custom Types,Aspects defined with prefix using underscore cannot be loaded by API calls like api/classes/<type or aspect> Identical logic for old and new ClassDef API was moved to abstract super classes 42924: ALF-15791: Custom Types,Aspects defined with prefix using underscore cannot be loaded by API calls like api/classes/<type or aspect> New set of URL templates for class defenitions were provided to support requests with separated namespace prefixes and names 43031: ALF-16489: Typo in column-name of newly created index 43041: Merged DEV to 4.1-BUG-FIX (4.1.2) 43040: ALF-16425: API call to return all classes, returns wrong properties in classes Propertydefs and assocdefs are reordered to corelate with classdefs. Unit test was added for issue. 43052: ALF-16194: Checkout/Checkin leaves Lockable aspect on which disables autoVersionOnUpdateProps - Fix failing test 43055: Probable fix for ALF-15813. Replaced the 'skipCount' with the one in the query request, rather than query result. The Lucene query result does not support the reporting of the skipCount. 43065: Merged V3.4-BUG-FIX to V4.1-BUG-FIX 42958: ALF-14421: Inconsistencies when applying Versionable Aspect - We think the most preferable fix that will result in the best consistency between Share and old Explorer behaviour is to make the adding of the versionable aspect always result in an initial MAJOR version, if a version type has not been specified. Major/minor versions can still be controlled explicitly by checkout/checkin the versionable aspect properties and the version service API. 42998: ALF-14421: Fixed version label unit test fallout - back to what it used to be. 42999: Fix for ALF-16261 - IE script error occurs when email space users providing there are no users in this space 43006: Removed dependency on Apache Commons StringUtils. See ALF-12541, ALF-14254, AMZNSSS-17 43028: ALF-14722: Merged V4.1-BUG-FIX to V3.4-BUG-FIX 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. 43066: ALF-16502: Merged PATCHES/V4.0.2 to V4.1-BUG-FIX 42969: Merged DEV to PATCHES/V4.0.2 42967: MNT-158: SharePoint Protocol Opening Documents in Read-Only for Site Consumer with Collaborator Privileges Remove manual throwing of AccessDeniedException is user has "consumer" or "contributor" role. Create "links" container from system user. 43067: Merged PATCHES/V4.1.1 to V4.1-BUG-FIX 42470: ALF-16503 / ALF-16256: Upgrade 3.4.6 HF to 4.1.1 - DuplicateChildNodeNameException: Duplicate child name not allowed: surf-config 42591: ALF-16504 / ALF-16332: Fixed synchronization around org.alfresco.repo.dictionary.NamespaceDAOImpl.namespaceRegistryCache - There was no 'double checking' after releasing the write lock, meaning that under high concurrency lots of threads would queue up to continuously re-initialize the registry. 42705: ALF-16504/ ALF-16332, ALF-16377: Revisited synchronization and initialization of mutually-dependent DictionaryDAO and NamespaceDAO to prevent deadlock and simultaneous re-initialization in more than one thread 43068: Merged DEV to V4.1-BUG-FIX - TODO: Update DB2 DDL in activiti 42388: ALF-15828: DB2: unexpected index found in database. Modify activity create script for db2 to create normal name for ACT_HI_PROCINST.PROC_INST_ID_ index. Introduce patch that will rename autogenerated name to normal name for ACT_HI_PROCINST.PROC_INST_ID_ index. Update schema reference file for DB2. 42429: ALF-15828: DB2: unexpected index found in database. Fix scripts from ALF-14983 and ALF-16038 to drop/recreate tables in DB2. 43069: ALF-11214: IMAP subsystem is not successfully restarted after incorrect modification of IMAP properties via Admin Console Stopped ChildApplicationContextFactory from caching a stale application context that didn't successfully refresh. 43071: ALF-13660: When using kerberos SSO, non domain explorer users requesting a download URL get a login page but after login do not get the requested document - Now the Web Client authentication filters use the same mechanism for preserving the request URL through a redirect to the login page 43076: ALF-15828: Fixed merge issue 43079: ALF-13602: Incorrect number of documents displayed in Share DocLib when a file is checked out - added ability for FileFolderService.list (-> FileFolder GetChildren CQ) to filter by one or more aspects, eg. cm:checkedOut 43080: ALF-14421: More version label unit test fallout 43092: Fix ALF-16460: Users may receive activity feed entries (from people they follow) for moderated sites to which they do not belong - also add unit test 43093: Fix for ALF-16091 - Unable to inline edit javascript file. 43096: Fix for ALF-16283 - When document is checked out, 'Edit Online' and 'Upload New Version' options should not be visible on the original document. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@43103 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2012-10-25 16:38:22 +00:00
Dave Ward	b58125d078	Merged V4.1-BUG-FIX to HEAD ... 42804: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_10_17 to BRANCHES/DEV/V4.1-BUG-FIX: 42748: ALF-14200: Adding Invalid Aspects Via CMIS ATOM API Results in NullPointerException 42810: Fix for ALF-15276 - sys:locale Attribute No Longer Available From jsnode 42814: ALF-15276 - small improvement to remove duplicated data from response 42824: ALF-15048: Merged PATCHES/V4.0.2 to V4.1-BUG-FIX 42724: ALF-16048: CLONE - Version history doesn't go beyond two versions (0.1 and 0.2) when dragged and dropped via CIFS from Mac Lion OSx 42739: ALF-16048: New files missing from previous check in 42742: ALF-16048: Another missing file. 42839: ALF-16417: Fix "Hybrid Sync - can retain invalid cloud tickets in a local cache" - retry once for invalid auth - also externalise the implicit/default cache config 42849: NodeDAO: Added new method to retrieve specific store ID - public Pair<Long, StoreRef> getStore(StoreRef storeRef); 42857: Merged DEV to V4.1-BUG-FIX 42821: ALF-13506 : WCMQS Example Application Caching Causes Changes to Inconsistently Appear on the Editorial Web Site Concurrency was improved for AssetImpl class. The returned values of the collections were made unmodifiable in the classes which implement Resource interface. 42872: ALF-15601: "Performance issue using CMIS method getChildren() - gets version history" - avoids getting the version history (an expensive operation) if possible i.e. in the case of current version (live) nodes like for getChildren 42900: Merged DEV to V4.1-BUG-FIX 42734: ALF-15335 : 'external' authentication subsystem debug information too scarce Extended debug information in the authentication subsystem. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@42904 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2012-10-21 18:09:03 +00:00
Jan Vonka	78a151522e	Merged BRANCHES/DEV/CLOUD1-BUG-FIX to HEAD: ... 42884: ALF-1059 / CLOUD-469: Post activities for folder(s) add + delete git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@42891 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2012-10-19 17:38:37 +00:00
Jan Vonka	6a930dd56b	Merged BRANCHES/DEV/CLOUD1-BUG-FIX to HEAD: ... 42572: CLOUD-794: "Activities should be posted for CMIS (to enable both Public API + Mobile clients)" - note: also enable WebDAV activities by default (in both cases => file add/update/delete) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@42809 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2012-10-18 13:56:03 +00:00
Dave Ward	a1b12e2f0f	Merged V4.1-BUG-FIX to HEAD ... 42174: ALF-14721: Merged PATCHES/V4.0.2 to V4.1-BUG-FIX 41782: ALF-15751: Merged DEV to V4.0.2 (4.0.2.14) 41704: ALF-15751: CLONE - Version History presents versions in wrong order 'VersionHistoryImpl' now sorts versions by node DB id because version with greater version number can't have id which is lesser than id of version with lesser version number. Additionally, this approach should be quicker than sorting by 'Modification date' and 'Version number' label. << Did not merge unit test, which was doing things with version branches that we don't normally support >> 42179: ALF-16149: Merged PATCHES/V4.0.1 to V4.1-BUG-FIX 41995: 41911: ALF-14127 User search retrieves all users from the DB regardless of search criteria - PeopleServiceImpl.getPeople(...) now calls a new method nonCannedGetPeopleQuery(...) rather than using the canned query which is slow with large numbers of users. 42011: 41911: ALF-14127 User search retrieves all users from the DB regardless of search criteria - Avoid NPE on params 42059: 41911: ALF-14127 User search retrieves all users from the DB regardless of search criteria - Ignore case broke one of the unit tests (now excluded from nonCanned version) 42188: French installer corrections from Gloria 42192: ALF-15906 - Share UI does not show the 'edit online' button for Visio documents 42195: Refactor of imapSpacesTemplates.acp into imapSpacesTemplates.xml and exploded content. This work is a necessary precursor to the fix for ALF-15803, which will add new localisations. 42220: Fix for ALF-16138. AbstractLinksWebScript doesn't cope with Links from deleted users. 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 42259: Fix to issue where multiple concurrent writes to same user preferences would cause exception to appear in Share when changing between old document library views and new views provided by a module. 42266: ALF-16154 - IE9: script error when click on workflow from document details page 42268: Fix for ALF-11152 - License Usage information always shows 0 users 42269: Fix for ALF-15211 - TinyMCE corrupting hyperlinks 42275: ALF-15993: alfresco log not removed if uninstalled on a different day - Fix from Bitrock - Also fixed for awe and share logs 42289: Merged DEV to V4.1-BUG-FIX 42276: ALF-1907: Check out rule is active for spaces - Unit test for checkout via action executer Fixed line endings and split asserts 42292: ALF-15937: updated the Javadoc of the checkin method to be in sync with what's in doc.alfresco.com 42307: Fix handling of syncmodeconfig=OFF when running 4.1.X locally without doing full enterprise build. 42308: Fix ALF-13968: Share DocLib sorting mixes files and folders - implicitly sort folders before files (~ pre 4.x) then selected sort option, such as name - also allow Alf-specific option with CMIS getChildren (eg. "orderBy=cmis:baseTypeId DESC,cmis:name ASC") 42310: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_09_24 to BRANCHES/DEV/V4.1-BUG-FIX: 42309: ALF-15707 (ALF-14691) - Any custom aspect or type (including ootb workflow) is not available for API calls like api/classes/<type or aspect> 42338: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.1-BUG-FIX 42337: Fix for ALF-14764 - Moving a folder removes non-site Group permissions set, resets 'Inherit permissions flag' 42339: Fix for ALF-15151 - Selected group is illegible(black) in Admin console if High contrast theme is selected 42342: ALF-10362: Activities fail to log "name" changes with more than 1024 chars (eg. via Share "Create Content" form) - part I - fix Share config so that default "Create Content" form restricts to 255 chars as per other form config (eg. Edit Properties, inline rename, ...) 42353: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (RECORD ONLY) 42281: Fix for ALF-9946 Need a supported solution for switching off content indexing (FTS) -> merge only to 4.1-BUG-FIX - remove references to isIndexed property which was removed in the back port 42360: ALF-16146: Fixed QName of the data list item type. 42361: ALF-10362: Activities fail to log "name" changes with more than 1024 chars (eg. via Share "Create Content" form) - part II - belts-and-braces (with unit test) 42362: Merged DEV to V4.1-BUG-FIX 42336: ALF-16160: office 2010 doesn't notify users of files being locked when using sharepoint protocol MS Office (if we enabled notification about document unlocking) periodically sends PROPFIND requests to get info about active locks. This code makes PROPFIND be able to send an info about locks for the MS Office 2010 client if a document was locked for edit offline. 42363: ALF-16213: renaming versioned file results in file being deleted. 42368: Record only merge V3.4-BUG-FIX (3.4.12) to V4.1-BUG-FIX (4.1.2) 42367: Merge V3.4 (3.4.11) to V3.4-BUG-FIX (3.4.12) 42366: ALF-16137: Merge V4.1 (4.1.1) to V3.4 (3.4.11) 42048: ALF-16005 Could not transform file size of 0 kb - Turns out that it was only doc ppt and xls zero byte files that had the problem. - Reverting part of revision 6473 (release 2.1 2007) AR-1251 (Version error when saving new content via CIFS) Dave W tells me that this is no longer an issue due to other changes 42381: Fixed ALF-16218: Solr GetNodes return status is 500 for Postgresql - Read-only webscript was calling through to "qnameDAO.getOrCreateQName", which could fail if the QName does not exist. Issue is not critical because it will start working once the QName gets created. 42384: ALF-15868 RepoTransferReceiverImplTest failing on MySQL Checked in a refactor of the transaction handling in the test to remove the suspicion that the current failure iis somehow a test error. (Still fails on MySQL) 42395: ALF-14353: Deploy pom files with dependencies to the Maven repo 42405: ALF-15986: Upgrade to Bitrock 8.5.0 in order to improve font scaling and adaptive layout with Gtk - Helps I18N 42407: Fixed 'state leak' from ActivityServiceImplTest 42408: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/V4.1-BUG-FIX: 42389: CLOUD-796: handle unknown custom content/folder type 42396: CLOUD-796: handle unknown custom content/folder type 42397: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC: 41858: ALF-14444 - CloudSync: Ensure unknown properties when synced to Cloud are ignored properly 42406: CLOUD-796: handle unknown custom content/folder type 42409: CloudSync: CLOUD-796 / ALF-16226 - hide sync props in forms (eg. edit props) for sync'ed custom content type 42419: Fixes: ALF-11096 - Ensures event edit button is disabled if the event came from Outlook (this is because VTI connector is one directional & changes can't be pushed back). 42420: Fix for ALF-16003 - Sync mode is incorrectly cached as off if repo hasn't started when the check is made. 42430: More refactoring of RepoTransferReceiverImplTest. 42441: Merged V4.1-BUG-FIX to HEAD 42440: ALF-16247: Thumbnails not rendering for PDFs with standard fonts - Because GS_LIB wasn't set on Linux and OSX 42452: Fix for ALF-15450 Share Lucene tool in admin console works incorrectly 42457: ALF-14347: Document workspace is incorrectly deleted - Check returned status code from delete method before continuing to delete components. 42458: ALF-15700: 'Imap Attachments' folder is not localized. - Added spaces.imap_attachments.childname property that allows the attachments folder to be localized 42459: ALF-16103: No easy way to specify a timeout for LDAP connections - Added ldap-authentication/ldap-ad-authentication property (ldap.authentication.java.naming.read.timeout) to configure the com.sun.jndi.ldap.read.timeout for the initialDirContextEnvironment. - ldap.authentication.java.naming.read.timeout property is configured in milliseconds. Defaults to zero (infinite) which is the current behavior. 42467: Fix for ALF-16275 SOLR include configuration to avoid indexing content - done and fixed all configuration to be treated as Java properties 42472: ALF-16175: Merged PATCHES/V4.0.1 to V4.1-BUG-FIX (Record Only) 42448: ALF-16096: Repo corruption in MT - clean-up assistance requested - Changed RepositoryAuthenticationDAO.getUserFolderLocation() to use getCurrentUserDomain() for its cache key. 42473: ALF-14838 ALF-14839 Deploy Maven artifacts containing the config and the test-resources, using these as classifiers 42475: ALF-14180 - CIFS - Cluster - doc and docx files are opened in read-only mode via MS Office 2003 and 2010 appropriately missed from check in 34544 42477: ALF-5051: Define ThumbnailDefinition Beans Outside of ThumbnailRegistry Bean - Reverted imgpreview to enterprise 4.1 size of 480 42504: Reverse Merge 42458 ALF-15700: 'Imap Attachments' folder is not localized. Causes unit test failures. 42517: ALF-15700: Restoring duff revision 42458 so that we can finish the job and fix it 42518: ALF-15700: Corrected internationalization of IMAP Attachments folder - RepositoryFolderConfigBean must look up paths by QName to be immune to localization and backward compatible - Must throw an error rather than using the store root if the path contains unresolved placeholders! - QName of attachments folder must remain "cm:Imap Attachments" because that's what it always was! 42528: ALF-16282: Hybrid Sync: folder unsync - sub-children still have sync indicators - fix typo fallout from ALF-15420 (r40782) + add unit/regress test 42529: ALF-16231: Corrected Imap Attachments English string 42530: ALF-14838 ALF-14839 Fix enterprise artifacts + deploy jars instead of zips 42531: ALF-14770 Cut / Paste triggers folder rules - Needed to disable rules on nodes being MOVED. - Added extra check to RuleTypeImpl when working out if a rule was disabled so that debug would not be misleading. No impact on logic, as RuleService does the same check later and discards the rules. 42546: ALF-15737 Audit trail does not show user login events - Also does not show any failed login events 42568: ALF-16077 CLONE: Incorrect activities if you try to add/edit/remove comment for document (if this document contains any title) The original activity feed comment code would include the title of a document, folder or blog rather than its name if it was available. - name is a mandatory field for a document and folder. - title is a mandatory field for a blog entry and its name may not be set via Share. Changing activity feed comment code so that the: - name is always used for documents and folders - title is always used for blogs 42571: ALF-14838 ALF-14839 Deploy config and test-resoruces artifacts in the same batch as the main artifact, otherwise they get different snapshot versions 42582: ALF-16255: CopiedFromAspectPatch fails on rules copied with a folder - Checked to make sure that cm:copiedfrom target is a cm:object before attempting a cm:original association. - Remove cm:copiedfrom aspect from source if cm:copiedfrom target is not a cm:object. 42593: ALF-16255: CopiedFromAspectPatch fails on rules copied with a folder - Corrections to log message and formatting. 42605: ALF-16231: Fixed broken IMAP unit tests 42612: Further fix for ALF-16164 Cloud monitoring of SOLR is CPU intensive due to its repeated use of the SOLR stats page - protect from dodgey JSON output 42624: ALF-14353: switch groupId to org.alfresco.enterprise, to be in sync with actual Maven deployment 42657: Fix for ALF-16359 Fix SOLR logging in production and other environments - configure in log4j-solr.properties anywhere on the solr web app classpath ... 42671: ALF-14353: fix facebook api dependency 42679: Merged V3.4-BUG-FIX to V4.1-BUG-FIX 42172: ALF-15262: Correct handling of linked rule deletion - When the last rule is removed from a folder and the ASPECT_RULES aspect is removed from its parent, we must cascade this removal to its secondary parents 42173: ALF-14400: Only site members can Edit Online (sharepoint) although the site is public and permissions allow editing for everybody - Rationalized the fix provided by Alex Malinovsky - Don't bother checking site memberships - let ACLs handle that and just check for permission to read the document 42182: Incremented version revision for 3.4.12 42243: ALF-15262: Further correction by Dmitry: use beforeRemoveAspect because beforeDeleteChildAssociation is not invoked on deletion of primary child associations 42278: ALF-12999: Correction by Alex M 42586: BDE-101: make .MD5 files suitable for easy check with md5sum -c 42627: Merged DEV to V3.4-BUG-FIX 42537: ALF-16139: Impossible to connect to CMIS via AtomPub and Web Services Activation libraries (including all Geronimo versions) have been removed because of a conflict with libraries in JBoss CXF WS installation. Also, 'javax.activation' is part of the JDK 1.6 (http://docs.oracle.com/javase/6/docs/api/javax/activation/DataHandler.html) 42677: Merged V3.4 to V3.4-BUG-FIX 42380: ALF-16220: Merged V4.1-BUG-FIX to V3.4 40590: ALF-15318: It was possible for a user with a disabled / expired account to log in via NTLM/SSO 40663: Merged DEV to V4.1-BUG-FIX 40661: ALF-15318 (part 2): It's possible to log in by disabled user (NTLM with SSO in a clustered env) The onValidateFailed() methods were moved to BaseSSOAuthenticationFilter to response with a 401 for a disabled user. 42556: ALF-15077: Site creation in Share is very very slow with over 15000 sites - Probably knock-on impact from us versioning secondary associations properly - Found old way of locating a leaf document to be ineffective as it would blow the caches (find all documents with the correct ID, then filter out the containers) - Effect was magnified when admin user was previously accessed via the explorer client and thus had an app:configurations child node, thus making admin a container and requiring its paths (e.g. zillions of nested group memberships) to be indexed - Instead, we have a new LEAFID field on leaves that we can use to efficiently locate a node to delete without hitting zillions of containers - Left backward compatible code to avoid requiring a full reindex 42557: ALF-16202: Merged V4.1-BUG-FIX to V3.4 40937: ALF-15702, ALF-15669: mmt-dependencies was messing up the SDK classpath 42566: ALF-15077: Correction to category-handling logic in container generation to fix failing unit tests 42608: Merged DEV to V3.4 42543: ALF-16248 : IE specific: It's impossible to create any event due to script error Correction for the fix for ALF-13623 to support IE8, also added clearing of 'allday' checkbox. 42622: ALF-16339: Group names incorrect in (non-site) "Manage Permissions" page - Site name was being used as the display name of all site groups! 42632: ALF-16354: Merged PATCHES/V3.4.6 to V3.4-BUG-FIX 42521: ALF-16231: Corrected LockUtils.isLockedOrReadOnly to properly handle the LOCK_EXPIRED status - Also fixed CheckOutCheckInService.checkout() to respect LOCK_EXPIRED but still disallow overwrite of unexpired WRITE_LOCKS 42522: ALF-16231: Further improvements - Renamed to isLockedAndReadOnly because that's what it means! 42644: ALF-16298: Cannot install RM amps on 4.1.1 - Passed command line arguments from shell script to mmt utility 42656: ALF-16298: Correction to DOS argument concatenation to allow multiple parameters separated by space 42664: ALF-16358: NPE detected during benchmark test. - Guarding against this in LeafScorer 42665: ALF-16360: Merged HEAD to V3.4 42440: ALF-16247: Thumbnails not rendering for PDFs with standard fonts - Because GS_LIB wasn't set on Linux and OSX 42447: ALF-16247: Thumbnails not rendering for PDFs with standard fonts - Fixes by Bitrock 42678: Merged V3.4 to V3.4-BUG-FIX (RECORD ONLY) 42244: Merged V3.4-BUG-FIX to V3.4 42172: ALF-15262: Correct handling of linked rule deletion - When the last rule is removed from a folder and the ASPECT_RULES aspect is removed from its parent, we must cascade this removal to its secondary parents 42243: ALF-15262: Further correction by Dmitry: use beforeRemoveAspect because beforeDeleteChildAssociation is not invoked on deletion of primary child associations 42279: Merged V3.4-BUG-FIX to V3.4 42278: ALF-12999: Correction by Alex M 42282: Merged V3.4-BUG-FIX to V3.4 42281: Fix for ALF-9946 Need a supported solution for switching off content indexing (FTS) -> merge only to 4.1-BUG-FIX - remove references to isIndexed property which was removed in the back port git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@42683 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2012-10-16 14:20:20 +00:00
Steven Glover	8e1e570c3c	Fix for ALF-11177: "Cannot access folder where link for content is created via CMIS Workbench" ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@37321 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2012-05-31 15:49:16 +00:00
Dave Ward	1029814dbe	Merged V4.0-BUG-FIX to HEAD ... 36744: Fix for ALF-14227: "Bulk Filesystem In-place Import Tool: 'Replace existing files' option is not working - it is enabled when the check-box was unchecked" 36745: Fix for ALF-13355: "CMIS: Error occurs trying to delete a multilingual document" 36763: ALF-14226: User with '@' symbol in username cannot login - note: related to ALF-13755 36795: Merged V4.0 to V4.0-BUG-FIX 36779: ALF-14237 Upgrades from 4.0.0.x/4..0.1.0 will not fix the timestamps on acl changesets - SOLR will skip ACLs set prior to upgrade 36794: ALF-14094: Correction to from address generation for invitation reject email 36796: Merged V4.0 to V4.0-BUG-FIX (RECORD ONLY) 36765: Merged V4.0-BUG-FIX to V4.0 36763: ALF-14226: User with '@' symbol in username cannot login - note: related to ALF-13755 36797: Merged V3.4-BUG-FIX to V4.0-BUG-FIX 36773: Merged DEV to V3.4-BUG-FIX (with improvements) 36739: ALF-11835 : Authentication chain should be validated The existence of a subsystem in a chain is validated by a check for presence of the corresponding resources. 36784: ALF-10181 Missing files from enterprise SDK - Added missing Enterprise Config 36793: (RECORD ONLY) ALF-12776: Correction to from address generation for invitation reject email git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@36799 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2012-05-23 13:43:40 +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
Nick Burch	2b3a580338	Improve the exception if you try to check out an older version of the document ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34369 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2012-03-02 16:27:28 +00:00
Dave Ward	811519ae48	Merged V4.0-BUG-FIX to HEAD ... 33116: Allow multiple deferred requests per oplock break, next level of fix for ALF-11935. 33136: Fix for ALF-12200: "Content type is not recognized on creating document from source" 33137: Activities feed generator: change info log messages to debug log messages 33139: ALF-12262 View in Source Repository works incorrect if the folder was created on target side at first 33141: Fix for ALF-12178 "Bulk import - status page shows broken link (Initiate another in-place import)" 33144: Fixes ALF-11119: The 2 tranformations didn't work - Segmentation fault in ffmpeg - it looks like a bug with ffmpeg and it was decided that compile/bug fixing ffmpeg is not a priority at the moment. The 2 entries have been commented out. If they are required, the user should consult the ffmpeg documentation for the correct version & o/s at the time. 33146: ALF-11345 Patch from Pavel Yurkevich to fix another VTI/SPP problem with site names that start with Alfresco 33147: FTP implemented set modification date/time command (MFMT). ALF-12105. 33148: ALF-12063 Pull some of the VTI list type definitions out to a common base class 33150: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX: 33076: ALF-12285: Allow dumping of schema to XML via JMX 33151: Fix problems with FTP and UTF-8. JLAN-81. When using the Java6 Normalizer use the NFC form. 33158: Fix NFS server swallows exceptions. ALF-11667. Startup exception details are now saved. 33160: Improve the Vti/SPP exception message for the case of the Vti port being already in use 33161: ALF-12063 Additional SPP/Vti list info required for Mac Office 2011 support 33162: Fixes: ALF-10322: Edit Dialogue gets out of sync if event moved using FullCalendar (extends FullCalendar to provide a callback after an event changes, which enables us to keep our event object up to date). 33163: Fixes: ALF-10248: Grey Placeholder image for unauthorised channels has now been replaced with yellow one. 33164: Fixes: ALF-11562; Refactors My Calendar dashlet to use timezone aware ISO8601 dates from updated Calendar API & removes obsolete properties from userevents calendar API 33165: Fixes: ALF-10645; i18n label doesn't appear in property bundle. 33167: Fix for ALF-11970 33168: Fix for ALF-10565 "Category manager in admin console needs query not search" - i18n'd the strings 33178: Publishing: Fixes: ALF-11552; Inline edit icon alignment issue fixed 33183: Minor fix to exception string in extendBuffer(). 33194: ALF-10545: NodeServicePolicies#onUpdateNodePolicy not adequate for NodeService#setType * Added beforeSetNodeType and onSetNodeType policies * Both callbacks have old and new types as parameters 33204: Fixes: ALF-11230, publishing tracking link opens in repository, not Doc Lib. Also fixes a couple of other minor bugs: - balloon pop up didn't appear when published from Doc Details page - tracking link appears black (on black) when hovered over. - adds defensive code to prevent an error if the expected element for the notification balloon isn't there. 33212: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX: 33211: ALF-12384: Failed schema dump can cause failure of repository start up 33217: Merged V3.4-BUG-FIX to V4.0-BUG-FIX 31840: Fix for ALF-10282 - Web Browser freezes with large xml files Web form transformation 31987: Proper fix for ALF-11489: 'patch.sitesSpacePermissions' failed on upgrade 2.2.8 -> 3.4.6 - Just handle missing defined ACLs 32341: Fix for ALF-9883 - WCM Forms: Changing 'abstract' type carries previously-added elements 32911: Add a (currently disabled) unit test for ALF-10466 - The HTML to Text transformer (not Tika based) should take account of the content encoding 32912: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2011_10_13 to BRANCHES/DEV/V3.4-BUG-FIX with changes + unit testing: 31742: ALF-10466 - The HTML to Text converter needs to take account of the Encoding set on the Content Property, to be able to correctly index MBCS text in wiki pages (and others) 32946: ALF-12161: Merged PATCHES/V3.4.5 to V3.4-BUG-FIX 32921: Merged DEV/TEMPORARY to PATCHES/V3.4.5 32913: ALF-11440: Content Manager unable to edit content from another user sandbox In order to allow a Content Manager to edit a locked document in other user's sandbox, it is needed to modify the AVMLockingAwareService.grabLock(). The 'lockState' variable could be set to 'LOCK_OWNER', if a user is ContentManager to bypass the check. 32964: Fixes ALF-11054: Sharepoint - Wrong sorting by date - incorporated patch from investigation team 32967: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2011_10_13 to BRANCHES/DEV/V3.4-BUG-FIX: 31828: Fixes ALF-10720: Webform performance improvement Minimize database usage by adding new variable to FormWrapper that holds a form's name. 32969: Fixes ALF-10471: Cannot correctly remove users from email notification rule list 32980: Merged DEV/TEMPORARY to V3.4-BUG-FIX 32961: ALF-12132: Set "common-placeholder-configurer" as parent for "lotusWSPlaceholderConfigurer" bean. 32996: ALF-12184: SchemaBootstrap must use same assumptions as PatchServiceImpl when deciding whether an alternative patch succeeded - Fixes regression introduced by r31972 / ALF-11489 33068: Added suggested fix to commit any current transactions in the NFS file expiry thread. ALF-11827. 33077: ALF-10142: Allow TinyMCE to accept <meta> element when editing HTML files inline in Share. 33094: Fix for ACT #15024-37148 (no JIRA yet) - issue where in a load balanced Share environment (multiple web-tiers behind a reverse proxy) the modification to the template layout selection for a site or user dashboard would not be reflected in all servers. 33118: ALF-12278: Prevent the copying over of headers specific to a POST request on to the touch GET request 33138: Upgraded SpringSurf to 1.0.0 rev 968 33140: Added missing json-simple jar to 3rd party eclipse classpath, which bizarrely is used to generate the JUnit cmd line unit test classpath, no really. 33145: Fix for native FTP timestamps returned in GMT timezone format. ALF-11986. 33175: ALF-12366: Cope with read committed DB behaviour in AbstractReindexComponent.reindexTransaction() 33179: ALF-12344 CLONE - Copyright notice shows Alfresco Software, Inc. © 2005-2011 All rights reserved.... should now be to 2012 as that is when we will release 3.4.7 - Being done in 3.4.8 not 3.4.7 33190: Latest SpringSurf libs: - much improved handling of multiple connections and connection reuse in RemoteClient - improves connection reuse generally, but also much more stable under load balancing condition with multiple Share web-tiers behind a reverse proxy 33193: ALF-12344 CLONE - Copyright notice shows Alfresco Software, Inc. © 2005-2011 All rights reserved.... should now be to 2012 as that is when we will release 3.4.7 - Found a few more having followed previous date changes and searches 33203: Fix for HttpClient issue: Error status 500 Unbuffered entity enclosing request can not be repeated. 33206: Fix to FormUIGet - no need to manually patch up the JSON request since rev 33138 (SpringSurf 1.0.0) 33218: Fix for ALF-11868 "CMIS: removeAcl() function doesn't work via atompub." 33220: Merged PATCHES/V3.4.6 to V4.0-BUG-FIX 32405: Merged V3.4.6 (3.4.6.1) to V3.4.1 (3.4.1.24) 32404: ALF-11727 CLONE - Pending Invite Search doesn't return anything if there's more than 1000 pending invites across all sites. Removed read only transaction from invites.get.desc.xml as it broke InviteServiceTest testRejectInvite 32397: ALF-11727 CLONE - Pending Invite Search doesn't return anything if there's more than 1000 pending invites across all sites. Return first 200 invitations (similar to 4.0 paging) Transaction used by the invites.get is now read only so does not force a flush of caches. 32503: Merged PATCHES/V3.4.6 to PATCHES/V3.4.1 32501: ALF-11727: Reinstated read-only transaction around invites.get and prevented it from trying to lazily create persons from rejected invites that had previously been deleted by InviteHelper.cleanUpStaleInviteeResources! 32650: ALF-11872: When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete Put back in cut off at 200 invites (removed in last merge) for UI, unless we know that we need all of them internally 32775: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete Even more changes: - reduce number of queries required to list pending invites to a site (uses moderated and nominated caches and only looks up IDs if possible) - change hibernate cache and flush modes (to avoid cache and the related slow flush), for queries and cancel of workflows - modified js which was making a query for each person in order to work out if they were already in a pending invites list 32838: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete - JBPMEngine now supports batch cancelWorkflows() method for canceling multiple workflows at the same time (e.g. on deleting a site) - Manual flushes only used at two points in the batch to minimize dirty checking overhead and yet avoid FK errors - Performance implications still to be checked but at least functionally correct - Corrected JPDL source jar 32857: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete - Search for Pending invites was slow on sites with > 0 pending invites (it was getting invites for all sites) 32861: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete - JBPMEngine uses an abstract list to 'lazily' convert hibernate objects on demand and avoid batch loading too many objects 32868: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete - Rationalization of batch fetching at hibernate layer 32881: ALF-11872: The saga goes on! Corrected empty list handling in InvitationServiceImpl.searchInvitation(). 32927: ALF-11872: Fix parameter validation in InvitationServiceImpl.getInvitationTasks() 32936: ALF-11872: A site with 1200 pending invites can now be deleted without the UI timing out - Pending invitation workflows are cancelled in an asynchronous action - The asynchronous action completes about 3 minutes later, due to the massive number of individual delete statements being run by Hibernate - Creating the rows in the first place took 20 minutes! 32956: ALF-11872: Corrected filtering in InvitationServiceImpl.getInvitationTasks() to only include start tasks - plus recautionary sleep() in InviteServiceTest.tearDown() to ensure asynchronous invite deletions complete 33169: ALF-12312 'org.hibernate.LazyInitializationException: could not initialize proxy - no Session' when clicking on a Pending Invite workflow task in JSF - Follow on from ALF-11872: Only use lazyloaded WorkflowTasks from JBPMEngine.getWorkflowTasks() when we are using the same session (currently only done from InvitationService). The fallback is to assume it is not the same session and return a normal list of Workflows. 33221: Merged V3.4-BUG-FIX to V4.0-BUG-FIX (RECORD ONLY) 30463: L10N Updates from Gloria (based on r30332): Fixes ALF-8211 and new string updates 30473: Merged HEAD to V3.4-BUG-FIX 30468: Fixed ALF-10280: Slow to report ® Duplicate entry ¯ in database. - DuplicateChildNodeNameException implements DoNotRetryException 30685: Merged HEAD to V3.4-BUG-FIX 30679: Unit test for ALF-1017 - Non site content in the Sites Space 30683: ALF-1017 Remove EVERYONE Contributor permissions from /Company Home/Sites/, to avoid misc nodes being created in there by mistake by users, and update the SiteService to runAsSystem when creating the Site node 30693: Merged HEAD to V3.4-BUG-FIX 30692: Fix ALF-1017 specific test following ALF-1017 changes to permissions 30808: Fixes: ALF-10485 (minor text update) 30873: Latest L10N update from Gloria (based on r30698): - Adds Web Quick Start translations (back port from 4.0) - Adds/updates new or previously missing strings 31019: Merged HEAD to V3.4-BUG-FIX 28974: added double-checks for associations when a potential failure is detected 31018: Fixed ALF-9591: Integrity check: Association source multiplicity checking is incorrect - Drop checks for source multiplicity when no associations are pointing to a type/aspect instance 31045: Merged HEAD to V3.4-BUG-FIX 31044: Performance improvements for PATH queries relating to Share dashboard dashlets and document library. - tweaks to generation of PATH queries - hugely improves performance when dealing with 1000's site memberships 31160: Merged HEAD to V3.4-BUG-FIX 31156: Various Share search related fixes as spotted by Andy: - increased resultset size that is used to retrieve raw results from query before Share specific results are filtered - this means sensible results are now shown from large repository wide and sorted queries, previously results would be "missing" if they dropped out of the resultset prefiltering - fix to Share Search component to correctly display if more than N results were found in the repository - fix to add default TYPE clause to generated Share search if no other TYPE is specified - this reduces masses of potentially matches results from repository wide searches that would otherwise need to be post-filtered 31345: Merged HEAD to BRANCHES/DEV/V3.4-BUG-FIX: 31330: Fixed WCM bulkImport's importDirectory 31442: Merged HEAD to V3.4-BUG-FIX 31441: Fixed ALF-11014: Content output stream close errors are absorbed silently - Found while testing XAMcontentStore - Pulled stream copy code into AbstractContentWriter - OutputStream closure (write-side) exception is rethrown to allow full rollback, etc 31444: Merged HEAD to BRANCHES/DEV/V3.4-BUG-FIX: 31383: MLPropertyInterceptor performance improvements: 31758: Merged V3.3 to V3.4-BUG-FIX 31757: ALF-11279: Fixed RetryingTransactionInterceptor so that it actually behaves like an interceptor and doesn't throw away the rest of the interceptor chain! 31798: Merged V3.3 to V3.4-BUG-FIX 31773: ALF-11279: Further RetryingTransactionInterceptor fixes - must do mark for rollback on propagating transactions 32051: ALF-7195: Merge HEAD (4.0) to V3.4-BUG-FIX (3.4.7) Merge was simply to take HEAD version to pick up changes made by Derek to DisableAuditableBehaviourInterceptor 32047: ALF-8882 Edit Online: Modifier and Modified date are changed even no changes were applied - needed to turn off ASPECT_AUDITABLE on removeProperty which is called on unlock - added code to not enable this aspect early if nested calls were made (this is not done, but is safer this way) 32088: Merging HEAD to 3.4-BUG-FIX: r32063: ALF-10947 Fixed issue where repeating JBPM timer was causing an infinite loop if an exception was thrown within the timer event. 32475: ALF-11727 Improved performance of pending invites search. 32512: Incremented version revision for 3.4.8 32917: ALF-12133: Merged HEAD to V3.4-BUG-FIX 32906: ALF-12068 - Zimbra desktop - corrected InternalDateAsString. 32923: ALF-12133: Merged HEAD to V3.4-BUG-FIX 32918: ALF-12133 - Attempt 2 to get Imap internal date correct. 33021: ALF-9878: Merge V3.4.1 (3.4.1.25) to V3.4-BUG-FIX (3.4.8) 32956: ALF-11872: Corrected filtering in InvitationServiceImpl.getInvitationTasks() to only include start tasks - plus recautionary sleep() in InviteServiceTest.tearDown() to ensure asynchronous invite deletions complete 32936: ALF-11872: A site with 1200 pending invites can now be deleted without the UI timing out - Pending invitation workflows are cancelled in an asynchronous action - The asynchronous action completes about 3 minutes later, due to the massive number of individual delete statements being run by Hibernate - Creating the rows in the first place took 20 minutes! 32927: ALF-11872: Fix parameter validation in InvitationServiceImpl.getInvitationTasks() 32881: ALF-11872: The saga goes on! Corrected empty list handling in InvitationServiceImpl.searchInvitation(). 32868: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete - Rationalization of batch fetching at hibernate layer 32861: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete - JBPMEngine uses an abstract list to 'lazily' convert hibernate objects on demand and avoid batch loading too many objects 32857: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete - Search for Pending invites was slow on sites with > 0 pending invites (it was getting invites for all sites) 32838: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete - JBPMEngine now supports batch cancelWorkflows() method for canceling multiple workflows at the same time (e.g. on deleting a site) - Manual flushes only used at two points in the batch to minimize dirty checking overhead and yet avoid FK errors - Performance implications still to be checked but at least functionally correct - Corrected JPDL source jar 32775: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete Even more changes: - reduce number of queries required to list pending invites to a site (uses moderated and nominated caches and only looks up IDs if possible) - change hibernate cache and flush modes (to avoid cache and the related slow flush), for queries and cancel of workflows - modified js which was making a query for each person in order to work out if they were already in a pending invites list 32650: ALF-11872: When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete Put back in cut off at 200 invites (removed in last merge) for UI, unless we know that we need all of them internally 33143: Merged BRANCHES/V3.4-TEAM to BRANCHES/DEV/V3.4-BUG-FIX 25103: ALF-6613 - SpringSurf improvements to allow easier refactoring of Document Details page - removed manual request level caching of remote calls responses in web-tier components - now completely automatic 25138: Flattening of user preferences remote calls - ensures /preferences hits the RequestCachingConnector - reduces no. of remote calls by 3 for the doclib and by 4 for a site dashboard. 33216: Merged PATCHES/V3.4.1 to V3.4-BUG-FIX (3.4.8) 32405: Merged V3.4.6 (3.4.6.1) to V3.4.1 (3.4.1.24) 32404: ALF-9878 / ALF-11727 CLONE - Pending Invite Search doesn't return anything if there's more than 1000 pending invites across all sites. Removed read only transaction from invites.get.desc.xml as it broke InviteServiceTest testRejectInvite 32397: ALF-9878 / ALF-11727 CLONE - Pending Invite Search doesn't return anything if there's more than 1000 pending invites across all sites. Return first 200 invitations (similar to 4.0 paging) Transaction used by the invites.get is now read only so does not force a flush of caches. 32503: Merged PATCHES/V3.4.6 to PATCHES/V3.4.1 32501: ALF-9878 / ALF-11727: Reinstated read-only transaction around invites.get and prevented it from trying to lazily create persons from rejected invites that had previously been deleted by InviteHelper.cleanUpStaleInviteeResources! 32641: ALF-12387 / ALF-11872: Merged V3.4-BUG-FIX (3.4.8) to V3.4.1 (3.4.1.25) 32475: ALF-11727 Improved performance of pending invites search. (N Smith changes to do with only using ONE search value - faster as multiple are taken as ORs rather than ANDs) 32650: ALF-12387 / ALF-11872: When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete Put back in cut off at 200 invites (removed in last merge) for UI, unless we know that we need all of them internally 32775: ALF-12387 / ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete Even more changes: - reduce number of queries required to list pending invites to a site (uses moderated and nominated caches and only looks up IDs if possible) - change hibernate cache and flush modes (to avoid cache and the related slow flush), for queries and cancel of workflows - modified js which was making a query for each person in order to work out if they were already in a pending invites list 32838: ALF-12387 / ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete - JBPMEngine now supports batch cancelWorkflows() method for canceling multiple workflows at the same time (e.g. on deleting a site) - Manual flushes only used at two points in the batch to minimize dirty checking overhead and yet avoid FK errors - Performance implications still to be checked but at least functionally correct - Corrected JPDL source jar 32857: ALF-12387 / ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete - Search for Pending invites was slow on sites with > 0 pending invites (it was getting invites for all sites) 32861: ALF-12387 / ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete - JBPMEngine uses an abstract list to 'lazily' convert hibernate objects on demand and avoid batch loading too many objects 32868: ALF-12387 / ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete - Rationalization of batch fetching at hibernate layer 32881: ALF-12387 / ALF-11872: The saga goes on! Corrected empty list handling in InvitationServiceImpl.searchInvitation(). 32927: ALF-12387 / ALF-11872: Fix parameter validation in InvitationServiceImpl.getInvitationTasks() 32936: ALF-12387 / ALF-11872: A site with 1200 pending invites can now be deleted without the UI timing out - Pending invitation workflows are cancelled in an asynchronous action - The asynchronous action completes about 3 minutes later, due to the massive number of individual delete statements being run by Hibernate - Creating the rows in the first place took 20 minutes! 32956: ALF-12387 / ALF-11872: Corrected filtering in InvitationServiceImpl.getInvitationTasks() to only include start tasks - plus recautionary sleep() in InviteServiceTest.tearDown() to ensure asynchronous invite deletions complete 33169: ALF-12382 / ALF-12312 'org.hibernate.LazyInitializationException: could not initialize proxy - no Session' when clicking on a Pending Invite workflow task in JSF - Follow on from ALF-11872: Only use lazyloaded WorkflowTasks from JBPMEngine.getWorkflowTasks() when we are using the same session (currently only done from InvitationService). The fallback is to assume it is not the same session and return a normal list of Workflows. 33224: Fix for ALF-12230 "Bootstrap re-encryption failed" 33225: Fix for ALF-12349 Transformations need to handle failures due to server being busy. Change to system behaviour: We want to support transient failures of thumbnail creations. Primary example now is the Polymorph Transformation Server which can fail transformations because it is under load and wishes to decline transform requests. Prior to this check-in, such failures would be interpreted by Alfresco as 'real' failures and the content node would be marked as FailedToTransform. The transformers' state data would also be affected by the failure. We need to allow transformers to fail and NOT trigger any negative consequences such as above. Changes in code: New exception type ActionServiceTransientException when thrown from an ActionExecuter will NOT trigger any compensating action that has been configured. This allows actions to fail 'normally' or due to some transient condition with the implication that if rerun later the action may succeed. Additional end-state for Actions in the ActionTrackingService: ActionStatus.Declined. The ActionExecuter has declined to execute the action at this time. New exception type ContentServiceTransientException which means that a content operation (currently only a transformation) has failed due to a transient condition. CreateThumbnailActionExecuter catches this exception type and throws the ActionServiceTransientException. Tests at the ActionServiceImpl, ActionTrackingServiceImpl and ThumbnailServiceImpl APIs & various test config & other changes. 33231: ALF-10581 - MySQLIntegrityConstraintViolationException: Cannot add or update a child row: a foreign key constraint fails ... fk_alf_cass_cnode - unexpected non-null child node id when creating a new node (see also THOR-906) - for now genericise ALF-10153 (to include at least MySQL in addition to MS SQL Server) 33237: Fixing JUnit jar's src attachment. 33238: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX: 33222: ALF-12351: Separate schema descriptor files for table prefixes: alf_, avm_, JBPM_, act_ 33235: ALF-12351: Separate schema descriptor files for table prefixes: alf_, avm_, JBPM_, act_ 33239: partial fix for: ALF-10446 - Upgraded FullCalendar to support ISO8601 Zulu timezone & told it not to ignore the timezone information. 33240: Implementation of improvement ALF-12404. This fix has been OK'd by Andy Hind. 33246: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX: 33244: ALF-12352: Add JMX support to trigger a schema check manually 33252: Merged V3.4-BUG-FIX to V4.0-BUG-FIX (RECORD ONLY) 33245: ALF-12366: Delete a node by deleting its row and inserting a new one with the deleted flag set - Forces a new ID to be generated for the deleted node - Makes it impossible to simultaneously delete a node and add new children in two concurrent transactions - Can't be merged to 4.0 due to SOLR - needs something more clever! 33250: ALF-12366: Derek code review 33254: Merge V3.4-BUG-FIX to V4.0 BUG-FIX 33249 - ALF-12342 Excel 2003 Patterns. 33256: ALF-12386 Change the simpler projects to use explicit dependencies, rather than blindly importing all of 3rd-party, to make generating downstream Maven POMs easier 33266: ALF-12163 - mail.parameters.from does not use the from address provided 33283: ALF-12185 SPP/Vti Mac Office checkin correction for Collaborators (Patch from Pavel Yurkevich) 33295: Fix to SMTP authentication implementation. 33296: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX 33285: Fix for ALF-12336 - Share loses performance if noncachableObjectTypes are defined (page & component) - New and improved mechanism for dealing with cache invalidation in Share load balancing and clustering based on the Hazelcast messaging system - See http://www.hazelcast.com/docs.jsp - and specifically http://www.hazelcast.com/docs/1.9.4/manual/single_html/#SpringIntegration - Sample per node cluster config provided in custom-slingshot-application-context.xml.sample - Tested with an Alfresco cluster plus a Share cluster both balanced via Apache server instances - Significantly improved Share stability with latest SpringSurf libs and individual node performance back up to non-clustered node speed Modified Alfresco JLan build to use newer hazelcast JAR and also modified existing build file references to use new jar location. 33297: Merge V3.4-BUG-FIX (3.4.8) to V4.0-BUG-FIX (4.0.1) (RECORD ONLY) 33292: ALF-12457: Merge V3.4.4 (3.4.4.8) to V3.4-BUG-FIX (3.4.8) 33287: ALF-12400: Merged DEV/BELARUS/V3.4-BUG-FIX-2012_01_10 to V3.4.4 (3.4.4.8) 33284: ALF-12400 CLONE - Security risk in Web View dashlet The check for user role was added to Web View and Site Links dashlets to disallow to configure Web View for Consumer, Contributor, and Collaborator roles and disallow to add Site Links for Consumer role. 33286: ALF-9514 I18N: Model constraint values need localized display names - Applied diff file attached to JIRA issue (with a minor compiler error correction). It appeared to be a merge of: DEV/SWIFT r27643, r27645, r27692, r27846 and HEAD r28405, r29364 33298: ALF-12461 If the OOXML file contains a thumbnail image, use this for the document thumbnail, plus improve the iWorks analoguous transformer 33305: Fix for ALF-12463 Error querying database was detected during upgrade process from 3.1 to 4.0.0. 33306: Experiment - adding an sdk-extras target for the enterprise specific bits of the SDK. 33308: Merged V3.4-BUG-FIX (3.4.8) to V4.0-BUG-FIX (4.0.1) 33242: ALF-5830 show_audit.ftl template doesn't work anymore - ISO9075 encode the node path 33271: ALF-9659 In auditing, nodeNameValue extractor never works on a deletion event. - As pre call audit is not discarded on transaction rollback, we need to be able to have access to pre call values in the post call audit application. One such value is the nodeName for the post call of NodeService.deleteNode() 33274: Merged DEV to V3.4-BUG-FIX 33273: ALF-12314: Failed to create content due to error: lockOwner is a mandatory parameter It is necessary to pass the correct 'lockOwner' of a rendition, for example, to use 'rr.getLockOwner()' instead of 'lockOwner' 33277: ALF-12436: Merged PATCHES/V3.4.6 to V3.4-BUG-FIX 33275: ALF-12426: Correction to joins in select_ContentDataByNodeIds - inner join to alf_node_properties first 33279: ALF-12366: Merged PATCHES/V3.4.6 to V3.4-BUG-FIX 33278: ALF-12393: Another indexing race condition when MySQL read committed is enabled, this time in the debug diagnostics! 33282: Merged V3.4 to V3.4-BUG-FIX 32979: ALF-12114: Reverse merged ALF-10282 and related changes from V3.4-BUG-FIX, which have caused serious regressions 31840: Fix for ALF-10282 - Web Browser freezes with large xml files Web form transformation 32341: Fix for ALF-9883 - WCM Forms: Changing 'abstract' type carries previously-added elements 32998: (RECORD ONLY) Merged V3.4-BUG-FIX to V3.4 32996: ALF-12184: SchemaBootstrap must use same assumptions as PatchServiceImpl when deciding whether an alternative patch succeeded - Fixes regression introduced by r31972 / ALF-11489 33084: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2011_12_06 to V3.4 (3.4.7) 33069: ALF-12266 NPE creating content using the web form Locale language can be passed not only as lang_country but as only country code as well. 33257: ALF-10340: patch.db-V2.2-CleanNodeStatuses must now have patch.db-V2.2-Upgrade-From-2.2SP1 as an alternative to allow upgrade from 2.2.8 - That's because patch.db-V2.2-Upgrade-From-2.2SP1 exists in 2.2.8 and once run it's too late to run patch.db-V2.2-CleanNodeStatuses 33260: Set failonany=true on distribute-installers parallel task so that the build actually fails if an installer fails to build 33301: ALF-12464: Merged PATCHES/V3.4.5 to V3.4-BUG-FIX 33299: ALF-12281: Memory leak in ReferenceCountingReadOnlyIndexReaderFactory - The diagnostic code I added to track memory leaks was actually causing some! - For some reason I was recording a new reference when the index reader was dereferenced rather than clearing it - Would affect scenarios where the main index is long-lived and there are no writes to it and lots of searches - Spotted by Pavel - Too much late night coding! 33303: ALF-12464: Merged PATCHES/V3.4.5 to V3.4-BUG-FIX 33302: ALF-12281: Correction to previous checkin - deal with the initial reference created by the constructor and cleared by closeIfRequired() 33315: ALF-11214 - IMAP subsystem is not successfully restarted after incorrect modification of IMAP properties via Admin Console 33321: Remove /hazelcast lib dir include which is no longer required as libs are now at lib root folder 33322: ALF-2550 - Enterprise SDK files do not contain enterprise repository project. 33323: SDK - Added Enterprise third party libs. 33327: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/V4.0-BUG-FIX: 33324: Fix for THOR-941. Some MIME types appear as Unknown in metadata form. The inconsistencies in the edit mimetype form were slightly different on V4.0.1 so I tidied them up. 33330: ALF-12487 In Mimetype Detection, if Tika detects a generic type of text/plain or XML, defer to the Alfresco filename based type (as we already do for octet stream) 33335: Quick build fix - comment out SDK enterprise docs while I work out what's wrong. 33353: Added more projects to Enterprise Generate Docs. 33357: When installing a module the tool reads the war's version.properties file and will not install if the war version is outside the repoVersionMin or repoVersionMax 33361: Merged DEV/GETHIN/FINDBUGS to V4.0-BUG-FIX 32962: Findbugs fix: Suspicious comparison of Integer references 32963: Findbugs fix: Call to equals() compares different types 32968: hashcode should be hashCode 32970: Findbugs fix: Suspicious comparison of Integer references 32972: Findbugs fix: Suspicious comparison of Integer or Long references 32976: Findbugs fix: .remove() incompatible with expected argument type String 32977: Findbugs fix: String is incompatible with expected argument type 32978: Findbugs fix: Call to equals() compares different types I prefer this fix to the previous one I did 32982: Findbugs fix: Call to equals() compares different types classDefinition.getName().equals instead of classDefinition.equals 32983: Findbugs fix: String is incompatible with expected argument type java.util.Locale 32984: Findbugs fix: An apparent infinite loop 32985: Findbugs fix: bad month value of 12 passed to new java.util.GregorianCalendar This code passes a constant month value outside the expected range of 0..11 to a method. 32986: Findbugs fix: authenticationComponent masks field from superclass 32987: Findbugs fix: Invocation of toString on Array Now uses Arrays.toString() 32988: Findbugs fix: Incorrect lazy initialization of static field Now uses static initialization block 32989: Findbugs fix: Dead code: A null pointer would have been thrown before these lines 32990: Findbugs fix: possible null pointer dereference Just made the code a little clearer 32991: Findbugs fix: class defines a clone() method but the class doesn't implement Cloneable. 32992: Findbugs fix: All equals() methods should return false if passed a null value. 32993: Findbugs fix: Invocation of toString on Array Now uses Arrays.toString() 32994: Findbugs fix: If the multiplication is done using long arithmetic, you can avoid the possibility that the result will overflow. 33006: Findbugs fix: possible null Just made the code a little clearer 33007: Findbugs fix: Invocation of toString on Array Now uses Arrays.toString() 33008: Findbugs fix: Call to String.equals(Character) Explicitly using String 33009: Findbugs fix: int converted to long and passed as absolute time to new java.util.Date(long) Now works after the year 2037! 33014: Findbugs fix: Invocation of toString on Array Now uses Arrays.toString() 33023: Findbugs fix: There is an apparent infinite recursive loop No longer 33025: Findbugs fix: possible null Just made the code a little clearer 33026: Findbugs fix: impossible null check Changed && to || 33029: Findbugs fix: Minor change to Integer.valueOf 33126: Findbugs fix: Comparison of String objects using == now used .equals 33127: Findbugs fix: Unwritten field. All reads of it will return the default value. Now sets values in the constructor 33128: Findbugs fix: Removed try/catch 33129: Findbugs fix: Added an assertTrue to the unit test 33130: Findbugs fix: Passes null for nonnull parameter Mocked the serviceReg and now the tests work! 33131: Findbugs fix: Call to a collection method contains an argument with an incompatible class from that of the collection's parameter 33133: Findbugs fix: Deadly embrace between inner class and thread local - not eligible for garbage collection. Made inner class static 33182: Findbugs fix: possible null Now intialises documentPaths correctly 33184: Findbugs fix: possible null pointer (no more) 33185: Findbugs fix: Comparison of itself Changed variable name to fixedValue 33186: Findbugs fix: Possible null pointer dereference of nodePair Now continues 33187: Findbugs fix: This code seems to be using non-short-circuit logic 33188: Findbugs fix: Possible null pointer dereference of entry Discussed with Andy. If there's no entry then throw the exception, we can't continue 33189: Findbugs fix: Call to a collection method contains an argument with an incompatible class from that of the collection's parameter It must want to remove the user 33199: Modified the end of line character 33209: Changed tabs for spaces 33210: I removed the "if" because it was never called, however Brian suggested moving it to a place where it would be called! 33363: Fix for ALF-12374 - Share sample 'share-config-custom.xml' is missing an endpoint 'activiti-admin' 33364: Merge V3.4-BUG-FIX to V4.0-BUG-FIX 33362 : ALF-12448 - Missing jars in enterprise SDK 33376: Merged (RECORD ONLY) V3.4-BUG-FIX (3.4.8) to V4.0-BUG-FIX (4.0.1) 33375: ALF-12154: Merged HEAD to V3.4-BUG-FIX (3.4.8) Requested to RECORD ONLY this change when merging back to HEAD/V4.0-BUG-FIX etc. - Removed duplicate 'List constraint display labels' values from bpm-messages*.properties and dictionarydaotest_model.properties. May have been introduced by ALF-9514 changes in the same area, which was also RECORD ONLY - Manual merge of JSON propertyLabels that exist in HEAD back into 3.4.8 32724: OPEN : ALF-11176: Untranslated strings in Group Review and Approve Task form Activiti has one default transition "Next". If there is no transition then the model builder was not finding a translation for the task outcome (and just using the english word, e.g. "Approve"). Now it looks up the translation workflowtask.outcome.[wf:outcome property] 32943: FIXED : ALF-11176: Untranslated stings in Group Review and Approve Task form I've changed the way task descriptions are retrieved. You can now enter translations for them. 33377: ALF-12509: ibooks Format Added quick.ibooks file 33378: ALF-12207 IMAP: Empty file is not opened/downloaded (using IMAP Content Links) if it was uploaded to Share via fileserver 33379: Add the TIFF mimetype 33380: Improve the stream to Tika conversion code, following review for THOR-952 33385: Upgrade to the latest Tika and POI, for recent bug fixes 33387: ALF-12492 - Email with empty subject sent to Alfresco by SMTP cause Null pointer Exception 33396: ALF-12497 - Opening and closing (not save) MS Exel 2003 file via CIFS adds new version 33397: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX: 33259: ALF-12354: DB2 reference files. 33261: ALF-12354: MySQL reference files. 33268: ALF-12354: Oracle reference files 33310: ALF-12354: Create schema reference files for MySQL, PostgreSQL, Oracle, DB2 33349: ALF-12354: Create schema reference files for MySQL, PostgreSQL, Oracle, DB2 33366: ALF-12412: Schema reference files should contain schema version number 33367: ALF-12412: Schema reference files should contain schema version number 33373: ALF-12354: Added comment to DB2 file regarding intermittent comparison failures. 33389: ALF-12516: Produce XML schema definition file (XSD) for schemacomp reference files. 33390: ALF-12516: added missing file (the actual XSD!) 33392: ALF-7260 RINF 03: Automate DB schema validation 33401: FindFindbugs fix: Maybe Derek expected null after all 33406: Latest SpringSurf libs - fixed use of java.util.UUID which blocks 33407: Merged BRANCHES\DEV\V3.4-BUG-FIX to BRANCHES\DEV\V4.0-BUG-FIX 33399: Fix for ALF-11962 Lucene queries searching on metadata (not on cm:content) with stopwords returns wrong results 33414: ALF-11746 Webscript to expose the repository mimetypes, along with their user facing display names and their extensions 33415: ALF-11746 Mimetype information can be available to all 33442: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX 33441: Latest SpringSurf libs - performance and thread safety improvements. 33447: Fix to email test - query error exposed by recent change. 33451: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX: 33446: ALF-12354: fixed DB2 intermittent unique index creation problems. 33448: ALF-7260: removed redundant code. 33454: Merged (RECORD ONLY) V3.4-BUG-FIX (3.4.8) to V4.0-BUG-FIX (4.0.1) 33388: Removed L10N that no longer have a default. 33437: ALF-9514 I18N: Model constraint values need localized display names - Undo changes to webclient_ja.properties that were made by r33286 for this issue. There were no changes in webclient.properties that did not already exist in webclient_ja.properties This should simplify translations. 33453: ALF-9514 I18N: Model constraint values need localized display names - Tidy up mess to do with the initial r33286 revision for this issue. Lots of L10N property changes. I think some of my trial merges from 4.0 did not get reverted before I applied the diff file. Reverse merged r33437 and r33286. Note r33388 and r33375 (for ALF-12154) already included changes to try and fix the initial revision. 33456: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX: 33455: ALF-12410: JMX Dumps taking very long to finish 33457: SDK build fix 33463: Add in Enterprise Docs to SDK (again) 33464: Merged V3.4-BUG-FIX to V4.0-BUG-FIX 33312: ALF-12448: Merged HEAD to V3.4-BUG-FIX (3.4.8) 33304: ALF-7542 SDK is missing spring-test.jar - ant script modified to copy org.springframework.test*.jar files into root\build\assemble\sdk\lib\server\dependencies 33382: ALF-10239 Form validation bug when content becomes invalid after XSD change - override isValidForSubmit function in alfresco.xforms.TextField as alfresco.xforms.Widget version does not check the max length 33383: Fix for ALF-11791 - Multiple search on category in Share Advanced Search return no result Merged HEAD to BRANCHES/DEV/V3.4-BUG-FIX 29710: SVC15: Contribution: Alfresco Share Adv Search Enhancement: Allow advanced search on category to include sub-categories in query by checking a checkbox as in Alfresco Explorer (ALF-7157) A new "showSubCategoriesOption" has been added to the "category.ftl" form control, that when set to true (as shown in the example config snippet below) will display a checkbox allowing the user to request all sub categories be searched as well as the selected ones. <field id="cm:categories"> <control> <control-param name="compactMode">true</control-param> <control-param name="showSubCategoriesOption">true</control-param> </control> </field> 30572: Fix for ALF-7008 - Double category in Share Advanced Search return no result 33384: Fix for ALF-12469 - Change method BaseAssociationEditor.generateFormSubmit to protected 33400: ALF-12366: Merged PATCHES/V3.4.6 to V3.4-BUG-FIX 33354: ALF-12393: Parent assocs must be cached with a txn ID, even when a node has no parents - Use left outer join in parent assocs query 33355: ALF-12393: Fixed typo in SQL + allowed assocIndex to be null 33413: ALF-12219: Fix CommandServlet to not mess up Document List and My Spaces List dashlets on Websphere 33416: ALF-12411: Merged DEV to V3.4-BUG-FIX (with corrections) 33404: Fix that introduces full Unicode character support into jBPM 3.3.1: - new patch that alters columns of the jBPM 3.3.1 tables to change 'TEXT' datatype to 'NVARCHAR(MAX)' (SQL Server and Generic dialects); - 'jbpm-upgrade.sql' patch modified to alter as in the new patch; - 'AlfrescoSQLServerDialect' fixed to allow create tables with 'CLOB' columns as 'NVARCHAR(MAX)' columns - devious chain of alternatives (suggested by Derek) introduced to make sure the right patch executes under the right circumstances 33418: ALF-9507: Fixed possible LDAP security hole Now we force RFC 2254 escaping of the user DN resolution query using argument substitution, as described here http://docs.oracle.com/javase/jndi/tutorial/ldap/search/search.html 33419: ALF-9658: Corrected AFTER_INACTIVITY cache update behaviour in InMemoryTicketComponentImpl - Now the key is preserved on entry update and not accidentally regenerated 33421: Merged DEV to V3.4-BUG-FIX 32042: ALF-11448: ArrayIndexOutOfBoundsException caused by unsynchronized call in org.alfresco.repo.webdav.WebDAV.formatModifiedDate Creation of SimpleDateFormatter was moved to a method. 33422: ALF-12302: /api/tags API returns badly-formed JSON - Resolved as suggested by MH 33423: ALF-10312: Parameter Based Redirection - Now we validate that the Explorer login page redirect URL is within the context path of the application (/alfresco) 33424: Merged DEV to V3.4-BUG-FIX 33358: ALF-11719: Webscript fails due to colon in password Split basic authentication header by first colon. Remaining part is user's password. 33425: Merged DEV to V3.4-BUG-FIX 33359: ALF-12071: Windows 7 cannot open files stored on Alfresco mounted as a webdav network drive if the filename contains + (plus) character For Windows 7 we SHOULD decode the file name gotten from GET request taking into account that "+" is not encoded as "%2B" for GET request. 33426: Merged DEV to V3.4-BUG-FIX (with corrections) 33374: ALF-10713: Remaining dependencies repo.remote.url from outboundSMTP-context.xml and activities-feed-context.xml was removed and SysAdminParams bean was injected instead. - MailActionExecuter.URLHelper returns url to alfresco using SysAdminParams. 33427: ALF-10713: repo.remote.url no longer used in 3.4.8 so removed altogether 33429: Merged HEAD to BRANCHES\DEV\V3.4-BUG-FIX 31191: First fix for ALF-10741 TAG field does not support wildcard, prefix, fuzzy queries etc -> wildcard searches entered by users will fail (for ALF-12162) 33433: ALF-12411: Fixed postUpdateScriptPatches declaration 33435: ALF-11719: Fix Authorization and AuthorizationTest 33436: ALF-12411: Fixed patch script paths 33445: Fixes: ALF-12389; internationalises the tool tip strings for changing the data list sort order. 33449: ALF-12411: Fixes from Dmitry - Corrected ID of patch.db-V3.4-Upgrade-JBPM - dependsOn property has no effect on a SchemaUpgradeScriptPatch - order controlled by schemaBootstrap.postUpdateScriptPatches 33459: ALF-9811: SSOAuthenticationFilter now supports basic auth as well. 33471: ALF-12297 Emailing to document via inbound SMTP causes integrity violation 33473: Reference schema files moved on from 5025 to 5026 33478: Fix for ALF-12515 33479: Fix for ALF-11116 33481: Fix for ALF-12099 33487: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX: 33485: ALF-12598: Incorrect column order on indexes and primary keys must be reported to user 33496: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX: 33494: ALF-12412: Schema reference files should contain schema version number 33508: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX: 33507: ALF-12412: Added missing files 33515: Merge (Record Only) V3.4-BUG-FIX to V4.0-BUG-FIX 33495 : SDK Build fix - do not merge to V4.0 33517: V4.0 version of the fix for ALF-12393 - The node caching structure in 4.0 is version-based and there was already a check to ensure that in-memory vs database versions matched for all calls to get parent associations. - Added an additional version check for cases where the node returns no parent associations - Removed right outer joins associated with the 3.4 fixes (minor complexity that is no longer required) 33555: Merged (RECORD ONLY) V3.4-BUG-FIX (3.4.8) to V4.0-BUG-FIX (4.0.1) 33554: Merged V3.4 (3.4.8) to V3.4-BUG-FIX (3.4.9) 33512: GERMAN: L10N Updates, fixes: ALF-12154, ALF-9514, ALF-12389 33513: SPANISH: L10N Updates, fixes: ALF-12154, ALF-9514, ALF-12389 33514: FRENCH: L10N Updates, fixes: ALF-12154, ALF-9514, ALF-12389 33516: ITALIAN: L10N Updates, fixes: ALF-12154, ALF-9514, ALF-12389 33526: JAPANESE: L10N Updates, fixes: ALF-12154, ALF-9514, ALF-12389 33544: SPANISH: Fixes additional Spanish translation bugs 33552: JAPANESE: Adds previously missing workflow related translations 33560: Fix the line endings to be consistent 33561: DOC-335 Provide a commented out example of SPP/Vti SSL Configuration in the Module 33563: Merge (Record Only) V3.4-Bug-FIX to V4.0-BUG-FIX 33328 : ALF-12098 Issue ALF-4010 not fully resolved. ftp transfer of a previously moved file copies it to the destination folder of the previous move 33566: fixed a comment. 33567: Small change to debug logging 33568: Removed deleteConfirm flag. Not neccessary as events are fired postCommit. 33570: Merged V3.4-BUG-FIX to V4.0-BUG-FIX 33550: Fixed ALF-10895 "Links, documents and folders: Unable to delete comments" - Made sure no "content" is sent when using HTTP DELETE to avoid proxy issues 33574: Merged (RECORD ONLY) V3.4-BUG-FIX (3.4.8) to V4.0-BUG-FIX (4.0.1) 33573: Merged V3.4 (3.4.8) to V3.4-BUG-FIX (3.4.9) 33557: JAPANESE: Removes redundant string 33576: ALF-12634 When building the edit online link to SPP/Vti, don't assume that the protocol (http/https) is the same as Share, but instead make that a module property (similar to how the port and hostname are set) 33577: Remove un-used imports 33584: ALF-12363: Protect against attempt to reference undefined rawPerms variable in folder-permissions WebScript controller 33586: ALF-12405: Always show delete site icon on My Sites dashlet when viewed on IE7 33605: Fixes: ALF-12408: Script Error when hovering on a row. 33616: Merged BRANCHES\DEV\V3.4-BUG-FIX to BRANCHES\DEV\V4.0-BUG-FIX 33500: Fix for ALF-12162 Searching for words with german umlaut does not show expected results 33624: ALF-12488 - CIFS error occurs if Hazelcast Config is enabled. 33637: ALF-11594: Disable comment field on upload dialog after version update 33643: ALF-12243: Fixed create HTML content via HTML editor 33649: Minor: tabs 33650: ALF-12657: We need to set maxSavePostSize for tomcat connectors to support SSL (e.g. ModelsGet from SOLR will truncate JSON to 4096 characters) 33662: Fix for ALF-12460 33663: Fix for ALF-12460 (part 2) 33664: Fix for ALF-12460 (part 2) 33665: Fix for ALF-12443 33672: Merged V3.4-BUG-FIX to V4.0-BUG-FIX 33468: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX 33467: Enterprise overlay update for MessagesWebScript 33470: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX 33469: Revert rev 33467 - not required 33482: Fixed ALF-12373 "IE7 Specific: incorrect displaying of "Link to Rule Set" window in Alfresco Share" - also fixed for ie6 removed javascript error thrown on click 33580: Minor formatting for easier debug stepping 33581: Fixed ALF-12638: No username in an audit context after an error 33589: ALF-12650: Merged V3.4.1 to V3.4-BUG-FIX (3.4.9) 33588: ALF-12620 Regression. Since 3.4.1.25 / 3.4.6.7 a user can be invited to a site multiple times - correction to js contains function. Bug introduced in r32775 33597: Merge DEV to V3.4-BUG-FIX 33465 : ALF-11193 - Consumer role cannot Unscribe/subscribe the IMAP folders. 33602: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2011_12_06 to BRANCHES/DEV/V3.4-BUG-FIX: 32551: ALF-10133: "Doc folder" for calendar events does not clear/reset itself 33630: Merge Dev to V3.4-BUG-FIX 33626 : ALF-4896 - Lock icon displayed for documents with expired lock 33633: Merge V3.4.7 (3.4.7.1) to V3.4-BUG-FIX (3.4.9) 33609: ALF-12589 CLONE - Content Manager unable to edit content from another user sandbox - Hot Fix for 3.4.7 needed Changed the permissions on the user's 'preview' store so that the group of ContentManagers was granted the ContentManager permission. It had been granting the permission to all current users in the group individually. As a result new ContentManagers could not FLATTEN or WRITE to the preview store. This had already been done for the main user store a few years back. As the managers parameter was no longer needed the was removed. 33647: Merged DEV to V3.4-BUG-FIX 33629: ALF-12585: Manage System Users shows "Change Password" icon for LDAP users in search results Sets "isMutable" property using addPropertyResolver in UsersDialog. 33648: Merged DEV to V3.4-BUG-FIX 33623: ALF-10586: CMIS: Trying to delete a multilingual document w/o translations via webscript There is no need to delete associations in CMISServicesImpl.deleteObject(). 33659: Merged V3.4 to V3.4-BUG-FIX 33594: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2011_12_06 to BRANCHES/V3.4: 32551: ALF-10133: "Doc folder" for calendar events does not clear/reset itself 33595: Reverse merge of the following. Should have been committed to V3.4-BUG-FIX 33594: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2011_12_06 to BRANCHES/V3.4: 32551: ALF-10133: "Doc folder" for calendar events does not clear/reset itself 33604: ALF-12597: WCMQS doesn't work out of the box 33654: Merged DEV to V3.4 33622: ALF-12655: Configure link isn't presented in Web View dashlet(My Dashboard page) User userIsSiteManager is true by default in webview.get.js. This allows to configure Web View dashlet on user's dashbord. 33651: ALF-12655: Configure link isn't presented in Web View dashlet(My Dashboard page) Sets userIsSiteManager=false before remote call, so if remote call fails it won't give site manager role to the user. 33655: ALF-12366: Merged PATCHES/V3.4.6 to V3.4 33548: ALF-12393: More changes to cope with read committed DB behaviour in AbstractReindexComponent - Reverted r33278, 33354, 33355 and introduced more generic solution - NodeRefs resolving to deleted nodes in the cache cause cache cleaning and transaction retry if they resolve OK in the database - Cached parent assocs are thrown away for non-deleted nodes if they are empty - Removes the need for the outer join and special case exception handling all over the place 33562: ALF-12393: Further improvments - Lookup of NodeRef to a deleted node must always result in cache clearing and transaction retrying (due to possible read committed behaviour half way through transaction) - Detection and correction of stale cached negative results (VALUE_NOT_FOUND) in node cache 33583: ALF-12393: Rework to getNodePair(NodeRef) to have less impact on existing code but still cope with read committed - Look ups of deleted nodes still cause InvalidNodeRefExceptions but these have a retryable cause so that both handlers can handle and retrying transactions can recover - Corrections to cached negative results (because the nodesCache remembers negative results) are written straight through and the transaction does not need to be retried 33660: Merged V3.4 to V3.4-BUG-FIX (RECORD ONLY) 33634: ALF-12161: Merge V3.4-BUG-FIX (3.4.9) to V3.4 (3.4.8) 33633: Merge V3.4.7 (3.4.7.1) to V3.4-BUG-FIX (3.4.9) 33609: ALF-12589 CLONE - Content Manager unable to edit content from another user sandbox - Hot Fix for 3.4.7 needed Changed the permissions on the user's 'preview' store so that the group of ContentManagers was granted the ContentManager permission. It had been granting the permission to all current users in the group individually. As a result new ContentManagers could not FLATTEN or WRITE to the preview store. This had already been done for the main user store a few years back. As the managers parameter was no longer needed the was removed. 33657: ALF-12650: Merged PATCHES/V3.4.6 to V3.4 33590: ALF-12620: Merged V3.4-BUG-FIX (3.4.9) to V3.4.6 (3.4.6.10) 33589: ALF-12650: Merged V3.4.1 to V3.4-BUG-FIX (3.4.9) 33588: ALF-12620 Regression. Since 3.4.1.25 / 3.4.6.7 a user can be invited to a site multiple times - correction to js contains function. Bug introduced in r32775 33673: Fixed compilation error 33678: Merged V3.4-BUG-FIX to V4.0-BUG-FIX 33677: Merged V3.4 to V3.4-BUG-FIX 33676: ALF-12436: Increase content data cache sizes to match node properties cache sizes to allow bulk loading without overflowing 33679: Merged V3.4-BUG-FIX to V4.0-BUG-FIX (RECORD ONLY) 33486: Merge V4.0-BUG-FIX to V3.4-BUG-FIX 33306 - experiment to add sdk-extras 33489: Merged V4.0-BUG-FIX to V3.4-BUG-FIX 33322 : Enterprise SDK 33323 33335 33353 33457 33463 33495: SDK Build fix - do not merge to V4.0. 33680: Merged DEV to V4.0-BUG-FIX 33675: ALF-12379: WebLogic: alfresco fails to start: java.lang.NoSuchMethodError: org.apache.commons.lang.mutable.MutableInt.increment()V org.apache.commons.* package should be used as application's preferrable for WebLogic. 33683: Merged V3.4-BUG-FIX to V4.0-BUG-FIX 33682: Merged V3.4 to V3.4-BUG-FIX 33681: ALF-12132: Fix Bitrock's copy of the custom lotus context. Yuck! 33689: Fix for ALF-12437 Switching from Lucene to Solr caused subsystems to be in inconsistent state and repository to hang - filter out changes to read only properties when set in bulk - ie they are ignored 33691: Fix for ALF-12667 33693: Fix for ALF-12695 SOLR should not appear to work with AVM - it should not silently fail. - AVM search and indexing will raise exceptions when used with SOLR - removed the AVM site bootstrap associated with Share in older versions of the product. 33701: Merged DEV to V4.0-BUG-FIX 33697: ALF-12691: Alfresco Explorer doesn't work: java.lang.NoClassDefFoundError: org/apache/commons/lang/builder/HashCodeBuilder Shared library for WAS was fixed. commons-lang-2.6.jar is used. 33704: ALF-12299 - NFS subsystem enable/disable needs a different attribute name 33714: ALF-10229: DOS Voodoo to set ALF_HOME to the parent parent directory of the apply_amps script - for /D %%D IN (%~dp0..\) do set ALF_HOME=%%~dpD - Yuck! 33721: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX: 33720: Merged BRANCHES/DEV/BELARUS/V4.0-BUG-FIX-2012_01_20 to BRANCHES/DEV/mward/schemacomp: 33631: LF-12355 : Create schema reference files for SQL Server 33727: Test fix - fallout from removing the bootstrap for the "sitestore" AVM store 33729: Fixes: ALF-12575 - missing i18n strings. (translations pending) 33738: SPANISH: Translation updates based on EN r33523 33739: Merged DEV to V4.0-BUG-FIX 33723: ALF-10229: apply_amps.bat doesn't work properly from alfresco-enterprise-4.0.0a.zip Fix for apply_amps.sh to set ALF_HOME to the parent parent directory of the apply_amps script 33746: ALF-10656 SOLR: Patches execute search during bootstrap causing deadlock - Part 1: - SOLR query use during bootstrap will throw an exception - tidy up some patch beans - ignore unused AVM "sitestore" in WCMPostPermissionSnapshotPatch 33753: Remove upgrade installers from build targets git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@33758 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2012-02-08 11:06:09 +00:00
Derek Hulley	16d0d0e786	Fixed ALF-11201: CMIS ignores user login and runs as 'admin' sometimes ... - Change the way the CMIS implementation interacts with authentication, logging and transactions by constructing a service layered in three interceptors: <property name="cmisTransactions" ref="CMISService_Transactions" /> <property name="cmisExceptions" ref="CMISService_Exceptions" /> <property name="cmisControl" ref="CMISService_Control" /> - CMISService_Transactions: Retrying transactions are initiated for all operations and we no longer attempt to hold transactions open across method calls. This optimization is secondary to having full retrying behaviour, without which the server could throw avoidable exceptions in concurrent environments. - CMISService_Exceptions: Performs translation from typical repo exceptions into CMIS exceptions - CMISService_Control: Provides details logging of inbound authentication states, arguments, exceptions and return values To get logging without method arguments (can be verbose): log4j.logger.org.alfresco.opencmis.AlfrescoCmisServiceInterceptor=DEBUG To include method call arguments: log4j.logger.org.alfresco.opencmis.AlfrescoCmisServiceInterceptor=TRACE Logging will include details of inbound, method-call and outbound thread authentication credentials. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32331 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2011-11-27 20:55:29 +00:00