mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-07 18:25:23 +00:00
225 Commits
Author | SHA1 | Message | Date | |
---|---|---|---|---|
|
c08013eef7 |
Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63384: Reverse Merge HEAD-BUG-FIX (4.3.0.BF) 63381: Merged V4.2.1 (4.2.1) to HEAD-BUG-FIX (4.3.0.BF) 63200: Merged DEV to V4.2.1 (4.2.1) 63199: MNT-10764 : PostgreSQL: An error message is displayed when applying patch 'patch.emailAliasableAspect' Fixed the AliasableAspectPatch to run in read-only mode. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64286 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
cca7b04cd6 |
Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63381: Merged V4.2.1 (4.2.1) to HEAD-BUG-FIX (4.3.0.BF) 63200: Merged DEV to V4.2.1 (4.2.1) 63199: MNT-10764 : PostgreSQL: An error message is displayed when applying patch 'patch.emailAliasableAspect' Fixed the AliasableAspectPatch to run in read-only mode. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64284 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
9dca412a8c |
Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)
62931: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3) 62696: ACE-480 Split Data-Model into Lucene Independent and Legacy Lucene Project git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62986 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
1122e25137 |
ALF-19527 - No description and unfriendly result are got for patch.emailAliasableAspect
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@56427 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
78697c323d |
Format fixing during investigation of ALF-20086
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55727 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
2f707cd8de |
Merged HEAD-BUG-FIX to HEAD (4.2)
54938: MNT-9570: Merged V4.1-BUG-FIX (4.1.7) to HEAD-BUG-FIX (4.2) 54855: Merged DEV to V4.1-BUG-FIX (4.1.7) MNT-9538 : Upgrade changes cm:modified data for nodes in a workflow - Disabling/enabling auditable behavior around the FixBpmPackagesPatch patch git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55016 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
7847e81be5 |
Merged HEAD-BUG-FIX to HEAD (4.2)
54937: MNT-9570: Merged V4.1-BUG-FIX (4.1.7) to HEAD-BUG-FIX (4.2) 54848: Merged DEV to V4.1-BUG-FIX (4.1.7) MNT-9538 : Upgrade changes cm:modified data for nodes in a workflow - Disabling/enabling auditable behavior around the FixBpmPackagesPatch patch git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55015 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
8fa8216fef |
Merged DEV to HEAD:
54373: MNT-2641 : User can delete or move a working copy 54469: Compilation fix for MNT-2641 test 54470: Removed thousands of tabs 54523: Fixed ALF-19843: Integrity checking does not enforce mandatory aspects on aspects 54525: Pull IntegrityChecker properties into property file (ALF-19843) 54527: Fixed Eclipse warning about potentially unclosed file 54528: Prevent cm:workingcopy aspect from being removed directly (MNT-2641) 54529: Nail down behaviour around cm:workingcopy git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54798 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
ab4ca7177f |
Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)
51903 to 54309 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
65f1931ee8 |
Merged BRANCHES/DEV/HEAD-QA to HEAD:
48730: Record only merge from 4-1.BUG-FIX (4.1.5) to HEAD-BUG-FIX (4.2) 48447: Performance problem with Eclipse can be fixed by excluding the web-client build directory from the searchable resources. Done for 58 other projects (generally include in the 4.1 code line) 48726: Reverse Merge (did not work after an Eclipse Clean) - already done on HEAD 48447: Performance problem with Eclipse can be fixed by excluding the web-client build directory from the searchable resources. Done for 58 other projects (generally include in the 4.1 code line) 48929: Synced up with HEAD r48903 48957: Merged PATCHES/V4.1.4 to HEAD-BUG-FIX 47847: Merged V4.1-BUG-FIX to PATCHES/V4.1.4 47625: Fixed ALF-18063 - AlfrescoUtil's getPages method now parses json using jsonUtils.toObject to force strict json - CSRFFilter got new throwError action meaning the filter now can stop certain resources form being reached directly from the browser - /remoteadm/* webscripts can no longer be accessed directly from the browser - Modified regexps to be easier to read - Added config samples 47879: Merged V4.1-BUG-FIX to PATCHES/V4.1.4 47878: Final part of fix for ALF-14086 - Sort order of folders including hyphens ( - ) are different in folder-tree and view on folders (in Share) - People Finder 47912: Merged BRANCHES/DEV/V4.1-BUG-FIX to PATCHES/V4.1.4: 47909: ALF-18257: partial fix - adds back in missing TinyMCE files. 47928: Merged V4.1-BUG-FIX to PATCHES/V4.1.4 47913: Final part of fix for ALF-18257 - AWE panel is not displayed 47932: ALF-14587: Created article or publication cant be viewed on WQS site - Fix by Dmitry Vaserin - Same fix was done to style1.get.html.ftl in ALF-17117 47956: ALF-10243: workflow shows wrong date - Missing WQS date field configuration 47983: ALF-15803: CH, NL, RU: There are no Chinese, Russian, Dutch templates for IMAP messages and Chinese, Russian templates for Email messages - Email templates from Gloria 48026: ALF-15803: CH, NL, RU: There are no Chinese, Russian, Dutch templates for IMAP messages and Chinese, Russian templates for Email messages - Email templates from Gloria 48027: Merged V4.1-BUG-FIX to PATCHES/V4.1.4 48020: Fix for ALF-18220 - Cancel checkout in 'View Original Document' view fails and causes document stuck in checkedout state. 48048: Merged BRANCHES/DEV/DWEBSTER/HEAD_AWE to PATCHES/V4.1.4: 48047: Fixes: ALF-14758. Adds z-index as a work around to an overlapping menu bug that occurs if they are created in a particular order and viewed on a large enough resolution monitor. 48086: Merged BRANCHES/DEV/V4.1-BUG-FIX to PATCHES/V4.1.4: 48083: Fixes ALF-14931 48121: Merged BRANCHES/DEV/V4.1-BUG-FIX to PATCHES/V4.1.4: 48116: Fixes build failure caused by 'fix' for ALF-14931 48153: Merged V4.1-BUG-FIX to PATCHES/V4.1.4 48102: Fix for ALF-18354 - SPP-Meeting workspace event can be edited and deleted on Agenda tab 48124: Fixes ALF-18349: Slideshare and YouTube channels can now be created. 48151: Fix for ALF-15475 - Liferay Portal: IE9: Layout of portlets is broken when document details page is opened 48156: Improved fix (removed useless media queries) for ALF-18196 - Document Preview - Flash Movie Sized to a Thin Horizontal Bar at 1024x768 Resolution 48185: Another go at a solution for ALF-16413 - Share asks for Basic-Auth while not needed trying to access RSS feeds (thus breaking SSO). 48189: ALF-17818 - Strikethrough formatting is not preserved in Wiki 48208: ALF-18385: Alfresco Explorer: Localization is not applied after login. - Fixes regression caused by ALF-17189 48261: Fix for ALF-18352 - Manager can not update permissions more than once for the folder/content created by other user 48264: Merged DEV to PATCHES/V4.1.4 48258: ALF-18325 : Can't delete wcmqs if it was published to live We should also check for site is not being deleted before creating site container. 48283: Correction to fix for ALF-18196 48284: Fix for ALF-18328 - Share dependencies containing dependencies breaks Hazelcast clustering 48352: Fix for MNT-6390 - Incorrect type for Group and Review workflow after task approved by all users 48354: Fix for MNT-3196 - No information is displayed in My Activities and Site Activities dashlets for content creation 48390: MNT-6292: Created article or publication cant be viewed on WQS site - Fix researched by Dmity Vaserin - More handling of empty lists - It seems that WCMQS requires renditions to be indexed (in order for them to be returned by CMIS queries) so we must remove the ASPECT_INDEX_CONTROL aspect from them in RenditionHelper 48424: Fixed MNT-7521 "Document Library" instead "File Plan" displayed in the site navigation bar 48430: MNT-7522: Users with "read only" or "read and file" permissions don't have access to RM folders - In ScriptNode.childByNamePath() check for PermissionService.READ permission rather than PermissionService.READ_PROPERTIES permission, which apparently isn't compatible with RM! 48434: MNT-7522: Users with "read only" or "read and file" permissions don't have access to RM folders - Corrected fix with help from Andy Hind 48500: Fixed MNT-6311 "Activities with Google Docs are not displayed in My Site Activities and Site Activities dashlets" 48548: MNT-7528 My Tasks to Do and My Pooled Tasks dashlets do not show the correct description of a workflow 48635: MNT-8482 Enterprise 4.1.4: Backwards compatibility breaking change in public Java API class org.alfresco.service.cmr.dictionary.ClassDefinition - Added back in missing methods and using StaticMessageLookup so will still have the issue identified by MNT-413. The new methods still exist and don't have this issue. 48645: MNT-8484: Oracle: An unexpected difference is present after comparison of database schema with reference schema (post-upgrade) 48729: MNT-8498 Could not transform .psd file 48745: MNT-8527: Activity Feed Cleaner broken on Oracle - Due to ibatis weirdnesses, the select_activity_user_feeds_greater_than_max query has to exclude results with null user_ids (non user feeds) as this maps to a null row on Oracle and results in an NPE! - Also fixed all comparisons with feed_user_id to be NULL safe 48751: Fixed MNT-8504 "Script error occurs when clicking Edit Tags action from document/folder details page" - Removed js_string encoding of nodeRef and made sure nodeRef is taken from the repo instead of the page url 48752: MNT-8467: Cannot authorize to Share Kerberos automatically - Reversed r44754 performance fix causing this (Sorry Kev) 48755: MNT-8514: Incorrect workflow status is displayed on My Tasks dashlet - Fix by Viachaslau reviewed by Frederik 48756: MNT-8531: Merged PATCHES/V4.1.3 to PATCHES/V4.1.4 48683: MNT-8494: Lucene index recovery fails to reindex an orphaned node whose parent is deleted - Added unit test for this and fixed regression over MNT-6545 fix 48717: MNT-8494: Lucene index recovery fails to reindex an orphaned node whose parent is deleted - Strengthened unit test to check for deleted nodes with parents and strengthened handling of these as a result - Hopefully fixes unit test failures 48798: Fixed MNT-7646 "CLONE - [Pentest] Internet Explorer <= v8 XSS" - Share now inspects text/xml content from the webscript content, if it finds a <!DOCTYPE svg> it will change the mimetype to text/plain. 48810: Upgrade Surf version in POM files to 1.2.0-M4 (r1217) 48819: Fixed MNT-8504 "Script error occurs when clicking Edit Tags action from document/folder details page" part 2 - Fix on folders page 48820: Make SchemaReferenceFileTest actually output its reason for failing - I can't track down the temp files! 48822: MNT-8508: Fixing description-property in LazyActivitiWorkflowTask which is not the same as WorklfowTask.description 48823: BDE-130: fail the build when yuicompressor minimization fails 48890: Fixed MNT-8554 "FF: Download button on Document Details page is not working" - Note also fixes the "Comment" widget in the header not working (in any browser) 48933: MNT-8560: It's impossible to find the user by any property except the username Modify People.getSortedPeopleObjects() method to create ArrayList based on provided List<NodeRef> and use it for sort, because provided List<NodeRef> can be unmodifiable list. 48964: MNT-6494: Fixed merge issue (already fixed in HEAD-BUG-FIX) 49033: Merged PATCHES/V4.1.4 to HEAD-BUG-FIX-QA 48996: MNT-8564 : CLONE - Incorrect saving process when editing event Fix event.put.json.ftl to produce valid json 49006: MNT-8555: Reverse Merge MNT-6419 (ALF-17089) 45245: ALF-17089 (Displaying Url Name instead of site Name in Select form) 47089: ALF-17089 (Displaying Url Name instead of site Name in Select form) 49039: Merged HEAD to HEAD-BUG-FIX-QA 48931: Fixed CLOUD-1511 "My Documents dashlet is crashing when inspecting the syncmode value" 48955: Fix name of wdr-deployment jar in mvninstall task 48979: ALF-18573: fix sharepoint module context name. This is a change that was appropriate for cloud but had crept in to HEAD during the megamerge. 48988: Fix integration with CLOUD2 + compile and package remote-api test classes separately 48995: CLOUD-1460 "CloudConv: Re-implement header customizations" - #1. Re-add link so network admin can access admin console Added in widget ids that could be referenced to add and remove widgets in the user & app items menu 49008: Fix public api tests 49014: Fix public api tests 49136: Fix public api tests 49141: Merged HEAD-BUG-FIX to HEAD-QA (thus completing 4.1.4 -> HEAD-QA merge) 49139: Merged PATCHES/V4.1.4 to BRANCHES/DEV/HEAD-BUG-FIX (mergeinfo committed earlier) 48735: Fixed MNT-8506 & MNT-8507 * MNT-8506 "A server error has occurred when press Follow/Unfollow button from User Profile" * MNT-8507 "A server error occurs when set "Private" checkbox on My Profile" * Instead of using Alfresco.util.Ajax.request and creating XHR requests forms were being submitted meaning the Alfresco-CSRFToken never got added. * Now refactored to use Alfresco.util.Ajax.request and post directly to the proxy, meaning the Share "services" now can be removed. 48812: MNT-8506 / MNT-8507: Fix up by Vasily to avoid YUI compression error 48813: Fixed MNT-8507 "A server error occurs when set "Private" checkbox on My Profile" part 2 - variable used keyword "private", now refactored to "isPrivate" 49154: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/HEAD-QA: 48470: Merged BRANCHES/DEV/FEATURES/CLOUD1-PUBLICAPI3 to BRANCHES/DEV/CLOUD1: 48041: Merged BRANCHES/DEV/FEATURES/CLOUD1-PUBLICAP2 to BRANCHES/DEV/FEATURES/CLOUD1-PUBLICAPI3: 47129: Merged BRANCHES/DEV/FEATURES/CLOUD1-PUBLICAPI1 to BRANCHES/DEV/FEATURES/CLOUD1-PUBLICAP2: 45439: PUBLICAPI-39: "Favourites API" wip 45681: PUBLICAPI-39: "Favourites API" wip 45897: Test a fix for issue found during bm testing - CMIS: null entries in property list values 45965: Public api performance investigation: test node bulk loading change 45978: PUBLICAPI-39/40: wip, changes from review. 46019: PUBLICAPI-39: "Favourites API" wip 46056: Re-instate opencmis config that was mistakenly changed 46156: Public api performance investigation: test node bulk loading change 46193: PUBLICAPI-39: "Favourites API" wip 46200: PUBLICAPI-39: "Favourites API" wip 46247: Upgrade to OpenCMIS 0.8 46248: PUBLICAPI-72: "Add users role to Site entity" 46249: PUBLICAPI-72: "Add users role to Site entity" 46250: PUBLICAPI-40: "Site membership API" - modifiedAt timestamp + some tidy up 46251: PUBLICAPI-40: "Site membership API" - bug fixes 46253: public api tests refactoring (split tests into separate classes by functional area), site membership api tests 46273: public api tests refactoring (split tests into separate classes by functional area), site membership api tests 46298: Cloud OpenCMIS browser binding support through the OpenCMIS Alfresco webscript (currently disabled) 46299: Cloud OpenCMIS browser binding support through the OpenCMIS Alfresco webscript (currently disabled) 46300: Cloud OpenCMIS browser binding support through the OpenCMIS Alfresco webscript (currently disabled) 46311: Cloud OpenCMIS browser binding support through the OpenCMIS Alfresco webscript (currently disabled) 46337: PUBLICAPI-79: "GET a Favorite" 46338: PUBLICAPI-79: "GET a Favorite" 46339: public api tests: some refactoring 46340: Cloud OpenCMIS browser binding support through the OpenCMIS Alfresco webscript (currently disabled) 46345: Added name parameter to the @uniqueId annotation. e.g. @UniqueId(name="targetGuid") 46346: PUBLICAPI-39: "Favourites API" - tests 46359: PUBLICAPI-40: "Site membership API" - PUT requests and bug fixes 46380: PUBLICAPI-40: "Site membership API" - PUT requests and bug fixes 46381: PUBLICAPI-40: "Site membership API" - PUT requests and bug fixes 46397: PUBLICAPI-40: "Site membership API" - add missing file 46411: public api tests: re-instate tests (accidentally commented out) 46427: Cloud OpenCMIS browser binding support through the OpenCMIS Alfresco webscript (currently disabled) 46442: Cloud OpenCMIS browser binding support through the OpenCMIS Alfresco webscript (currently disabled) 46467: PUBLICAPI-80: "GET on a deleted Favorite answers a 500" 46476: Upgrade to OpenCMIS 0.8 46514: Initial implementation of WHERE clause functionality. (Likely to change a lot). 46518: PUBLICAPI-75: "Use a 'where' parameter to specify criteria for favorite result set content " 49157: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/HEAD-QA: 48552: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1 48551: Fix for DEVOPS-2976 P1 - Solr nodes crash with tracking enabled + configuration fixes 48796: Merged BRANCHES/DEV/FEATURES/ACCOUNT_TYPES to BRANCHES/DEV/CLOUD1: 48092: Resolve CLOUD-1303: Add 2 new Account Types to Cloud 48325: Translations from Gloria 48445: Japanese: translation update from Gloria 48698: JA: Translation update from Gloria. 49130: Merged BRANCHES/DEV/CLOUD1-HOTFIX to BRANCHES/DEV/CLOUD1: 49120: Merged BRANCHES/DEV/FEATURES/CLOUD1-PUBLICAPI3 to BRANCHES/DEV/CLOUD1-HOTFIX: 49093: CLOUD-1518: "Favourite sites are not displayed correctly" 49110: CLOUD-1518: "Favourite sites are not displayed correctly": fix up PreferencesService to return correct site preference keys 49116: CLOUD-1518: "Favourite sites are not displayed correctly": favourite sites uses the favourites service rather thanpreferences service directly, making it and favourites consistent 49159: fixup pesky solrcore.properties 49197: Fix for Cloud AccountUsageQuotaTest - make action-executor node service mt aware (fallout from previous commit that now does a node existence check in action executor that needs to be mt aware) 49199: Fix tests 49241: CLOUD-1527 "Logo in Share footer is broken" - Added /res to make logo getting displayed when running in multi tenancy mode 49250: CLOUD-1527 "Logo in Share footer is broken" - Removed image dimensions to make image replaceable 49267: Fix tests: remove incorrect OpenCMIS jars 49272: Use newer patched version of chemistry-opencmis-server-bindings 49273: Removed extraneous chemistry library dependency 49293: CLOUD-1512 "SAML integration needs to override "CSRFPolicy" config" - Adding new (overridable) getPath() method in CSRFFilter 49315: Merged PATCHES/V4.1.4 to HEAD-QA 49236: Fixed MNT-8615 "Browser page is not reloaded after deleting folder/file or after creation content in Repository" 49301: Fixed MNT-8615 "Browser page is not reloaded after deleting folder/file or after creation content in Repository" part 2 49316: Merged PATCHES/V4.1.4 to HEAD-QA (RECORD ONLY) 48735: Fixed MNT-8506 & MNT-8507 * MNT-8506 "A server error has occurred when press Follow/Unfollow button from User Profile" * MNT-8507 "A server error occurs when set "Private" checkbox on My Profile" * Instead of using Alfresco.util.Ajax.request and creating XHR requests forms were being submitted meaning the Alfresco-CSRFToken never got added. * Now refactored to use Alfresco.util.Ajax.request and post directly to the proxy, meaning the Share "services" now can be removed. 48812: MNT-8506 / MNT-8507: Fix up by Vasily to avoid YUI compression error 48813: Fixed MNT-8507 "A server error occurs when set "Private" checkbox on My Profile" part 2 - variable used keyword "private", now refactored to "isPrivate" 49328: Fix up People script class so that it deals with access denied exceptions (this will hopefully fix failing PeopleRestApiTest in Cloud2) 49346: Fixed CLOUD-1532 "Test email signup page is brokebn due to new header" 49364: Fixed CLOUD-1524 "Unable to retrieve Google Docs subsystem status from Alfresco (re: googleEditable not defined ?)" 49373: CONV: Fix CLOUD-1524 / CLOUD-446 - disable GoogleDocsV1 subsystem and prevent deferred start (and associated error) when Share later calls explicit "status" webscript (to see that it is disabled) - revert 49364 and replace with alternative fix - see also similar IMAP status issue (CLOUD-1507) 49375: CONV: Fix CLOUD-1507 -fix IMAP subsystem to prevent deferred start (and associated error) when Share later calls explicit "status" webscript (to see that it is disabled) - see also similar GDocsV1 status issue (CLOUD-1524 / CLOUD-446) 49416: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/HEAD-QA: 49303: CLOUD-1518: "Favourite sites are not displayed correctly": fix fallout 49418: CONV: Fix ALF-18698 - Core MT: "create tenant" ignores the tenant-specific root contentstore dir path (if specified) 49433: Fix for failing Cloud2 test https://bamboo.alfresco.com/bamboo/browse/THOR-CLOUD2HEADQA-JOB1-38/test/case/12496544 49491: CLOUD-1552 "The invite link icon in the new header's site title "area" points to the "on premise" invite page (which has been admin secured) instead of the invite dialog" - Improving extensibility by adding further widgets ids for header menu 49590: CLOUD-1556 "CloudConv: CLOUD2 does not start on DP: "Possible CSRF attack"" part 1 - Not a bug in the CSRFFIlter but an improvement that introduces a <properties> elements which may hold variables used by the CSRFPolicy config to avoid repetition and the possibility to only override the <properties> section in different environemnts, i.e. set different referer proxies in test & prod. 49758: Fix for CLOUD-1542, Google Docs action was missing from the action list in the document library. An action is still listed in the document-browse action group that has no definition, this was causing the web tier webscript to abort processing of any actions defined after it i.e. any custom actions. 49789: Merged BRANCHES/DEV/HEAD-BUG-FIX to BRANCHES/DEV/HEAD-QA: 49788: L10N update from Gloria, based on EN r48822 49801: Move CLOUD2 to HEAD-QA, as part of Alfresco One project 49806: Bring POM file back from CLOUD2 49807: Fix order of from/set/to lines in rules, to match schema validation. 49829: Merged BRANCHES/DEV/HEAD-BUG-FIX to BRANCHES/DEV/HEAD-QA: 49808: CLOUD-1615: CloudConv - Regression: CLONE: the info panel isn't wide enough to display the share link without a line break - Increased panel and image widths 49830: Merged BRANCHES/DEV/HEAD-BUG-FIX to BRANCHES/DEV/HEAD-QA: 49823: CLOUD-1609: CloudConv - Regression: DAM: Item header was moved (also incorrect color is using) for folders and files. - Added overrides and changes to gallery view to accomodate changed CSS in detail and simple view 49831: Merged BRANCHES/DEV/HEAD-BUG-FIX to BRANCHES/DEV/HEAD-QA: 49827: CLOUD-1610: CloudConv - Regression: DAM: More menu does not disappear after first opening more link - Fixed el passed in for onEventUnhighlightRow in fnHideDetailPanel - Also added hiding of more actions on mouseleave of more actions 49834: SVN ignore patterns - "test" folder. 49835: Merged BRANCHES/DEV/HEAD-BUG-FIX to BRANCHES/DEV/HEAD-QA 49800: Fix to build.properties that got munged in rev 49209. Fix to share-header that was horribly merged to pull in code with dependencies that aren't present yet. Fix to login dialog width that hasn't made it over to this branch for some reason. 49872: Added name to logging of transformer registration 49885: CLOUD-1626: CloudConv - Regression: Networks are not displayed via WebDav. Reinstated code that was originally part of THOR1_SPRINTS (r34168) but was lost as part of convergence work. 49889: CLOUD-1669: upgrade jibx from 1.2.3 to 1.2.5 to allow full JDK7 support 49906: Merged BRANCHES/DEV/BELARUS/HEAD-QA-2013_04_22 to BRANCHES/DEV/HEAD-QA: 49794: ALF-18797 : SPP: Check out action doesn't work for Document Workspace Merged but with minor bug fix. 49908: CLOUD-1649: Added the missing network menu for the public users. 49916: Fix to User Factory bean setter to avoid: WARN [springframework.beans.GenericTypeAwarePropertyDescriptor] [main] Invalid JavaBean property 'userFactory' being accessed! Ambiguous write methods found next to actually used 49917: Merged SHOULDERS to HEAD-QA 48984: Minor UI fixes: - fix height of user status text-area to be consistent across browsers - fix hover style and font size of user status text-area - fix login dialog width since Cloud merge 49918: Fix for CLOUD-1571 - CloudConv - Regression: My Sites dashet isn't loaded 49919: Fix for CLOUD-1648 - CloudConv - regression: cloud2headqa is not localized in any language - code for the login language drop-down refactored to fit within login component rather than global function javascript - fixed to work since code convergence also 49920: Fix for CLOUD-1584 - CloudConv - Regression: Some dashlets should be absent on User/Site Dashboard - Disabled new dashlets (Site Search, Saved Search, My Discussions) because they are too exciting for the Cloud. 49921: CLOUD-1669 Switch -source and -target compilation parameters to 1.7 49923: Fix to 404 error on login page (visible in firebug etc.) Correct list of image dependencies. 49924: Fix for CLOUD-1629 - CloudConv - Regression: It's impossible to remove the Welcome Widget on Site Dashboard - encoding of preference values must handle "." dot character or it ends up as nested preference! 49927: Fix for CLOUD-1577 - CloudConv - regression:Incorrect display of status message 49928: Fix for CLOUD-1586 - CloudConv - regression:The user is redirected to login page after clicking 'Invite' button from Site members page - Button should be disabled on Cloud (redirect is because on-premise Invite page is admin only!) - but pattern to do so has changed since merge with 4.2. 49931: WebDAV: exclusive lock could be obtained when shared lock already in place. In addition, the invalid lock state that was produced then led to a stack overflow due to infinite loop. 49933: Added svn:ignore entires for build/pom.xml and root/privatemodules/thor/config/log4j.properties 49936: CLOUD-1600: CloudConv - regression: Cannot add a tag through inline edit option - Removed mandatory validator 49938: Merge V4.1-BUG-FIX to HEAD-QA 48904: BDE-109: generate coverage statistics from JaCoCo when running tests 48925: 3rd party classpath refers to available mysql-connector-java-5.1.13-bin.jar 49065: Limit coverage to org.alfresco classes, otherwise overhead is too big and tests too slow 49474: MNT-8668 Remove Maven declared dependency on addressing-1.0.mar 49655: BDE-109 new Ant task to generate JaCoCo report for test coverage 49941: CLOUD-1668: CloudConv - Regression: Incorrect displaying of default avatar on task section on document's details page - Fixed avatar link 49943: CLOUD-1661: CloudConv - Regression: progress bar is absent in Storage section on Account Summary page - Brought theme-bg-3, theme-bg-4, and theme-border-5 CSS over from greyTheme to lightTheme 49958: SpringSurf libs upgrade to r1257 Updated Cloud share config overrides to remove values that are now the default in Surf (e.g. reconnect-timeout etc.) 49965: Fix for CLOUD-1588 - CloudConv - Regression: "Download as Zip" option should be absent - remove the lovely new Download as Zip feature from Cloud as it is Officially Too Exciting. 49975: Fix for CLOUD-1663 - CloudConv - Regression: Search query containing wildcards is partially cut off on the results page (encoding is not being applied) 49977: CLOUD-1640: Fixed external user site member visibility issue. 50007: Fix to disallow change of own user role or removal in Site Member for the current user. 50011: Activiti schema reference files ignore table column ordering (testing CLOUD-1675) 50012: Reorganize repository database bootstrap beans to register scripts and patches with SchemaBootstrap (CLOUD-1675) - New Spring config file: alfresco/dbscripts/db-schema-context.xml - Split Repo, JPBM, AVM and Activiti scripts 50013: Update module properties to reflect latest Alfresco stack requirement and set version to 2.0 50014: Fixed CLOUD-1675: Upgrade failed from CLOUD1-BUG-FIX3 to HEAD-QA - Use module-friendly registration of create scripts - Note: Schema validation will report errors due to 2 Cloud-specific tables in the 'alf' schema namespace 50018: CLOUD-1568: CloudConv - regression:created/modified time is not displayed in Properties section - Added unit test for combining default controls where a new data type is added, which was failing - Fixed DefaultControlsConfigElement.combine method 50023: Fix for CLOUD-1578 - CloudConv - regression: Unable to join a site Fix for CLOUD-1579 - CloudConv - Regression: It's impossible to perform "Leave Site" action by Site Member from Site Dashboard 50027: BDE-150 Create RPMs for Cloud deployment 50028: ALF-18908: WebDAV litmus tests failing on HEAD-QA/CLOUD2 50032: CLOUD-1624: CloudConv - regression: Login button is missing on Quick Share page - Moved CSS loading to quickshare/header.get.html.ftl 50039: CLOUD-1626: networks not displayed via WebDAV (fix for PROPFIND) 50040: CLOUD-1637 / MNT-8462 "Post" button works incorrectly - Added check for response type of string to userStatusUpdateSuccess and userStatusUpdateFailure since it's already coming back as a JSON object 50047: Add missing dependency on java-property-utils-1.6 50048: BDE-150: fix RPMs 50051: Fix for CLOUD-1664 - CloudConv - Regression: New logo is not applied Fix for CLOUD-1580 - CloudConv - Regression: It's impossible to change the application theme - Fix to correctly handle "network admin" concept - manually allow the network admin to perform admin actions where appropriate - AFAIK this can never have worked correctly... remove nonsense runas=admin webscripts overrides that don't work anyway. - Clean up of related scripts. 50055: CLOUD-1607: filter sent-invites-min.js coming from Enterprise build, so that it gets overridden by the non-minimised cloud one 50070: Temporarily adding exploded Ant build for cloud2 environment. This now means the same steps for building a cloud1 environment can be used to build a cloud2 environment. NOTE: There is one outstanding licence issue to resolve that will be fixed in a subsequent commit. 50088: Remove unused or duplicate MyBatis config (CLOUD-1672) 50090: CLOUD-1672: CloudConv: MyBatis error when downloadCleanerJob is run - Cloud was duplicating the MyBatis configuration - Created Cloud-specific SQL templates - Tested using sign ups and general use but full account and tenant usage needs to be tested 50092: CLOUD-1591: CloudConv - Regression: Incorrect layout of "Link to Rule Set" page - Made the more specific rules-picker treeview width override lightTheme's overriding treeview width 50094: Fixes for exploded Ant build. 50097: Added ignore of projects/web-client/source/web/images/logo/alfresco_enterprise.gif which is apparently moved from elsewhere during some build step 50099: CLOUD-1614: CloudConv - Regression: Incorrect label "Start workflow" displays instead of "Create Task" - Added page.startWorkflow.title to cloud localization files 50101: BDE-154: upgrade urlrewritefilter to 4.0.4, avoiding compilation warning 50102: CLOUD-1602: CloudConv - Regression - Chrome specific: Close (X) button doesn't work on "Alfresco Cloud information" window - Removed committed minified about-share-min.js and ant touch command which kept it in place 50107: Merged HEAD-BUG-FIX to HEAD-QA (4.2) for CLOUD-1466: stop relying on a patched version of wss4j 49973: Merged DEV to HEAD-BUG-FIX (4.2) 49648: MNT-8652 Treat PasswordText as default for CMIS Web Service authentication (using patched version of wss4j) Execute PasswordTypeInterceptor before WSS4JInInterceptor to add PasswordText type as default if Password element misses it. Add system test for case. 50076: Follow-up on MNT-8652: rename CXFAuthenticationTest into CXFAuthenticationSystemTest, so that it is not executed in web-service-client tests, but only in system-build-test 50109: Fix to issue where application logo was resized and broke aspect ratio of uploaded image. Also changed size to valid for new header. 50113: Fix for CLOUD-1576 - CloudConv - Regression: Incorrect notification is displayed when Site Admin performs "Leave Site" action 50114: Fix for CLOUD-1662 - CloudConv - Regression: Incorrect behavior when searching with empty field - trim searchbox text before event publication 50116: Cleanup of copy/pasted files... 50117: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/HEAD-QA 47811: ALF-18245 - BM-0013: Soak: Run 06: Search population of ScriptNode is expensive: Refactor Share search UI and REST API to provide server-side paging. 50122: MNT-8480 - cloud sync and revert 50126: BDE-150 Add build number as RPM release property 50150: Merged V4.1-BUG-FIX (4.1.5) to HEAD-QA (4.2) << MNT-8721 Security fix from 4.1.4.2 >> << Merge direct from V4.1-BUG-FIX rather than HEAD-BUG-FIX as r49633 was merged with a block of other changes >> 49633: Merged DEV to V4.1-BUG-FIX (4.1.5) 49574: MNT-8473: Share's workflow-details page exposes all workflow instances to everyone Introduce WorkflowPermissionInterceptor that check if current user allowed to perform operation. 49752: MNT-8473: Share's workflow-details page exposes all workflow instances to everyone Fix errors that were found during unit testing. 50153: ALF-18708: Merged V4.1-BUG-FIX to HEAD-QA << Security fix from 4.1.4.4 >> 50151: MNT-8866: Merge V4.1.4 (4.1.4.4) to V4.1-BUG-FIX (4.1.5) 49802: MNT-8725: CLONE - Security context for Alfresco Explorer is not being cleaned up after processing a request JSF phase listener, which cleans up security context for Alfresco Explorer requests. It is necessary for avoiding sharing of security context between Alfresco Explorer and CMIS services, based on OpenCMIS libraries 49803: MNT-8725: CLONE - Security context for Alfresco Explorer is not being cleaned up after processing a request Configuration part of the fix has been reversed 49804: MNT-8725: CLONE - Security context for Alfresco Explorer is not being cleaned up after processing a request JSF phase listener, which cleans up security context for Alfresco Explorer requests. It is necessary for avoiding sharing of security context between Alfresco Explorer and CMIS services, based on OpenCMIS libraries 50164: Merged V4.1-BUG-FIX to HEAD-QA << Priority for transformer.remote.alfresco. Includes JMX controls for the Transformers subsystem >> 49038: MNT-7158 Merge DEV to HEAD-BUF-FIX (4.2) - Addition of TransformerConfigMBeam (JMX bean) to control transformers dynamically - Transformer level config limits are now a default for mimetype specific values. Possible now that we don't have these in the Spring config. previously had been 'combined' which was not too clear. Also added system wide mimetype defaults. - All transformers are now 'known' to the content transformer registry - not just the ones that may be selected. i.e it knows about the component transformers. - TransformerSelector now round robins all equal priority transformers until they reach their thresholds, rather than doing so for each one in turn. 49135: MNT-7158 Investigating adding priorities to transformers - Changes to make it possible to check debugTransformer.txt output in 4.1.5 against 4.2 49190: MNT-7158 fix build failure testGetMaxSourceSizeKBytesPageSupports 49207: MNT-7158 Investigating adding priorities to transformers - Modified priorities so that it is now deterministic Try as sourceMimetype of 00 in JMX op getTransformationsByExtension to double check - Changed default priorities 5 and 10 to 50 and 100 for EXPLICIT and DEFAULT to give more room in the future - Combined transformer.complex.AdobeIllustrator.Image with transformer.complex.PDF.Image as they were the same except for the transformer settings - TransformerDebug now uses [---] as the priority for compound transformers - TransformerDebug now includes Component in the type of compound transformers e.g. fred<<ComplexCompound>> 49947: MNT-7158 Investigating adding priorities to transformers - Added limits based on use. So a limit may be set for "index", "doclib", "webpreview", "syncRule", "asyncRule" ... 49985: MNT-7158 Investigating adding priorities to transformers - Allow <tomcat>/shared/classes/alfresco-global.properties to be used in transformers. 50002: MNT-7158 Investigating adding priorities to transformers - Missing file 50061: MNT-7158 Investigating adding priorities to transformers - Set up remote transformations BinaryPassThrough.priority=20 remote.alfresco.priority=30 remoteServer.priority=40 50143: MNT-7158 Investigating adding priorities to transformers - Show default values in getProperties, comment out values set to defaults and add under line transformer name 50166: Merged V4.1-BUG-FIX to HEAD-QA << Two 4.1.4.4 hot fixes >> 50165: Merged V4.1-BUG-FIX (4.1.5) to HEAD-BUG-FIX (4.2) 50110: MNT-8844 - CSRFFilter disables https login 50158: MNT-8870: Merge V4.1.4 (4.1.4.4) to V4.1-BUG-FIX (4.1.5) 50120: MNT-8858: AJAX Servlet does not clean up security context after processing a request Modification for cleaning up security context after processing an AJAX request to 'org.alfresco.web.app.servlet.ajax.AjaxServlet' 50169: CLOUD-1641: Made people-finder to use CannedQuery rather than Solr. 50173: Fix for CLOUD-1587 - CloudConv - Regression: Advanced Search link should be unavailable. 50174: Fix for CLOUD-1608 - CloudConv - Regression: Changing roles of site members is displayed only after page refresh Fix for ALF-18534 - Changing roles of site members is displayed only after page refresh 50176: Fix for CLOUD-1592 - CloudConv - Regression: Content I'm Editing dashlet contains redundant info (about blogs, wiki, forum) 50177: CLOUD-1689: CloudConv - Regression:Networks are not displayed via SPP 50182: ALF-18702 : Tenant isn't able to log in Share once another tenant has logged in before. Fix for clearing tenant user domain and authentication context after the Repository webscript is executed. Copied the TenantLeakLogger from CLOUD to HEAD into org.alfresco.web.app.servlet package. 50183: CLOUD-1606, CLOUD-1459: Fixed the permissions issue for the get preferences in the MailActionExecuter. 50184: Changed default Cloud Share Hazelcast config to empty IP list rather than promiscuous multicast - which was much too saucy! 50185: XSS attack hardening - incorrect use of ?js_string for safe HTML element IDs - should be ?html 50197: Code tidy 50200: ALF-18957: SchemaReferenceFileTest failing on Oracle Updated ACT schema-reference file for Oracle. 50203: Fix for CLOUD-1613 - CloudConv - Regression: CLONE: Under selected Item menu the manage permission should be hidden 50208: Fix CLOUD-1660 - CloudConv - Regression: Incorrect layout of tag icon on Search result page 50211: Fix to (unreported?) issue where Colleagues dashlet would not show the user status relative time - showed empty value in brackets () 50215: DEVOPS-3172, CLOUD-1701: cloud2/HEAD-QA unable to startup in DP environment. 50227: CLOUD-1612: CloudConv - Regression: Incorrect location of help icon for "Message" field on "Create Task" page - Moved rendering of help element - Added CSS for desired positioning 50245: Merged BRANCHES/DEV/HEAD-BUG-FIX to BRANCHES/DEV/HEAD-QA: 50240: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/HEAD-BUG-FIX: 50221: Merged DEV to V4.1-BUG-FIX (4.1.5) 50030: Attempt a workaround for MNT-8704: WebDAV:Content does not disappear after being deleted - Deprecate various methods related to the existing WebDAV use of sys:hidden - Put in a timer task on use of the sys:hidden aspect in WebDAV DeleteMethod 50093: MNT-8704: WebDAV:Content does not disappear after being deleted - "if (!fileFolderService.isHidden(nodeRef))" block was moved to deleteHackRunAs.doWork(). 50187: MNT-8704: added node existence check; unhiding node prior to deletion. As per Derek's comment: https://issues.alfresco.com/jira/browse/MNT-8704?focusedCommentId=227689&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-227689 50251: CLOUD-1702: Fixed NPE in WorkflowPermissionInterceptor, also fixed the issue that when the invitee tries to click on the link in the invitation email, 'org.alfresco.service.cmr.security.NoSuchPersonException' is thrown. 50298: Fixed the failing unit tests as a result of the newly added WorkflowPermissionInterceptor. 50306: Fix to merge causing ALF-18979 - Activiti servlet references on by default in web.xml Removed duplicated class now that the LoggerFilter is part of code webclient code 50311: MNT-8890: Commented the newly added method in TenantRepositoryContainer in order to fix the failing unit tests. 50318: Generate a jar of tests for alfresco-cloud, for consumption by QA tests later 50322: Fix for CLOUD-1657 - CloudConv - Regression: Admin section in the Header should be located in the user's menu having name "Account settings" 50335: ALF-18702 : Tenant isn't able to log in Share once another tenant has logged in before. Fixed failing JUnit tests. Reverted 50311 revision. 50337: CLOUD-1699: Cloud example content thumbnails - some have the wrong width and look rubbish in doclib/search results - Added new versions of doclib for Data Sheets to sampleContent.acp - Added doclib and imgpreview for all content in sampleContent.acp except 'Alfresco Cloud Intro.mp4' 50345: ALF-18702 : Tenant isn't able to log in Share once another tenant has logged in before. Fixed failing JUnit tests. 50352: Fix for CLOUD-1691 - Incorrect notification when leaving name field empty through inline edit - fixes the issues where; length validator not fired, order of validators wrong for cm:name inline editor, fixes issue where previously validation would still be shown on reedit of field after Cancel << hat tip to Mr Draper for validation solution 50353: Fix for CLOUD-1604 - CloudConv - regression: Links on "Oops page" should be highlited. - also removed duplicate messages and cleaned up message text from the late 90's. 50356: Fixed CLOUD-1697: URL rewrite filter upgrade causes additional logging 50357: Fixed the failing unit tests which were failing as a result of rev: 50335 commit. 50374: Revert r50182 and the subsequent changes made to fix the fallout: r50311, r50335, r50345, and r50357 50379: CLOUD-1669: update Eclipse JibX launchers with the upgraded JibX 1.2.5 jars 50390: Revert the part of r50306 that updated enterprise-web-scripts-application-context.xml and deleted TenantLeakLogger.java. This was necessary following the reverts that took place at r50374. 50396: Corrected name of content transform test class file. 50397: Added new "transform" folder (which should have been there before) 50398: Move content transform test class file into the new "transform" folder. 50401: - Added two Eclipse projects: one for the thor private module ("Alfresco Cloud") and one for its dependencies ("Cloud Dependencies"). - Turned the JiBX builder on by default in the data-model project. 50410: MNT-8890: split classpath when executing JUnit tests in Ant, so that repository tests do not get classes of upstream projects 50411: MNT-8890 follow-up - make enterprise repository tests run with a reduced classpath too, otherwise EntRepoCacheStopTest fails - add wdrdeployment classes to reduced classpath, otherwise enterprise tests cannot find alfresco/bootstrap/deployedSpace.xml 50416: Removed unused component (no longer required in 4.2 so the override isn't required) 50417: Dialog styling tweaks 50422: Merged BRANCHES/DEV/FEATURES/CLOUD1-SECURITY to BRANCHES/DEV/HEAD-QA 50409: Fix for CLOUD-1721 50473: CLOUD-1726 CLOUD-1732: move tests CMISChangeLogServiceTest and SubsystemsTest from repository to remote-api, because they depend on resources in remote-api (follow-up of MNT-8890) 50474: CLOUD-1736 Shouldn't have tweaked the classpath of system-build-test, since it already has its own (follow-up of MNT-8890) 50479: ALF-18927: SPP: Incorrect information is displayed on Event Information window for yearly recurrect event BYMONTHDAY shouldn't be deleted for YEARLY recurrence. Also setting interval was not accurate. 50480: ALF-18927: SPP: Incorrect information is displayed on Event Information window for yearly recurrect event Additional check in. 50485: Fixes ALF-18702: Corrected the logic for how tenant switching is achieved so that both Enterprise and Cloud scenarios are catered for. 50495: Fix for ALF-18981 - Non-ASCII characters are not displayed in Share interface correctly - Fix to deal with issue where a valid JSON result string is not always valid JavaScript text e.g. some unicode characters etc. 50498: svn ignore patterns 50499: files should not be in svn 50500: remove eclipse folder settings from svn 50505: Fix to (unreported?) search results paging issue - merge error meant that only the first page of results would ever be returned no matter what page was selected, but who goes past the first page anyway eh? 50516: CLOUD-1718: "CloudConv - Regression:"Imap Attachments" and "IMAP Home" folders are displayed via CMIS Workbench client" 50517: CLOUD-1727: CloudConv - Regression - WebDav: The mapped network drive could not be created on Windows This was broken by MNT-2823. 50524: CLOUD-1665: New accounts are not available for CLOUD2 Manually merged revision 48796 as it was mistakenly marked as merged. 50525: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/HEAD-QA: 50033: (RECORD ONLY) Merge HEAD-QA to CLOUD1 (for BDE-109: generate coverage on unit tests) Merge V4.1-BUG-FIX to HEAD-QA 48904: BDE-109: generate coverage statistics from JaCoCo when running tests 48925: 3rd party classpath refers to available mysql-connector-java-5.1.13-bin.jar 49065: Limit coverage to org.alfresco classes, otherwise overhead is too big and tests too slow 49474: MNT-8668 Remove Maven declared dependency on addressing-1.0.mar 49655: BDE-109 new Ant task to generate JaCoCo report for test coverage 50582: Removed and ignored .classpath and .project 50614: CLOUD-1713 append the Cloud build number after the Enterprise build number, as in: r50345-b65-c129 Upgrade a few Maven plugins 50649: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/HEAD-QA: 50083: Merged BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX3 to BRANCHES/DEV/CLOUD1: 49357: New Cloud Bug Fix Branch 49363: Merged BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2 to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX3: 46487: Fixes CLOUD-1293: "Other" included in total activities count. Refactor activity groupings. 46488: Fixes: CLOUD-1310: Adds "no-wrap" to last element to that the second link all appears on the same line. 46493: Fixes: CLOUD-1229: Removes max-width CSS constraint so that table cells can expand to find room for long transltions. 46535: PUBLICAPI-63: "Unable to list comments associated to a document : Malformated comment object ?": fix + tests 46555: PUBLICAPI-90: "You can not remove yourself from a site using the -me- identifier" 46826: Fix for CLOUD-1368 - Tomcat thread blocking during concurrent user testing causing service to become unresponsive. 47249: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2 47243: Fix for ALF-18194 - Bad performance with multiple contentstores browsing files on the slower stores 47681: Merged HEAD to CLOUD1-BUG-FIX2 47448,47484,47504,47518,47552 47865: GERMAN: Latest translation updates, based on EN r46485 & including fixes from check report. 47866: FRENCH: Latest translation updates, based on EN r46485 & including fixes from check report. 47867: SPANISH: Latest translation updates, based on EN r46485 & including fixes from check report. 47868: ITALIAN: Latest translation updates, based on EN r46485 & including fixes from check report. 47869: JAPANESE: Latest translation updates, based on EN r46485 & including fixes from check report. 47885: ALL LANG: Minor update to translations to bring them in line with EN r47485 48355: CLOUD-1458: Added MailActionExecuterTest to ActionTestSuite. 48402: CLOUD-1458: Remove inadvertently added test class 48561: CLOUD-1458, CLOUD-1459, CLOUD-1479, CLOUD-1485 - Fix MailActionExecuter to correctly resolve primary domain for sender and recipients. 47249: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2 47243: Fix for ALF-18194 - Bad performance with multiple contentstores browsing files on the slower stores 47681: Merged HEAD to CLOUD1-BUG-FIX2 47448,47484,47504,47518,47552 47865: GERMAN: Latest translation updates, based on EN r46485 & including fixes from check report. 47866: FRENCH: Latest translation updates, based on EN r46485 & including fixes from check report. 47867: SPANISH: Latest translation updates, based on EN r46485 & including fixes from check report. 47868: ITALIAN: Latest translation updates, based on EN r46485 & including fixes from check report. 47869: JAPANESE: Latest translation updates, based on EN r46485 & including fixes from check report. 47885: ALL LANG: Minor update to translations to bring them in line with EN r47485 48355: CLOUD-1458: Added MailActionExecuterTest to ActionTestSuite. 48402: CLOUD-1458: Remove inadvertently added test class 48561: CLOUD-1458, CLOUD-1459, CLOUD-1479, CLOUD-1485 - Fix MailActionExecuter to correctly resolve primary domain for sender and recipients. 49371: PUBLICAPI-166: "Unable to upload large file on Cloud (> 5MB)" 49389: Merged BRANCHES/DEV/FEATURES/CLOUD1_SAML1 to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX3: 49295: CLOUD-1529: Made SessionIndex optional in the SSO response. Also commented out 'autoProvisionEnabled' and 'alfrescoLoginCredentialEnabled' from the SAMLConfigSettings as they are not implemented yet. 49406: CLOUD-1488: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX3 (Also added the missing elements from the merge): 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). 49463: CLOUD-1510 - Cache remote transformation calls to isTransformable - Make TransformationOptions serializable - Expose ehcache statistics and configuration, via JMX 49492: CLOUD-1510 - Fix broken unit test 49631: CLOUD-1455: "Hide activity in a site from the activity feed" 49662: CLOUD-1455: "Hide activity in a site from the activity feed": fix broken unit test 49759: Merged BRANCHES/DEV/HEAD-QA to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX3: 49758: Fix for CLOUD-1542, Google Docs action was missing from the action list in the document library. 49814: CLOUD-1455: "Hide activity in a site from the activity feed" 49866: CLOUD-1597: Added the missing evaluators. 49948: Merged BRANCHES/DEV/FEATURES/CLOUD1_GOOGLEDOCS to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX3: 49880: Update Google Docs integration from 2.0.2 to 2.0.3. 50045: Merged BRANCHES/DEV/FEATURES/CLOUD1_GOOGLEDOCS to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX3: 50043: Update 2.0.3 AMPs 50686: GERMAN: Latest translations and updates based on EN rev49789. Jira fixes: MNT-7526, ALF-18650, ALF-18523, ALF-18521, ALF-18255, ALF-18069 50689: SPANISH: Latest translations and updates based on EN rev49789. Jira fixes: ALF-18650, ALF-18523, ALF-18521, ALF-18255 50691: FRENCH: Latest translations and updates based on EN rev49789. Jira fixes: ALF-18650, ALF-18523, ALF-18521, ALF-18255 50693: ITALIAN: Latest translations and updates based on EN rev49789. Jira fixes: ALF-18650, ALF-18523, ALF-18521, ALF-18255 50694: JAPANESE: Latest translations and updates based on EN rev49789. Jira fixes: ALF-18650, ALF-18523, ALF-18521, ALF-18255 50695: DUTCH: Latest translations and updates based on EN rev49789. Jira fixes: ALF-18650, ALF-18523, ALF-18521, ALF-18255 50696: RUSSIAN: Latest translations and updates based on EN rev49789. Jira fixes: ALF-18650, ALF-18523, ALF-18521, ALF-18255, ALF-18504, ALF-18503, ALF-18502, ALF-17793 50699: CHINESE: Latest translations and updates based on EN rev49789. Jira fixes: ALF-18650, ALF-18523, ALF-18521, ALF-18255, MNT-8874, MNT-8874, MNT-8874 50709: CLOUD-1699: Cloud example content thumbnails - some have the wrong width and look rubbish in doclib/search results - Fixed imgpreview for Alfresco Mobile.pdf 50711: Merged DEV to HEAD-QA (4.2.0) 50482: ALF-18996 : Upgrade from 3.4.12 to 4.2.0 fails: ERROR [domain.schema.SchemaBootstrap] [localhost-startStop-1] Statement execution failed: SQL: ALTER TABLE ACT_RU_TASK MODIFY ASSIGNEE_ VARCHAR(255) Error: Table 'alfupg.ACT_RU_TASK' doesn't exist - Correctly handle activiti tables creation/upgrade when performing upgrade from 3.4.x. 50728: CLOUD-1754 do not fail the build as soon as tests fail: we are now quarantining tests in Bamboo, so installers need to be built regardless 50755: Merged HEAD-BUG-FIX to HEAD-QA 50754: Merged V4.1-BUG-FIX (4.1.6) to HEAD-BUG-FIX 50753: Merged DEV to V4.1-BUG-FIX (4.1.6) 50727: MNT-3368: BM-0013: Soak: Run 08: OnPremiseSyncPullJob runs without a transaction - Add transactions. 50750: MNT-3368: BM-0013: Soak: Run 08: OnPremiseSyncPullJob runs without a transaction - Correction for 'readOnly' parameter. 50759: Merged BRANCHES/DEV/JAMAL/Fast_Test into HEAD-QA (CLOUD-1680: Make thor tests run blazingly fast) 50635: CLOUD-1680: Make thor tests run blazingly fast. 50684: CLOUD-1680: Regouped a few of the public api tests. 50688: CLOUD-1680: Regouped a few of the public api tests. 50706: CLOUD-1680: Moved the excludedGroups from the parent pom to thor. Also grouped the webdav tests. 50710: CLOUD-1680: Deleted the un-necessary junit category. 50773: Fixing up the tests to separate out the cloud tests. MailActionExecuter should now get the locale correctly. 50779: Redundant file 50780: Redundant File 50782: Redundant File 50783: Fixed missing double quote 50784: Missed strings included 50785: Missed key included 50795: ALF-19035 - MT Cloud Policies run with inconsistent "short" base and "full" node refs. 50823: ALF-17548: Disable Google Docs v1 integration * MBean controlling the subsystem has been removed (commented out) from bootstrap-context.xml * Admin console web script org/alfresco/components/console/repository/google-docs.get has been removed * Admin console form config has been deleted from share-form-config.xml * No changes have been made to the installer, as I could find no evidence that the configuration of the v1 subsystem was being changed by it * Note: The subsystem property 'googledocs.googleeditable.enabled' was already set to false. 50825: ALF-17548: Fix status web script which assumed the presence of the Google Docs v1 MBean removed in r50823. Now the web script returns enabled: false if the bean is not present. 50827: CLOUD-1600: CloudConv - regression: Cannot add a tag through inline edit option - Added ignoreEmpty argument to accommodate changes in r50352 50831: CLOUD-1770: Redundant Perform Action ("Embed properties as metadata in content") is displayed for Content Rules - Moved embedder action to sample file since we don't supply any embedders out-of-the-box 50833: CLOUD-1770: Redundant Perform Action ("Embed properties as metadata in content") is displayed for Content Rules - Programmatically created executer rather than loading from context 50838: Cloud: Patch overrides - Moved live patches to 'module-schema-context.xml' ('patch.redeployProcessesWithReminders2' and 'patch.redeployProcessesWithReminders3') - No Sample Web Site in Cloud: (CLOUD-1480) Created no-op patch for 'patch.siteLoadPatch.swsdp' - IMAP is disabled in Cloud: (CLOUD-1743): Created no-op patch for 'patch.imapFolders' 50839: ALF-18702: Tenant isn't able to log in Share once another tenant has logged in before Following review, added logic in AuthenticationServiceImpl.authenticate that is similar to AuthenticationServiceImpl.validate in order to handle case where the tenant is determined by the requested URI 50851: First part of fix for ALF-19052. 50853: ALF-18096: Integrate document security AMP files from the Alfresco Mobile iOS 1.5 project * New aspect dp:restrictable * Form configuration for properties provided by this aspect * Note: As detailed on the ticket the source files have been copied into the repository and slingshot project and mofified there. 50864: Fix for CLOUD-1769 CloudConv - Admin section in header menu instead of Account Settings are available for free account user 50879: ALF-18914 : SPP: It's possible to create meeting with empty subject field linking to an existing workspace Added a check for an empty subject when creating a meeting from iCal. 50922: Revert r50853 mistakenly adding Mobile project dp:restricted aspect to HEAD-QA 50925: CLOUD-1759: Fixed most of the Sonar ‘Critical’ violations. 50937: CloudConv - Regression - CLONE - No notification is displayed when performing "Leave Site" action 50938: Added Cloud override to remove MyFiles and Shared links from toolbar 50941: Fix for CLOUD-1768 CloudConv - Regression - CLONE: It's impossible to find the user by any property except the username and CLOUD-1778 CloudConv:in people search first name and last name people search always return zero results 50942: Fix for CLOUD-1741 - CloudConv: User should be redirected to Alfresco Cloud Documentation instead of Alfresco Community 4.2 Documentation. Comical spelling error in config. 50945: GERMAN: Latest Cloud translations and updates based on EN rev50920. Jira fixes: CLOUD-1729 50946: FRENCH: Latest Cloud translations and updates based on EN rev50920. Jira fixes: CLOUD-1729 and CLOUD-1763 50947: SPANISH: Latest Cloud translations and updates based on EN rev50920. Jira fixes: CLOUD-1729 and CLOUD-1763 50948: ITALIAN: Latest Cloud translations and updates based on EN rev50920. Jira fixes: CLOUD-1729 and CLOUD-1763 50949: JAPANESE: Latest Cloud translations and updates based on EN rev50920. Jira fixes: CLOUD-1729 and CLOUD-1763 50957: Fix for CLOUD-1623 Unfriendly warning appears when user try to create private site with the same URL 50960: CLOUD-1772: Configuration files have been localized - Removed all pointlessly translated configuration files 50961: MNT-8480 : New web script for delete audit entry. 50968: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/HEAD-QA: 50624: (RECORD ONLY) Delete generation of installers in continuous, to allow 'amber' builds 50973: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/HEAD-QA: 50568: Merged BRANCHES/DEV/FEATURES/CLOUD1-SECURITY to BRANCHES/DEV/CLOUD1 50423: Merged PATCHES/V4.1.1 to BRANCHES/DEV/FEATURES/CLOUD1-SECURITY 44129: MNT-223: Unbound SOLR result set (from Explorer trashcan query) consumes heap 44130: MNT-223: Unbound SOLR result set (from Explorer trashcan query) consumes heap 44129: MNT-223: Unbound SOLR result set (from Explorer trashcan query) consumes heap Merged PATCHES/V4.1.4 to BRANCHES/DEV/FEATURES/CLOUD1-SECURITY 45951: Fix for ALF-17687 BM-0013: Soak: Run 02: SolrJSONResultSet must preload nodes 50622: Fix for CLOUD-1751 Users searching in their home tenant (or other person related operations) should not be subject to visibility checks 50664: Fix for CLOUD-1751 Users searching in their home tenant (or other person related operations) should not be subject to visibility checks 50976: CLOUD-1634: CloudConv - regression: Upload form is not closed automatically after upload limit error occurs - Added Javascript to hide upload status and show upload control again 50992: Changing the modifiers for the "addAuthorityNameIfMatches" methods from "private" to "protected" to allow the RM module do RM specific changes without copying a lot of the existing code. 50993: Fix for ALF-18850 - Incorrect label "page.ruleEdit.title" on New Rule page from Repository Browser 51031: CLOUD-1761: Activity is not generated when deleting document via SPP/WebDAV - fix part 1 This is the first part of a fix: activities were not being raised due to MNT-181 fix. This is now fixed. However, the posts are not being processed properly, which also needs fixing. 51083: Fixed the failing test (testHasSite) 51085: First part of fix for CLOUD-1787 51091: CLOUD-446: Remove 'overridden' googledocs subsystem bean from Cloud override context, which was causing the subsystem to start up still 51092: Fix to URLRewrite config rule to correct escape UTF-8 characters either side of the detected '@' character when rewriting URLs where browsers have not correctly dealt with the @ character. 51097: Updated BG for ludicrous screen resolution CLOUD-1795 51098: Fix for CLOUD-1795 - Login dialog centre on window resize 51103: Fix for CLOUD-1796 CloudConv:-Search pagination to other pages no results are shown 51105: Merged BRANCHES/DEV/HEAD-BUG-FIX to BRANCHES/DEV/HEAD-QA: 51104: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/HEAD-BUG-FIX: 51101: MNT-8704: node was not being unhidden (thread local client marker needed setting) 51107: Improvements to search result list handling - only populate node result structures for the items that are going to be returned. 51140: Minor tweaks to search processing hand merged from 4.1.N 51163: JAPANESE: Fix for CLOUD-1799 51170: ALF-18074 add a new flag to enable clustering. 51184: Make cloud tests depend on repository test resources, to be able to reuse them 51234: CLOUD-1800: Made the Rules to be executed asynchronously in the cloud by overriding “rule-edit.js”. 51245: Merged BRANCHES/DEV/HEAD42-MERGE to BRANCHES/DEV/HEAD-QA 51230: Addition of a modified YUI Compressor ANT task to speed up the minimize-slingshot-deployed-javascript build step - from around 3 mins on most machines down to 3 secs. w00t AND THIS IS THE RESULT: ant clean incremental-webclient-tomcat-exploded incremental-slingshot-tomcat-exploded ... BUILD SUCCESSFUL Total time: 1 minute 18 seconds 51248: Merged HEAD-BUG-FIX to HEAD-QA 51247: Merged V4.1-BUG-FIX to HEAD-BUG-FIX (RECORD ONLY) 51246 (RECORD ONLY): Merged PATCHES/V4.1.5 to V4.1-BUG-FIX 51233: MNT-8129: NPE - Servlet.service() - getGlobalConfig for "webClientConfigService" Missing JGroups messages receiver has been added to handle cluster messages correctly. Port range default value has been increased to add some slack around required ports 50999 (PARTIAL RECORD ONLY): Better logging for AsynchronouslyRefreshedCache (MNT-8129) 51273: Partial fix for CLOUD-1806. This checkin fixes serialisation of TransformationSourceOptions objects. A subsequent check-in will fix deserialisation. 51275: Fixed CLOUD-1804 51279: Allow calls to NodeDAO.getParentAssocs to succeed for deleted nodes - The error message reported is incorrect. Previously, no calls were made to the DAO to retrieve details for deleted nodes. There was therefore an assumption that the node had been internally referenced and that this represented an error. This is no longer the case (nor has it been for a some time). - In this case, the SOLR tracking attempts to get the parent associations for all nodes, regardless of their state of deletion. - CLOUD-1807: CloudConv: I get the following error in the solr nodes "Detected stale node entry: NodeVersionKey" - MNT-9072: SOLR tracking can be delayed by node deletion 51291: JobLockService.releaseLock is not optimistic - AcquireLockException is no longer thrown if the lock token is invalid - releaseLock returns a boolean to indicate whether the lock was removed or whether it was already gone - Prevents unnecessary retrying withing JobLockService implementation (ALF-19098) 51292: Fix thread safety in PostLookup w.r.t. job lock state; general logging improvements (ALF-19098) 51293: Fix build after rev 51291 (ALF-19098): JobLockService.releaseLock is now optimistic 51305: Remainder of fix for CLOUD-1806. RemoteAlfrescoTransformer is unable to serialize transformation options as JSON. This check-in just changes Jackson configuration to handle the new TransformationSourceOptions which are now part of TransformationOptions. As this field needs to be JSON serialised along with its containing TransformationOptions instance - and particularly because TransformationSourceOptions is not a concrete type - we need extra Jackson config in order to correctly marshall and unmarshall the actual concrete types of any instances of TransformationSourceOptions. 51307: Slight tidy-up of fix for CLOUD-1806. I had specified some Jackson config in 3 subclasses and didn't need it as it was already configured on a base type. 51315: Fix on HEAD-QA only for ALF-19101, which I believe may affect CLOUD-1806. A typo in a TransformationSourceOptions method breaks the JavaBeans contract and imperils the JSON serialisation needed for CLOUD-1806. I think the method with the typo has been published (in 4.1?) so rather than rename it, I've deprecated it and added a new one with the correct spelling. 51350: Preparatory work for fixing CLOUD-1754. MailActionExecuterTest failing. It has been very difficult to get reliable test feedback on dealing with the MailActionExecuter. This is largely because of the difference in the way mail actions are handled in cloud and on enterprise. Therefore I have refactored and extended our test code to support fixing the MailActionExecuter. Part 1: Refactor the JUnit Rules AlfrescoPeople, AlfrescoPerson, AlfrescoTenant so that when a test is run in Community, Enterprise or Cloud the test 'does the right thing' when creating/tearing down test users. i.e. On Community/Enterprise, create the user/auth and the person on the single tenant. In Cloud create the user in system tenant, create the person in their home tenant, precreating the tenant if necessary and tear the whole thing down again. I achieved this by having the cm:person-related rules delegate to a spring bean responsible for dealing with test users. Then I've got a mechanism to let Enterprise override Community and Cloud override Enterprise. So the Community 'TestUserComponent' just creates/deletes users. Enterprise 'inherits' this behaviour. The Cloud TestUserComponent deals with the tenant sideshow. It's all started in the global-integration-test-context.xml. 51351: Adding the JIRA number for BDE-173 into this file. 51353: Fixing some test fallout from pervious commit (51350) which was part of preparatory work for fixing CLOUD-1754. Looks like the SyncAudit tests were using ApplicationContextHelper's getApplicationContext method having already started a custom app context? 51371: Merged BRANCHES/DEV/HEAD42-MERGE to BRANCHES/DEV/HEAD-QA 51277: Fix for ALF-18948 - Share Hazelcast cluster configuration change required in 4.2 51313: Minor css improvements to search box 51367: Fixed order of button styles for lightTheme overrides 51368: Fix to broken css file - erroneous end comment marker 51370: Fix for CLOUD-1795 - Login screen isn't resizing to display window 51406: CLOUD-1573: CloudConv - regression:Preview is not displayed for locked document - Added check for presence of container element before attempting setup of document versions data table 51407: Fix for CLOUD-1754. MailActionExecuterTest test failing. The code in MailActionExecuter needs some refactoring. As it was, validation of the mail recipients (are they usernames? email addresses? do the users exist? etc) are not the same for the to-many parameter as they are for the 'to' parameter. There are various other inconsistencies in the code also. I have tried to fix the cases where the inconsistencies are obvious and I've tried to imporove the test coverage too. This code has now become a little too complex and a future JIRA will lead to simplification. Currently the priority is to complete code convergence. 51410: Fix for CLOUD-1641 CloudConv - Regression: User from other domain cannot be found - cloud queries for people use all a users domains (OK until we partition by tenant) Fix for CLOUD-1768 CloudConv - Regression - CLONE: It's impossible to find the user by any property except the username 51422: Partial revert of r51410 where accountService was apparently added to the wrong bean definition 51424: Correct wire up for R 51410 related to Fix for CLOUD-1641 CloudConv - Regression: User from other domain cannot be found - cloud queries for people use all a users domains (OK until we partition by tenant) Fix for CLOUD-1768 CloudConv - Regression - CLONE: It's impossible to find the user by any property except the username 51429: CLOUD-1641: User from other domain cannot be found Removing previous fix for CLOUD-1641, the back-end should decide the best route to go depending on the parameters provided. Forcing the query to use a canned query has caused CLOUD-1768. 51444: Fix for CLOUD-1641 CloudConv - Regression: User from other domain cannot be found Fix for CLOUD-1768 CloudConv - Regression - CLONE: It's impossible to find the user by any property - ignore tenant filter for cloud people query and rely on post query visibility filtering (to see people from other tenants invited in) 51466: Fix for CLOUD-1641 CloudConv - Regression: User from other domain cannot be found Fix for CLOUD-1768 CloudConv - Regression - CLONE: It's impossible to find the user by any property - exclude permission evaluation when searching for people in the cloud (covered by the visibility stuff) 51553: CLOUD-1780: CloudConv :- follow button is visible for external user as well - Refactored customizations for new dependency loading to fix order of loading - Refactored widget userHomeTenant option addition for new instantiation pattern - Refactored override of widget's _renderFollowingActions method with new CloudPeopleFinder object that extends PeopleFinder 51571: Merged HEAD-BUG-FIX to HEAD-QA 51473: Moved CacheTest back into Repository Note for Cluster features: This change no longer relies on any distributed caches and therefore the new files should just stay as they are and the old ones removed. 51583: Merged HEAD-BUG-FIX to HEAD-QA 51477 Merged V4.1-BUG-FIX to HEAD-BUG-FIX 50995: Support for locking and unlocking of values in the TransactionalCache - Infrastructure for MNT-8997: Support definitive writes for TransactionalCache - Allows a definitive write (put or remove) call to be made to the TransactionalCache 51584: Merged HEAD-BUG-FIX to HEAD-QA 51478: Merged V4.1-BUG-FIX to HEAD-BUG-FIX 50997: Make use of TransactionalCache's locking ability - MNT-8997: Support definitive writes for TransactionalCache - PersonServiceImpl and AuthorityDaoImpl both do cache modificiations in 'beforeXYZ' callbacks, which leaves room for further attempted cache updates by other callbacks. Reapplied the fixes using TransactionalCache locks 51327: Fix CLOUD-1698 Intermittent invite test failures - Uses MNT-8997: Support transactional locking for Authentication Cache removal 51635: CLOUD-1812 Fix invalid license issue: modify version.properties to have version.label=Cloud and version.edition=Enterprise 51739: Merged HEAD-BUG-FIX (4.2) to HEAD-QA << Low risk change to avoid NPE found testing remote alfresco transformation nodes in DP env >> 51738: Merged V4.1-BUG-FIX (4.1.6) to HEAD-BUG-FIX (4.2) 51731: Avoid NPE in ContentServiceImpl.debugActiveTransformers(). Relates to MNT-7158 Investigating adding priorities to transformers 51752: CLOUD-1812 Fix version.label to simply add a '-Cloud' suffix. 51753: CLOUD-1822 Change RPM installation folder from tomcat6 to tomcat7 51760: CLOUD-1385: "Sending a PUT request without a Content-Type header resets the contents mimetype to application/octet-stream" - CMIS was not correctly parsing the mime type header 51779: Depend on Spring Surf 1.2.0-M6 (r1265) rather than a SNAPSHOT version 51780: Depend on Spring Surf 1.2.0-M6 (r1265) rather than a SNAPSHOT version 51783: Merged HEAD to BRANCHES/DEV/HEAD-QA (RECORD ONLY) 49055: ALF-15191: Saving files (new or existing) to Alfresco via CIFS using iWork Pages or Numbers results in invisible files Modify HiddenAspect to hide node with explicit='false' by default. 49062: ALF-15191: Saving files (new or existing) to Alfresco via CIFS using iWork Pages or Numbers results in invisible files Revert changes that were mistakenly committed. Rolled back to r49054 49075: Merged BRANCHES/DEV/HEAD-QA to HEAD: 49074: ALF-18573: exclude module-context.xml from alfresco-spp-config.jar 49245: Merged HEAD-QA to HEAD (RECORD ONLY) 49244: Switch version of mvninstall to 4.2.0-QA-SNAPSHOT 49442: CLOUD-1541: "CloudConv: REGRESS - can't connect to cmisatom on HEAD (works on HEAD-QA)": spurious chemistry library appeared 49599: CLOUD-1541: "CloudConv: REGRESS - can't connect to cmisatom on HEAD (works on HEAD-QA)": spurious chemistry library appeared 49980: Merged BRANCHES/DEV/HEAD-QA to HEAD: 49458: Merged BRANCHES/DEV/HEAD-BUG-FIX to BRANCHES/DEV/HEAD-QA: 49117: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/HEAD-BUG-FIX: 49111: - Revert of r47645 - Change of imgpreview thumbnailDefinition to mimetype and size expected for HEAD - Relates to ALF-5051 and MNT-8599 / ALF-18726 49118: Restored high resolution placeholder icons for imgpreview, relates to ALF-13984 49979: ALF-18726: Alfresco could not start with WCMQS applied - Updated RenditionServiceIntegrationTest with new imgpreview values 51793: Increase size of in-transaction "nodeOwnerCache" to 40K items. 51819: CLOUD-1385: "Sending a PUT request without a Content-Type header resets the contents mimetype to application/octet-stream" - add further tests not covered by original fix 51836: TenantUtil now gives a bit more information when exceptions pass through (CLOUD-1685) 51837: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/HEAD-QA: 51502: Merged BRANCHES/DEV/FEATURES/CLOUD1-SECURITY to BRANCHES/DEV/CLOUD1: 50389: Created branch for Cloud1 Security Release 50395: Merged BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIXSF to BRANCHES/DEV/FEATURES/CLOUD1-SECURITY: 49713: Branch for SalesForce bug fix merges 49718: Fix for CLOUD-1590 - Session fixation on Cloud specific login page 49721: CLOUD-1589 Protect Login-page against XSS Cross-Site Scripting attacks 50320: CLOUD-1653: Improve password strength * Password length constraint previously contained in client-side files has now been removed and is now loaded from the 'Users' scoped config * Minimum password length is increased to 8 characters from 6 previously * The length requirement has been augmented with restrictions on the content, contained in a <password-content> element - A minimum number of uppercase, lowercase, numeric and special characters can be specified - The system-wide default is zero for these new restrictions (i.e. no restrictions) * Alongside the existing <users> element, <network-users> allows the password length or content policies to be tightened for specific networks - Example config is provided in cloud-config.xml showing showing how to do this * Cleaned up existing validation messages and added a custom message based on the content restrictions, where this is configured - Due to ALF-18975 the message appears with raw HTML visible for now * IMPORTANT NOTE: No checking of submitted password values takes place (as before). Users can by-pass the length and content checks by mimiking the web browser themselves. - It is not feasible to add this as part of this work unit, since there are multiple form targets in use, some of which are in the repository. There are no password policies defined in the repository, so these would need adding. 50358: CLOUD-1707: Regress: Copyright logo is incorrectly encoded on Login and My Dashboard pages for French locale 50408: CLOUD-1468: Red bar in Tasks "error loading items". 50409: Fix for CLOUD-1721 50413: Merge of rev 50185 - XSS attack hardening - incorrect use of ?js_string for safe HTML element IDs - should be ?html 50576: Merged alfresco/BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIXSF to alfresco/BRANCHES/DEV/FEATURES/CLOUD1-SECURITY: 50518: ALF-19012: Form validation messages shown in Bubble widgets are not consistent with the input title attribute value 50574: ALF-18975: HTML in forms validation messages appears as raw HTML in the UI * HTML messages added via Alfresco.forms.Form.addValidation() method no longer escape HTML entities in validation messages presented to the user * The 'message' parameter in addValidation() can now be an object with separate 'html' and 'text' properties. Not all methods of displaying messages to the user support HTML. - If no separate HTML and text values are supplied, the message is assumed to be HTML and is converted to text by removing HTML elements via a regexp 50575: CLOUD-1653: Supply separate HTML and text validation messages for password content validation failures, since HTML cannot always be displayed 50577: CLOUD-1653: Use separate HTML and text validation messages for Reset Password and Account Completion pages 50731: CLOUD-1722: Apply config for Aetna specific password policy. 50745: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1-SECURITY: 50622: Fix for CLOUD-1751 Users searching in their home tenant (or other person related operations) should not be subject to visibility checks 50664: Fix for CLOUD-1751 Users searching in their home tenant (or other person related operations) should not be subject to visibility checks 50748: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1-SECURITY: 50568: (RECORD ONLY) Merged BRANCHES/DEV/FEATURES/CLOUD1-SECURITY to BRANCHES/DEV/CLOUD1 50423: Merged PATCHES/V4.1.1 to BRANCHES/DEV/FEATURES/CLOUD1-SECURITY 44129: MNT-223: Unbound SOLR result set (from Explorer trashcan query) consumes heap 44130: MNT-223: Unbound SOLR result set (from Explorer trashcan query) consumes heap 44129: MNT-223: Unbound SOLR result set (from Explorer trashcan query) consumes heap Merged PATCHES/V4.1.4 to BRANCHES/DEV/FEATURES/CLOUD1-SECURITY 45951: Fix for ALF-17687 BM-0013: Soak: Run 02: SolrJSONResultSet must preload nodes 50624: (RECORD ONLY) Delete generation of installers in continuous, to allow 'amber' builds 50869: CLOUD-1773: Cloud1Security branch build8. User cannot create site 50872: CLOUD-1653: Ensure password policy is always loaded based on home network, rather than the current context, which could be different. 51156: CLOUD-1653: Add global flag to regexps to ensure that the number of digits and symbols is correctly counted 51175: CLOUD-1682: "Hidden File Rename is Broken": fix and make sure the hidden aspect tests run as part of the build 51183: CLOUD-1682: "Hidden File Rename is Broken": fix up test suite 51187: CLOUD-1682: "Hidden File Rename is Broken": try again 51349: CLOUD-1682: "Hidden File Rename is Broken": further tests, deal with hidden aspect manipulation by clients during rename 51383: CLOUD-1682: "Hidden File Rename is Broken": deal properly with all client controlled hidden aspect cases 51843: CLOUD-1815: OPTIONS request for force.com not returning 200 Removed comment around publicapi URL pattern for CORS filter. 51845: Fixed ALF-19128: Artifact alfresco-repository-*-config.jar contains test files and configuration - Move test files into test-resources 51853: ALF-9096 - CLOUD-1825: Fixed issue with ordering of TransactionSynchronizationAdapter when Activiti job fails 51859: Merged PATCHES/V4.1.4 to HEAD-QA (REMERGE) 47738: ALF-18301 (now MNT-6342): ... NPE ... when debug logging for '...AbstractAsynchronouslyRefreshedCache' Merge note: The fix was not present even though it went to HEAD on 8 March (rev 47807) 51889: Upgrade Spring Surf to 1.2.0-M7 (r1274) 51893: Removed old Activiti libraries that were conflicting with new ones and causing compilation failure. 51895: Merge HEAD-BUG-FIX to HEAD-QA (4.2) 50984: BDE-103: Switch joda-time dependency to core 51896: Upgrade activiti to 5.11-alf-20130627 in POM for Cloud git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@51909 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
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 |
||
|
da8bdafbcc |
Merged BRANCHES/DEV/CONV_HEAD to HEAD:
47880: Create branch for Cloud Convergence from the latest state of HEAD (Revision 47874) 47886: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 33052: (RECORD ONLY) Branch for Enterprise 4.0 service pack development 38002: (RECORD ONLY) Create branch for 4.1 Enterprise releases, based on 4.0.2 38003: (RECORD ONLY) Update version to 4.1.0 38079: (RECORD ONLY) Updated schema version to 5100 38536: (RECORD ONLY) Merged V4.1-BUG-FIX to V4.1 38219: ALF-14674: DOS voodoo to make start_deployment.bat work, as installed by Bitrock 38344: ALF-14674: Deployment installer still doesn't work - Use ${installdir.escape_backslashes} instead of ${installdir} 38471: ALF-14674: Deployment installer still doesn't work - Correction to use of ${installdir.escape_backslashes} 39519: (RECORD ONLY) Merged PATCHES/V4.0.2 to V4.1 38899: ALF-15005: Merged V4.0-BUG-FIX to PATCHES/V4.0.2 37920: ALF-13816: Permission Denied on web-client browsing if parent does not inherit permissions - FileFolderService getNamePath() now performs toFileInfo() as SystemUser. 38900: ALF-15005: Merged V4.1-BUG-FIX to PATCHES/V4.0.2 38549: ALF-11861: Maintain the same defuault root of WebDav for Alfresco 4.0 as was in pre-4.0 Removed overriding protocols.rootPath property from installer and enterprise overlay versions of alfresco-global.properties so that correct setting in repository.properties is used. 39494: ALF-15213 / ALF-15170: Can't change folder permissions in Private or Public-moderated sites - Fix by Dmitry V 44843: (RECORD ONLY) Created hotfix branch off V4.1 build 372 revision 44743 (candidate 4.1.2 release) 45708: (RECORD ONLY) Merged PATCHES/V4.1.2 to PATCHES/V4.1.3 45570: Merged V3.4-BUG-FIX to PATCHES/V4.1.2 43939: ALF-17197 / ALF-16917: Merged PATCHES/V3.4.11 to V3.4-BUG-FIX 43896: MNT-198: Activity feeds get not generated in private sites for added files if username in LDAP-AD contains uppercase letters - Now we can cope with a runAs where the username is in the wrong case 45714: (RECORD ONLY) Merged BRANCHES/DEV/V4.1-BUG-FIX to PATCHES/DEV/V4.1.3 45513: MNT-279: Use binary search in cached authority search to cut down search time when a group contains an astronomical number of authorities - Experimental fix to cut down on severe profiling hit 45715: (RECORD ONLY) Merged BRANCHES/DEV/V4.1-BUG-FIX to PATCHES/V4.1.3 44848: Fix for ALF-17178 SolrLuceneAnalyser.findAnalyser generating InavlidQNameExceptions wher they are easily protected. 46188: (RECORD ONLY) Merged BRANCHES/DEV/V4.1-BUG-FIX to PATCHES/V4.1.3 46014: Fix for ALF-17732 - SWF files are considered insecure content and should not be displayed directly in the browser. 46160: Fix for ALF-17759 - HTML files are stripped from metadata and style information after they are uploaded. 46165: Fix for ALF-17787 - Site Members 'All Members' link should not run query immediately 46169: Fix for ALF-17787 - Site Members 'All Members' link should not run query immediately - missing file 46186: Fix for ALF-17786 - Site dashboard page issues too many requests (Site Members dashlet issues avatar requests when it doesn't need too) 46242: (RECORD ONLY) Merged BRANCHES/DEV/V4.1-BUG-FIX to PATCHES/V4.1.3: 46184: Refactoring a test class to use JUnit Rules - as part of attempt to reproduce ALF-17797. 46192: Enhancement to JUnit Rule TemporaryNodes.java as required by fix for ALF-17797. 46194: Fix for ALF-17797. AddFailedThumbnailActionExecuter is failing. 46710: (RECORD ONLY) Create branch for Cloud Convergence from the latest state of 4.1.3 (RC5, Build 85, Revision 46648) 47908: Merged from DEV/CONV_V143 to DEV/CONV_HEAD 46788: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30323: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1: 30171: ALF-9613: caching content store. Various improvements and bug fixes. Including: 30325: THOR-114: S3 content store 30326: THOR-128: S3 content store 30333: THOR-139 F101: Get account for user e-mail id 30335: Merge from THOR0 to THOR1 r30274: THOR-135 is email address accepted by Alfresco? Part One. 30340: THOR-99: Thor module - enable tests 30341: Removing duplicate account-service-context.xml file. 30343: Merge THOR0 to THOR1 30339: Test email singup in Share complete 30338: New form runtime features: - Yellow background is displayed for mandatory fields without value - Red background dis displayed for fields with validation errors - Error message is displayed in a balloon when fields with error has focus - Using balloons is now the default method of displaying errors - Removed balloon code form create site menu since its now handled automatically - An alternative to balloons are "error containers" (div with clickable red text labels focusing the field): setErrorContainer(divEl) - Its possible to setMultipleErrors(true) to display all the forms/fields errors in the "error container"/ballon. - Its possible to turn of the balloons and error containers complete by setting setErrorContainer(null) - js validation handlers no longer needs to handle the messages OR the css classes for mandatory & invalid 30344: Missing value check caused js undefined error 30346: Minor css form fixes 30347: THOR-126: S3 content store - do not swallow exceptions 30348: THOR-66: disable unused services/features 30349: THOR-137 F88: Add existing external user (from another network) checkpoint 30350: THOR-135 Is email address accepted by Alfresco. 46789: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35594: Fix merge issue 47930: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 46762: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46768: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46769: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46778: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46780: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46786: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46791: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46792: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46808: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46809: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46819: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46829: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46839: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46842: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46844: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46846: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46847: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46876: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46877: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46878: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46879: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46880: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46881: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47947: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 46737: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 35288: Alfresco Cloud (from BRANCHES/V4.0) 35389: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30170: Thor branch based on Swift feature complete 30185: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: 28973: THOR-1: verify ability to create DB schema programatically on AWS RDS (for MySQL & Oracle) 28999: THOR-3: Tenant Routing Data Source (dynamic tenant-aware DB connection pools) 29022: THOR-1: verify ability to create DB schema programatically on AWS RDS (for MySQL & Oracle) 29031: THOR-1: verify ability to create DB schema programatically on AWS RDS (for MySQL & Oracle) 30186: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: (3 conflicts resolved) 29116: THOR-3: Tenant Routing Data Source (dynamic tenant-aware DB connection pools) 29174: THOR-24 Set up new Alfresco AMP module project. 29186: THOR-25 Copy and refactor Account Service from SambaJAM 29193: ImporterComponent - prep for THOR-7 29198: THOR-7: Tenant Service API - Create Tenant (using separate DB schema) 29204: THOR-29 Account Type Registry 29234: THOR-7: Tenant Service API - Create Tenant (using separate DB schema) 29246: THOR-7: Tenant Service API - Create Tenant (using separate DB schema) 29251: THOR-30 Added AccountDAO interface along with two implementations: AccountDAOImpl (not implemented) which will manage Account data in an RDB via iBatis. AccountDAO_InMemory which manages AccountInfo in simple HashMaps for testing purposes only. 29258: THOR-28 29259: Addendum to THOR-25. Moved account-service spring config into a subfolder. (trivial) 35393: (RECORD ONLY) Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: - fix up classpath (remove mybatis 1.0.0 -> 1.0.1 and chemistry 0.4.0 -> 0.6.0) 35411: (RECORD ONLY) Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/CLOUD1: 35409: Merged HEAD to BRANCHES/DEV/V4.0-BUG-FIX: 35399: ALF-12874: Schema reference files are out of date. 35452: (RECORD ONLY) Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/CLOUD1: 34219: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/V4.0-BUG-FIX: 32096: THOR-429: Fix "MT: Thumbnail + Preview are not updated (after uploading new version)" 32125: THOR-429: Fix "MT: Thumbnail + Preview are not updated (after uploading new version)" 34220: Minor: follow-on to r34219 (ALF-11563) 34747: ALF-13262: adding missing indexes for new schema's (activiti-schema create) + schema patch for existing schema 35417: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/V4.0-BUG-FIX: (THOR-6 / ALF-13755) 29356: THOR-6: MT is configured (but not enabled) by default - will be auto-enabled when first tenant is created 29455: THOR-6: build test/fix 29471: THOR-6: build test/fix 35423: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/V4.0-BUG-FIX: (THOR-4 / ALF-13756) 29500: THOR-4: Replace Tenant attributes with Tenant table (alf_tenant) 29501: THOR-4: Replace Tenant attributes with Tenant table (alf_tenant) 29503: THOR-4: Replace Tenant attributes with Tenant table (alf_tenant) 47949: Merged HEAD to BRANCHES/DEV/CONV_HEAD: 47914: Merge fix for org.alfresco.repo.cache.AbstractAsynchronouslyRefreshedCache<T> R 46078, 46079, 46121 47958: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 46746: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 35455: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30187: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: 29260: THOR: Initial Tenant Admin Service REST API - create, delete, get (list) web scripts 29356: THOR-6: MT is configured by default 29366: THOR-59: selectively disable certain test suites (for THOR dev build plan) 29377: THOR-59: selectively disable certain test suites (for THOR dev build plan) 29398: Refactoring of code to remove deprecation warnings. Replaced lots of object.field accesses with object.getField() calls.Trivial changes, but with so many warnings I can't see the wood for the trees. 29400: THOR-59: selectively disable certain test suites (for THOR dev build plan) 35456: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30188: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: 29442: THOR-59: selectively disable certain test suites (for THOR dev build plan) 29453: THOR-59: selectively disable certain test suites (for THOR dev build plan) 29455: THOR-76: track THOR build test failures and fix-up 29471: THOR-76: track THOR build test failures and fix-up 35459: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30189: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: 29473: Preliminary checkin for THOR-44. Created placeholder interface/impl/spring config for a new UserService. 29497: THOR-76: track THOR build test failures and fix-up ( LicenseComponentTest) 29500: THOR-4: Replace Tenant attributes with Tenant table (alf_tenant) 29501: THOR-4: Replace Tenant attributes with Tenant table (alf_tenant) 29503: THOR-4: Replace Tenant attributes with Tenant table (alf_tenant) 29511: THOR-59: selectively disable certain test suites (for THOR dev build plan) 29512: Adding a new JUnit4 test class with an @Ignore'd test in it - to see how Bamboo reports these. 29514: THOR: Initial Tenant Admin Service REST API - create, delete, list web scripts 29515: THOR-59: selectively disable certain test suites (for THOR dev build plan) 29521: THOR-79 - mark AVM sitestore as unindexed 35461: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30190: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: 29533: THOR-59: exclude certain N/A tests 29555: THOR-76: track THOR build test failures 29630: Added ant build targets for Cloud Module and a new executable for the Alfresco devenv. 29664: THOR-76: exclude system test suites 29667: THOR-64: add initial support for tenant routing data source 29676: THOR-76: exclude intermittent ActionTrackingServiceImplTest (pending ALF-9773 & ALF-9774) 29677: THOR-80: MT-aware S3 content store 29678: THOR-80: MT-aware S3 content store 29680: THOR-80: MT-aware S3 content store 29693: THOR-80: MT-aware S3 content store 29694: THOR-80: MT-aware S3 content store 47959: CONV_HEAD: CLOUD-1348 - comment back in MultiTDemoTest.testDeleteAllTenants 47967: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 46748: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 35464: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30195: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: 29774: Refactor Account DAO and Service. Boost Tests. Add appropriate headers. 29776: THOR-76: exclude intermittent ActionTrackingServiceImplTest (pending ALF-9773 & ALF-9774) 29795: Implemented MyBatis-backed Account DAO: 29817: Move (and rename) user service from repository to thor 30196: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: 29827: THOR-69: TenantAdminDAO 29832: THOR-78: fix tenantEntityCache (shared) 29834: THOR-111: experimental config option for S3 content store to support flat root (ie. all tenant files in single folder) 29856: THOR updates 29857: THOR-76: exclude build components/projects 46761: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 35478: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30198: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: 29869: THOR-92. BPMN2.0 workflow definition for account self-signup. 29871: THOR-93. REST API for self signup (and miscellaneous related items). 29882: THOR-102: Faster CreateTenant 29888: THOR-95. Placeholder email template for self-signup. 29889: Completion of THOR-95. Placeholder emails for self-signup. Added a 'you've already registered' template. 29896: THOR-89F100: Create User Foundation API… 29912: Fix issue where module believed it was still executed after delete tenant 29940: THOR-96. First cut of a signup email sender delegate. This will be refined later - probably both in this sprint and the next. 29966: Fixing InvitationServiceImplTest failing tests, which are failing because the email templates are not there. 29978: THOR-89: Switch tenant for person creation 29982: THOR-89: Fix multi-domain account creation test after review with Jan 29983: THOR-102: Faster CreateTenant 29985: THOR-90: F99 Is email address already registred foundation API 29991: THOR-99: Thor module build/packaging 29994: Changes for THOR-92, THOR-93 and THOR-96. 30199: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: 29995: THOR-93. Use the proper sspring config in the test case. 29996: THOR-99: Thor module build/packaging 29997: Consolidated DaveC's EmailAddressService and my EMailUtil into a single feature. 29998: Follow-on to previous check-in (29997). Deletion of now-unused folder. 30000: Blatant attempt to get svn r=30k. Removing some dead config. 30001: THOR-96. Ensure that we get a meaningful exception when attempting to activate an account with no pending workflow for that email. 30036: Resolve issues with tenant-independent user store - can now login via Share 30041: Package and auto deploy of license with Thor module 30048: Ensure that when a duplicate email prevents a workflow from creating an account, that the workflow still ends gracefully. 30049: Removing a dead class that I'd used to see how our Bamboo handles @Ignore(message=msg) @Test annotations. 30054: THOR-84 F82: List Accounts Foundation API 30067: THOR-87 List Accounts REST API. 30069: THOR-87. Completion of listAccounts REST API. Fixed the problems in the JUnit test case and tweaked the FTL slightly. 30071: Cosmetic changes as part of THOR-93. 30072: Oops. Broke a test case. Follow-on to previous (30071) check-in which cosmetically changed JSON as part of THOR-93. 30073: As part of THOR-93 (REST API signup) I have made the 2 webscripts usable without any authentication. 30074: Trivial fix to an error string. 30076: THOR-93. The account-activation.post webscript now includes the provided workflowInstanceId when identifying the ongoing workflow. 30077: Fix Email validator to allow for example domains 30202: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: 30140: Refactor of account signup workflow 30142: No longer require email address for activation step of sign-up 30143: Remove use of task query in account signup workflow 30146: thor-share project structure 30147: Buildfix (removed modules not used by THOR) 30151: Incorporate already registered use case into account signup workflow 30152: Finally resolve license loading in Eclipse based tests 30203: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: 30184: Build box fix as a result of not including certian components 30206: Fix blatant merge issues 47972: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 46766: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 35497: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/CLOUD1: 29723: THOR-31: MT-aware shared caches 29749: THOR-5: MT-aware immutable singletons 29762: THOR-31: MT-aware shared cache 46767: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 35507: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30237: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: 29532: THOR-79 - add ability to disable Lucene indexes (so that IndexInfo / IndexInfoBackup files are not created per store per tenant) 29723: THOR-31: MT-aware shared caches 29749: THOR-5: MT-aware immutable singletons 29762: THOR-31: MT-aware shared cache 47973: CONV_HEAD: CLOUD-1348 - comment back in MultiTDemoTest tests (testNonSharedGroupDeletion & testSharedGroupDeletion) 47975: CONV_HEAD: CLOUD-1348 - comment back in FeedNotifierTest.testFailedNotifications 47988: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 46775: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 35531: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30449: F66: add option to configure a common "contentRootContainerPath" 30564: THOR-156: prep - consolidate runAsSystemTenant/runAsPrimaryTenant 35532: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30777: THOR-201: temporarily comment-out MultiTDemoTest.testDeleteArchiveAndRestoreContent (pending fix for THOR-201) 48008: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 46844: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46895: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46903: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46907: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46922: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46974: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46991: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46992: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46994: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47107: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47265: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47267: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47272: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47277: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47284: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47286: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47289: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47292: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 48009: Merged DEV/CONV_V413 to DEV/CONV_HEAD 46801: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35602: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30513: Cloud Share module 30515: Fix issue with person replication between tenants. 30516: Slight mod to email validation web script response. 30518: Quick fix for workflow id generation in sign email 30534: THOR-163: Unable to get license file 30535: Fix Thor build process. 30536: Refine user's home site name and description 30539: THOR-96. When sending the signup email, execute the mail action asynchronously. 30542: Replace placeholder text in sign-up email 30543: Account Activation 46802: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35643: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30544: Account activation 30545: Account activation 30550: AMP build targets 30554: THOR-94. Cloud site invitation workflow. 30555: AMP build targets - added client side resources 48011: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 47056: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47087: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47228: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47271: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47297: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47299: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47300: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47301: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47304: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47328: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47330: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47339: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 48013: Merged DEV/CONV_V413 to DEV/CONV_HEAD (commiting the missing merge info for r48009) 46801: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35602: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30513: Cloud Share module 30515: Fix issue with person replication between tenants. 30516: Slight mod to email validation web script response. 30518: Quick fix for workflow id generation in sign email 30534: THOR-163: Unable to get license file 30535: Fix Thor build process. 30536: Refine user's home site name and description 30539: THOR-96. When sending the signup email, execute the mail action asynchronously. 30542: Replace placeholder text in sign-up email 30543: Account Activation 46802: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35643: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30544: Account activation 30545: Account activation 30550: AMP build targets 30554: THOR-94. Cloud site invitation workflow. 30555: AMP build targets - added client side resources 48015: Merged DEV/CONV_V413 to DEV/CONV_HEAD 46841: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35684: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30904: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1: 30270 ALF-9492 Can now update task properties through the Workflow JavaScript API. ALF-10087 Fixed failing Multi-tenancy tests. 30288 ALF-9492 Can now update task properties through the Workflow JavaScript API. 30309 Fixed failing MultiTDemoTest and re-enabled. 30356 ALF-10117: JBPM workflows should be hidden. 30358 Build fix, fallout from ALF-10117 (JBPM workflows should be hidden) 30415 Added parseRootElement() method to Activiti's BPMNParseListener. 30452 ALF-10276: Reject flow didn't set bpm_assignee property properly 30563 Added tests to ensure multi-tenancy works and fixed several multi-tenancy issues in workflow. 30698 ALF-9541: Fixed HistoricTaskEntity update when TaskEntity is loaded from DB 30699 ALF-10084, ALF-10242. Fixed issues and added WorkflowService methods to get workflow instances without filtering by definition id. 30750 ALF-10197, Added the ability to auto-complete Start Tasks in Activiti. If a start task extends the bpm:activitiStartTask type or implements the bpm:endAutomatically aspect then the task will be ended as soon as the workflow instance is started. 30796 ALF-10374 Fixed failing MultiTDemoTest 30908: Add logging for failed email domain lookups: 30922: Rolling back .classpath changes to Data Model. 30930: Basic version of site invite working 30931: THOR-172: Switch Tenant via public API 30936: Allow for repo web scripts to switch to user's default tenant via -default- tenant id: 30937: Implementation of THOR-214. There is now a new repo webscript to retrieve signup status for a given {id, key} pair. 30938: Allow dev email address to be specified in properties file: 30945: THOR-221: Add (EntityLookup) cache to AccountDAO 30946: Build fix. Renaming a test infrastructure class so that it doesn't get picked up by the ant test targets. 30955: THOR-222. Added inviter first and last name to invitation-status.get webscript. 46843: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35694: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30997: Firefox scrollbars removed on "invitation" and "signup" pages (now using new helper method Alfresco.util.createYUIOverlay) 31001: Impl of THOR-223. Webscripts for getting pending invitations. 31002: Invite - redirect bug fixed, removed old code matching previous webscript api, email picker style fixes 31003: Addendum for THOR-223. I've added an explicit test to record the fact that pending-invitations.get to a non-existent site returns 200 and an empty collection rather than a 404. 31004: Adding REST-client .rcq files as part of THOR-223 46848: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35700: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 31014: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1: 30999: ALF-9957 - MT: test and fix subscriptions (followers) 31020: Update invite email template to bring in line with wireframe and text 31021: Apply latest sanitized email blacklist: 31030: Fixed THOR-226 "DocLib "Detailed View" (default) does not list items - note: "Simple View" seems to be OK" 31033: THOR-228: Update aws sample file with quota config for cachingcontentstore 31036: Fixed THOR-236 "Webscript URL clash in signup" 31037: THOR-175: set and enforce per-tenant quota 31043: Fixed THOR-174 "F27: User can switch between networks they belong to" 46854: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35725: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 31124: Fix for THOR-145. This check-in makes the Cloud Signup and Invitation workflows hidden within Share - users can't initiate them via "Start workflow..." 48016: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 46793: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46795: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46796: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 48030: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 46820: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 35657: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30556: THOR-135F103: Is e-mail address accepted by Alfresco? 30562: Fixing a typo in the email-validation FTL. It was returning invalid JSON - no opening " on a string. 30569: THOR-156: switch to secondary tenant (initially via @@login) 30571: THOR-99: Thor build 48037: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 46821: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 35659: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30586: THOR-166. I've added an additional check at the start of the signup workflow that checks if the email is blocked. 30587: THOR-163: S3ContentReader fails to getObjectDetails 30592: THOR-156: switch to secondary tenant (initially via @@login) 35660: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30607: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1: 30208: Remaining commits for ALF-9510 30218: Fix build - add missing files 30254: Encryption related documentation, source code comments 30392: Fix for ALF-10205 30405: Fix for ALF-10189 30406: Fix for ALF-10189: part 2 - minor update 30613: THOR-148. The cloud test target was accidentally excluding *RestTest.java. 30613: THOR-148. The cloud test target was accidentally excluding *RestTest.java. 30614: Revert some of the additional email checks in registration process 30615: Set ignore patterns for build dir in thor module 30619: Merged HEAD to BRANCHES/DEV/THOR1: 30618: Additional test classes that allow for easier testing of Notifications (emails mostly). 30622: Ensure use of System user, not system user 30624: Removed deep merge info 30625: Switch off creation of missing people, use Admin instead of System 46824: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46828: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 48038: Merged DEV/CONV_V413 to DEV/CONV_HEAD (ui-only) 46830: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30737: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1: 30736: ALF-6706 - MT: activities not generated (for tenants) 30738: Site invite (rough version, not finished) 30741: THOR-175: Set and enforce file space quota for tenant 30752: Site invite - added som padding to user suggestion list 30753: Disabling 2 tests while I fix them. 30758: THOR-172 F63: Switch Tenant via public REST API: 30764: Tweak to Activiti integration code to prevent it from trying to create person nodes for the System user. 30766: Implementation of THOR-196. Inviting multiple email addresses in a single call. 30769: Re-enable MultiTDemoTest 30775: Site invite 30776: THOR-172: Switch Tenant via public API 30785: Add tenant id to account info returned in Thor responses 48043: Merged DEV/CONV_V413 to DEV/CONV_HEAD 46831: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30813: Add Eclipse project for Thor-Share module: 30815: THOR-175: Set and enforce file space quota for tenant 30817: Switch network skeleton code and minor fixes 30818: Update Share Node Browser (at least for THOR) to allow option to retrieve "storeroot" via DB query 30826: Add distribute-solr to Thor builds 48045: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30737: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1: 30736: ALF-6706 - MT: activities not generated (for tenants) 30738: Site invite (rough version, not finished) 30741: THOR-175: Set and enforce file space quota for tenant 30752: Site invite - added som padding to user suggestion list 30753: Disabling 2 tests while I fix them. 30758: THOR-172 F63: Switch Tenant via public REST API: 30764: Tweak to Activiti integration code to prevent it from trying to create person nodes for the System user. 30766: Implementation of THOR-196. Inviting multiple email addresses in a single call. 30769: Re-enable MultiTDemoTest 30775: Site invite 30776: THOR-172: Switch Tenant via public API 30785: Add tenant id to account info returned in Thor responses git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@48251 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
6652e37815 |
Merged V4.1-BUG-FIX to HEAD
47581: Merged DEV to V4.1-BUG-FIX (with corrections) 47557: ALF-16846 : Checkout version from Microsoft Office does not work AlfrescoCheckOutCheckInServiceHandler.checkOutDocument() was changed. Now we unlock before checkout if current user is LOCK_OWNER and a node has a WRITE_LOCK lock type. 47584: Remove unused import 47586: Merged V3.4-BUG-FIX to V4.1-BUG-FIX 47583: Add serialVersionUID for Path$Element (see ALF-18265) 47599: Set Surf version to 1.2.0-SNAPSHOT in POMs 47616: Workaround ALF-16888: NodeServiceTest.testConcurrentArchive() failing on DB2 - This test no longer runs on DB2 - Unable to find configuration that allows it to succeed 47640: Merged PATCHES/V4.1.4 to V4.1-BUG-FIX 47576: Merged DEV to PATCHES/V4.1.4 47560: ALF-18248 : Upgrade from 3.2.2 to 4.1.4 fails with java.lang.NullPointerException when applying patch 'patch.thumbnailsAssocQName' Test for null value was added to the QNamePatch#applyInternal() method. 47638: ALF-18258: Alfresco does not start with XAM module applied - Broke circular dependency in storeSelectorContentStoreBase 47639: ALF-18249: Fixed performance-killing typo discovered by Kev! - One innocent ! sign got lost git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@47642 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
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 |
||
|
34cc24aad6 |
Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD
44359: Fix for ALF-15236 - JSF - Edit online of html files does not keep the formatting 44365: Fix for ALF-14653 - Share - Page link created wrongly in wiki 44366: Fix for ALF-15435 - Incorrect behavior while managing groups via Explorer 44370: Completion of existing fix for ALF-14568. Also a build fix. 44372: Fix for ALF-13192 Rules from first folder move to second when delete first folder. This bug was caused because up to now, all rules have been firing for system folders, which they shouldn't have been. 44381: ALF-17094: Merged V4.1.1 (4.1.1.14) to V4.1-BUG-FIX (4.1.3) << Code is actually as suggested by Derek rather than code on V4.1.1 >> 44291: MNT-222 InvalidNodeRefException on user deletion in Share UI 44385: Fix for ALF-16006 - MT: Document Library is absent after upgrade from 3.4.x to 4.1.x (eg. 3.4.10 -> 4.1.1) Offshore team identified that patches running outside of a TXN were returning an empty list of tenants for MT upgrades - fixed after chat to Derek – added a new "big" TenantAdminService with a TXN wrapper interceptor so the AbstractPatch method that generates the list of tenants will also have a txn support regardless of the config set for a particularly patch - merged in fix to AVMToADM store patch to respect tenant named objects in paths 44395: Fix for ALF-17061 Search is failing with Node does not exist: missing://missing/missing(null) 44402: Merged DEV to V4.1-BUG-FIX 44347: ALF-16866 : Failure when trying to login as tenant created on 3.4.0 after the upgrade from 3.4.0 to 4.1.2 The immutableEntityTransactionalCache was made not tenant aware, and fixUserQNames patch now runs after migrateTenantsFromAttrsToTable to fix tenant users, too. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@44521 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
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 |
||
|
249b2cfe57 |
ALF-6112 - RINF 42: Email Server cm:aliasable aspect's checkAlias is broken
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@42813 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
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 |
||
|
cf2e12eebc |
Merged V4.1-BUG-FIX to HEAD
40170: Fix compile error following merge from 4.1.0 to 4.1.1 40175: ALF-14002 (5108), ALF-14220 (5109), ALF-15419 (5110) patch versions for 4.1.1 that came from commits made to V4.0-BUG-FIX after 4.0.2 was released. 40203: Fix 4.1 -> 4.1.1 merge error that was stopping start up of Share. Required change to extra config in 4.1.1 added for ALF-12524. There are other differences in the file for ALF-14812 and ALF-14813 but were not impacted. 40206: ALF-15281 - FTP/FTPS: With preserve timestamps turned off, the modification date does not change. 40208: ALF-12831: Upgrade to swftools 0.9.2 40210: ALF-13933: First attempt at installing LibreOffice 3.5 - Installed to a subdirectory called libreoffice - OpenOffice, Openoffice and OpenOffice.org replaced in all display strings 40229: ALF-7278: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1) 40227: ALF-15436 CLONE Alfresco 3.4c + Share + TIFF preview only shows the first page 40237: Fix for ALF-14663 from Vadim Danilchenko - the 'edit online' button in Share fails but we do not send any error message 40258: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_07_09 to BRANCHES/DEV/V4.1-BUG-FIX: 39668: ALF-15214 patch.fixBpmPackages performs unnecessary work 40261: Merged V3.4-BUG-FIX to V4.1-BUG-FIX 38592: Fixed ALF-14929: NodeDAO might not be last node write to the database - Regression introduced when Hibernate was removed - Fix validated by unit test 38596: Merged DEV to V3.4-BUG-FIX 38594: ALF-14744: Documents uploaded via WebDAV mount from Windows 7, and copied by a jscript rule are zero-length Change CreateNodeRuleTrigger.onCreateNode() method: Search for property of "d:content" type in node TypeDefinition, AspectDefinitions of node aspects and don't fire rules if found. 38781: Fixed ALF-14979: Long running AVM XPath queries on startup - Basic XPath was always fetching all siblings 38896: ALF-14744: Fix rule-firing regressions plus unit test - CreateNodeRuleTrigger must remember new nodes, regardless of whether it fires to avoid an update being fired on a node created in the same transaction - Tests should not assume that inbound rule will be fired on a content-less node (when the node's type or aspects have content properties) 38909: Merged DEV to V3.4-BUG-FIX (3.4.11) << Fix for issued identified by QA on 20/6/12 after verification of customer issues >> 38849: ALF-11956: WCM accessibility Navigation between the fields with erroneous data has been modified to allow navigation between elements of composite widgets such as Date/Time pickers etc... - the fix for ALF-10804 is backported (required for the current fix); - ability of cancelling and reactivating the strict navigation sequence has been added (pressing the Escape key for cancelling and focusing the alert link for reactivating); - generation of duplicate ids for comboboxes of the 'MonthDayPicker' widget has been fixed 38544: ALF-11956: WCM accessibility Draft implementation of 'FocusResolver' which introduces functionality of strict sequence for navigation between fields of the XForms widgets with erroneous data detected during validation 38934: Fix for ALF-13658/ALF-14849 38990: ALF-13048 Configuration of temp directories for converters (Openoffice and JOD) More general approach taken for JOD : - Allow an OpenOffice user template profile to be used by the JOD started OpenOffice process via the alfresco global property jodconverter.templateProfileDir - Among other settings, the profile contains values set in Tools|Options via the UI This includes the temporary directory: Tools|Options|openOffice.org|Temporary Files - If blank, a default profile is created. The user profile is recreated on each restart from the template. May be set to an existing user's profile such as: C:\Users\<username>\AppData\Roaming\OpenOffice.org\3 39115: Merged V3.4 to V3.4-BUG-FIX 38593: Merged DEV to V3.4 38572: ALF-13578: CIFS: AlfJLANWorker threads (concurrency) - server not responding Add nodeServices.exists(nodeRef) check to errorHandler in ContentDiskDriver.closeFile() to hide InvalidNodeRefException here. 38591: ALF-13578: CIFS: AlfJLANWorker threads (concurrency) - server not responding Replace "catch (AlfrescoRuntimeException e)" with "catch (RuntimeException e)" in ContentDiskDriver. Add "catch (InvalidNodeRefException ex)" to ContentDiskDriver.renameFile() method and throw java.io.FileNotFoundException here. 39063: Process the async packet queue at the end of CIFS NIO socket processing, before re-enabling socket events. ALF-13578. 39117: Merged V3.4 to V3.4-BUG-FIX (RECORD ONLY) 39116: ALF-13578: Reversed r39063 due to QA time constraints. Fix will be made limited availability and in next service pack. 39179: Merged DEV to V3.4-BUG-FIX (3.4.11) 38911: ALF-14827: Cannot see metrics data to Alfresco Enterprise Content Store in Hyperic HQ The attribute "TotalSize" is no longer exists in the Alfresco 3.4.x SpaceFree and SpaceTotal are added to the alfresco enterprise plugin. 38910: ALF-15016: Cannot see services to FTP, NFS Server in Hyperic HQ Alfresco enterrprise plugin fixed so that FTP and NFS Server resources now available in resources tab. 39230: ALF-15048 - Create Rule 'Execute Script'- 'Append Copyright to file' - Script that added the copyright was hidden in a .acp file (a zip file). .acp is normally used by wireshark so was not found in searches. 39294: Merged V3.4 to V3.4-BUG-FIX 39293: ALF-14698: Merged PATCHES/V3.4.6 to V3.4 38786: Merged V4.0-BUG-FIX to PATCHES/V3.4.6 (partial rework) 34279: NodeDAO: re-parent "lost & found" orphan child nodes (see ALF-12358 & ALF-13066 / SYS-301) - if orphaned nodes are identified (eg. via getPath(s)) then attempt partial recovery by placing them in (temp) lost_found - ... ALF-12358 ('child' node has deleted parent(s)) - ... ALF-13066 (non-root 'child' node has no parent(s)) - for internal use only - allows index tracking (eg. Solr) to continue - precursor to fixing underlying root causes 34338: NodeDAO: re-parent "lost & found" orphan child nodes (see ALF-12358 & ALF-13066 / SYS-301) - test fix (follow-on to r34279) 34341: NodeDAO: re-parent "lost & found" orphan child nodes (see ALF-12358 & ALF-13066 / SYS-301) - ano test fix (once more with feeling) 34434: ALF-13066: Fix for intermittent failure (testConcurrentLinkToDeletedNode) 38959: ALF-15136: Merged HEAD to PATCHES/V3.4.6 32659: Fixed ALF-11946: Lucene index recovery startup can cause full table scans and file sorts - Made the backward timestepping work in bounded segments, whereas previously there was no lower bound causing the database to creak under load and the whole process to take a long time. - Seen during benchmark testing as well 39211: ALF-15109: 'Touch' nodes in every case where we add / remove secondary parent associations. Causing group membership fallout at SAP. 39218: ALF-15109: Improved fix - must fire cascaded secondary association deletions at DbNodeServiceImpl level to ensure appropriate index events are fired and prevent out of sync indexes! 39240: ALF-15109: Another attempt. Now we are firing all the right events on cascade removal of secondary associations a lot of things are coming out in the wash! - Cascade delete secondary associations in a first recursive pass - Use a List of Pairs rather than a Map to avoid missing multiple associations to the same child 39295: Fixed merge issue 39381: ALF-12781 - Unable to set email contributors authority 39595: Fix for ALF-12506 - utils.setLocale() override the value to a lower case. 39932: ALF-9540: copy from drive to CIFS is slower than direct drive to drive copy by a factor of ~ 15 39935: ALF-9606: JSF, WebDav + Kerberos - Browser goes to a previous visited page when done/cancel edit online document - User is now redirected to logon when session expires. 39961: ALF-9540: Fix some broken unit tests caused by missing policies. 40026: Return success status for CIFS set security descriptor call even when the SecurityDescriptorInterface is not implemented. ALF-15357 Attempt to fix slow MS Office docx file save, unable to reproduce locally. 40090: ALF-15388: Merged V4.1-BUG-FIX to V3.4-BUG-FIX 40022: Fix for ALF-15144 - Slow Share doclib high-level folder browsing due to version history retrieval Revision: 40159 Author: taksoy Date: Tuesday, August 07, 2012 1:44:29 PM Message: ALF-13636: ReferenceError: "containerId" is not defined - Exception thrown during folder rule creation ---- Modified : /alfresco/BRANCHES/DEV/V3.4-BUG-FIX/root/projects/slingshot/source/web/modules/documentlibrary/global-folder.js 40231: ALF-13575: Merged DEV to V3.4-BUG-FIX 39879: Use of NetBIOS name versus DNS name in links accessed through CIFS - hostname is now determined from the path used to mount the drive on the client 40251: Merged DEV to V3.4-BUG-FIX 39667: ALF-4832: Incorrect behaviour of user's activities information in Moderated sites Introduce new method to ActivityPostService that accept userName. Post activity using new method when user is joined to site. 40252: Merged PATCHES/V3.4.6 to V3.4-BUG-FIX 39437: ALF-15458 / ALF-15184: ADMLuceneIndexerImpl debug can cause indexing to fail - Don't try to print the path of a deleted node! 39520: Merged DEV to PATCHES/V3.4.6 38728: ALF-15459 / ALF-14714 : A user can overwrite a "WRITE_LOCK" on a document created by a different user -The document owner is not considered to be the lock owner now. -ALF-12081 was backported. 39581: ALF-15460 / ALF-15216: Need predefined JGroups configuration for FILE_PING - Now FILE_PING can be selected using alfresco.jgroups.defaultProtocol=TCP-FPING - New parameter alfresco.fping.shared.dir specifies its shared directory and defaults to ${dir.contentstore} 39662: ALF-15461 / ALF-15243: "Failed to initialise config service" after a node comes back into the cluster - Nested writable transaction in a read only transaction - Removed old school transaction management 39768: ALF-15462 / ALF-10725: Account for local index impact of reparenting orphaned nodes - Unfortunately this means AbstractNodeDAOImpl now must talk to NodeIndexer but this may be revisited 39770: ALF-15462 / ALF-10725: Fix test failure - an orphaned node WITH the root aspect must still have parents or it is unindexable! 39816: ALF-15462 / ALF-10725: Revisit orphans once more - delete_ChildAssocsToAndFrom removed because it's evil and could orphan a node that's just shown up (read committed) from another transaction - Now only parent assocs of the deleted node are removed automatically and children are handled through normal cascading operations - The foreign keys will now block the deletion of a node with a new child created mid-transaction 39846: ALF-15461 / ALF-15243: Fix unit test failures 40253: Merged PATCHES/V3.4.9 to V3.4.-BUG-FIX 39703: ALF-15463: More synchronization, TRACE logging and test for ALF-15215: Missing synchronization in RepositoryContainer.getRegistry() 39885: ALF-15464 / ALF-15311: JGroups resends incorrect message for XMIT_REQ - Added new configuration files for heartbeat channel that removes NAKACK protocol as guaranteed delivery is not necessary for heartbeat. 40262: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (RECORD ONLY) 36853: Merge DEV to V3.4-BUG-FIX 31272 : ALF-8588 - IMAP Cannot attach two attachments with the same name. 38923: Merged HEAD to BRANCHES/DEV/V3.4-BUG-FIX 32757: Fix for ALF-9365 Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/V3.4-BUG-FIX 35693: Fix for ALF-13806 - Get content webscript incorrectly returns text/plain mimetype for HTML files, not text/html Merged BRANCHES/V4.0 to BRANCHES/DEV/V3.4-BUG-FIX 36560: Correctly size content length header after HTML stripping process (ALF-9365) 39015: Merged in upgrade of truezip to 7.5.5 see ALF-14247 39056: Merged V4.1-BUG-FIX to V3.4-BUG-FIX: ALF-15053: Ensure that sub-folders of "res" can be accessed in the DocLib 39361: Added truezip-swing jar. It seems that Truezip needs Swing :( git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@40274 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
0d57d67bec |
Merged V4.1-BUG-FIX to HEAD
39199: Fixed ALF-13252 "Share - Added aspects are not shown in folder properties" 39235: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_07_09 to BRANCHES/DEV/V4.1-BUG-FIX: 38994: ALF-14983 : Upgrade scripts to increase column sizes for Activiti 39052: ALF-14983 : Upgrade scripts to increase column sizes for Activiti (note: reviewed and merged, including required merge ghanges to .sql, .properties, .xml for schema number update 5111 -> 5112) 39239: ALF-14111 CLONE - 60k sites: Groups are not displayed in all supported browsers when 60k sites and 60 groups in the system - Code works on 3.4 as it includes a fix for ALF-7604 (3.4.2). - V4.1 should also have this fix (but did not) as there was a clone ALF-7734 (of ALF-7604) applied to Team that was merged to HEAD (and hence 4.x). The merge to HEAD failed to include this fix. - Putting this code back into 4.1.1 - this should correct this issue (ALF-14111) as the code will no longer have to sort 240,000 groups when there are 60,000 user created groups. 39257: ALF-10730: Fall back on parentType for icons if necessary 39307: Fix for ALF-14799 - jsonUtils.toJSONString() outputs long values as floating-point numbers - Updated to latest Surf libs rev 1101 which fixes this issue 39310: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_07_09 to BRANCHES/DEV/V4.1-BUG-FIX 39071: ALF-13767: User error messages in org.alfresco.repo.web.scripts are all hardcoded and cannot be localised Modify Java backed webscripts to return localised messages to model. 39345: Impl from Shane Frensley to fix ALF-3484 - Alfresco should show meaningful error message when deleted item recovery fails. 39362: RECORD ONLY MERGE from V3.4-BUG-FIX to V4.1-BUG-FIX 39360: <<DO NOT MERGE TO V4.1-BUG-FIX>> Remove the creation of OSX installers - we will never need them any more since they are neither distributed not trialled 39416: Fix for ALF-14466 Share Document Library breaks for obscure control character in document title 39594: Minor formatting tweak for coding standards consistency. 39622: ALF-9254: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1) 39605: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration - transformer.PdfBox.TextToPdf no longer does txt to pdf transform as OOo/JOD handles non western chars better and are not that much slower even for western encodings - It still does csv and xml to pdf - transformer.complex.Text.Pdf2swf now has a wild card first transformer for text to pdf (rather than transformer.PdfBox.TextToPdf) The 2nd transform is still transformer.Pdf2swf. As a result transformer.PdfBox.TextToPdf or the OOo/JOD transformers may be used. - transformer.complex.Archive.Pdf2swf now has a wild card first transformer for the same reason. - transformer.complex.Text.Image now has a wild card first transformer for the same reason. - Allow transformer config element supportedTransformations to wild card source or target mimetype 39692: ALF-9254: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1) 39679: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration - Fix build failures (not sure about RecordsManagementAuditServiceImplTest) - Reset some of the text to pdf / swf limits now OOo or JOD is used rather than PDFBox 39719: ALF-13037: Ensure that doclist is refreshed when on edit properties triggered folder rule that causes documents to be moved 39734: Improvements to reduce need to index Surf component XML files - parent config folders already dealt with, but this removes the burden of indexing the XML content. (ALF-10826) 39740: Merged BRANCHES/V4.1 to BRANCHES/DEV/V4.1-BUG-FIX: (record-only - already present) 39734: Improvements to reduce need to index Surf component XML files - parent config folders already dealt with, but this removes the burden of indexing the XML content. 39779: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (RECORD ONLY) 39774: ALF-15262: Merged V4.0-BUG-FIX to V3.4-BUG-FIX 35738: Merged HEAD to BRANCHES/DEV/V4.0-BUG-FIX: 35737: Fix for ALF-11923. Linked rules can't be deleted if source folder was deleted. 35751: Addendum to fix for ALF-11923. Fixing failing test case by tightening up delete behaviour. I also fixed the @since annotations from Odin to 3.4.11 39777: ALF-15262: Fixed compilation error by re-introducing typo in method name! 39784: Merged BRANCHES/V4.1 to BRANCHES/DEV/V4.1-BUG-FIX (RECORD ONLY) 39775: ALF-15271: "Site Content" dashlet shows all documents from all the sites in Alfresco Share 39831: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (4.1.1) 39015: Merged in upgrade of truezip to 7.5.5 see ALF-14247 39361: Added truezip-swing jar. It seems that Truezip needs Swing :( git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@40265 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
3ba7ffcca0 |
Merged V4.1-BUG-FIX to HEAD
38065: ALF-13725: yui-genXXX appears in the warning message while changing file name 38113: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/V4.1-BUG-FIX 35857: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1 33050: THOR-427: Decrease log level of 'Login Failed' 38117: Merged V4.1 to V4.1-BUG-FIX 38087: ALF-14725: Merged V3.4-BUG-FIX to V4.1 38086: ALF-14724: Upgrade to Java 1.6 u33 38118: Missing semicolons 38128: Merged V3.4-BUG-FIX to V4.1-BUG-FIX 37821: Fix for ALF-13658 - Direct access (SSO) to share user dashboard with external authentication fails and user is prompted to log on when browsing 37829: ALF-14340 CLONE: Alfresco crashes when viewing doclib / previewing - PDF with CMap This first part is general code (does not fix the specific issue) that could be merged to any branch. - TransformerDebug changes made to support investigation - Addition of 'supported mimetype transformations' to spring configuration (this is generally what people have thought EXPLICIT transformations were). - Tidy up of OpenOffice and JOD converters so that they don't say they can convert a mimetype to itself. There is a binary transformer that can just copy them. This also simplifies the Transformer debug output. 37831: ALF-14340 CLONE: Alfresco crashes when viewing doclib / previewing - PDF with CMap - missing file from last commit. 37832: ALF-14340 CLONE: Alfresco crashes when viewing doclib / previewing - PDF with CMap This second part that fixes the specific issue with reconfiguration of the transformers used. - Configuration of transformers changed to use ImageMagick with Ghostscript rather than PDFBox and PDFRenderer. The same transformations should be possible after this change. No combinations have been removed or added. - ImageMagick with Ghostscript now replaces both PDFBox and PDFRenderer for PDF to PNG. - A single or double ImageMagick with Ghostscript transformation (fails over to double when not possible with a single transformation) is now used by transformer.complex.PDF.Image - ImageMagick with Ghostscript rather than transformer.complex.PDF.Image now declares itself as having an EXPLICIT transformation for PDF to PNG. So normally there is no need to even look at the more complicated transformer.complex.PDF.Image unless it is included as a component of another transformer (there are 3). - PDFRenderer and 3rd party libs were only being used for PDF to PNG, so could be removed. NOT REMOVED AT THIS STAGE TO ALLOW CUSTOMISATION USE AND WORKAROUNDS OF ANY ISSUED THAT MIGHT BE FOUND. - PDFBox is still required for text to PDF, PDF to Text and metadata extraction. - Tidy up transformer.PdfBox.TextToPdf so that it does not declare csv to pdf and xml to pdf as EXPLICIT as this is the only transformer that can do it. 37834: ALF-10518 - Improvements to tagQuery.get.js for the Repository use case to remove the need to add //* PATH for CompanyHome query. 37835: Fix for ALF-14429 - Recently Modified dashlet takes up to 30 seconds to load after upgrade to Alfresco 3.4.6.23 37858: Merged V3.4 to V3.4-BUG-FIX (RECORD ONLY) 37592: Merged V3.4-BUG-FIX to V3.4 (3.4.10) 35103: Merged DEV to V3.4-BUG-FIX 37789: Merged V3.4-BUG-FIX to V3.4 37788: Second part of fix from Alex Mukha for ALF-11714 37841: ALF-14524: Merged PATCHES/V3.4.9 to V3.4 37840: ALF-14589: ALF-9861 breaks the JSON based error reporting for document library actions (by custom actions and code) - Fix by Mr Roast 37865: Merged DEV to V3.4-BUG-FIX (with corrections) 37845: ALF-13929: Error during processing of the 'show audit' template after upgrade New patch that updates show_audit.ftl to the newest version during upgrade 37877: Correction to corrections: 37865: Merged DEV to V3.4-BUG-FIX (with corrections) 37845: ALF-13929: Error during processing of the 'show audit' template after upgrade New patch that updates show_audit.ftl to the newest version during upgrade 37918: Merged DEV to V3.4-BUG-FIX 37548: ALF-11124: English language bundle properties have _en_US suffix Updated ant scripts to create properties files without _US suffix. 38090: ALF-14699: Merged DEV to V3.4-BUGFIX 38070: Search in Alfresco Explorer does not work 38124: Merged V3.4 to V3.4-BUG-FIX (RECORD ONLY) 38092: Merged V3.4-BUG-FIX to V3.4 38090: : Merged DEV to V3.4-BUGFIX 38070: ALF-14699: Search in Alfresco Explorer does not work git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@38135 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
e3cc4e0503 |
Merged V4.0-BUG-FIX to HEAD
37586: ALF-14309: Cannot run project using Alfresco SDK - sdk-common target now depends on sdk-extras target 37604: Merged V3.4-BUG-FIX to V4.0-BUG-FIX 37573: Merged DEV to V3.4-BUG-FIX (with improvements) 37547: ALF-13621: Encoding issue in passwords for webscript and webdav authentication Validation of BASIC username, password using following encoding in a sequence, ignoring duplicate decodings 1. UTF-8 (skip if fails to decode) 2. System.getProperty("file.encoding") (platform default encoding) 3. ISO-8859-1 It succeeds if one of them succeeds. 37591: ALF-14457: Merged PATCHES/V3.4.8 to V3.4-BUG-FIX 37288: ALF-14315: Localname is too long when upgrading from 3.1 to 3.4.8 or 3.4.9 - Truncate migrated group names within QName.MAX_LENGTH whilst maintaining uniqueness 37392: ALF-14315: Localname is too long when upgrading from 3.1 to 3.4.8 or 3.4.9 - Prevent NPE when re-parenting exising users 37593: (RECORD ONLY) Incremented version revision for 3.4.11 37599: Make this class compile so I can import all projects into Eclipse! 37601: ALF-14462: Stop Kerberos authentication from barfing when it comes across a NegoEx SPNEGO request from Windows 7 / 2008 http://blogs.msdn.com/b/openspecification/archive/2011/07/01/a-quick-look-at-the-new-negotiation-mechanism-negoex-used-with-spnego-in-windows-7.aspx 37602: ALF-10785: Locale not forwarded in webscripts when using Kerberos SSO - Previous solution didn't work when failover manual login form was used (as Accept-Language header wasn't always sent by all Surf machinery) and would also mean Share wasn't responsive to browser locale changes, unlike when using the /s endpoint. - Now we use a more foolproof solution on the /wcs endpoint - Session initiation (as detected by an authentication filter) sets an attribute that decides whether a session 'sticky' locale should be used for the rest of the session - It's set to false if a webscript is the first to access it or the session was established by a ticket. This means the Accept-Language header will drive the rest of the session. - This also means Explorer can still control the locale of a session initiated by it - Glad to see the back of this long-running bug. The good news is I now have a Kerberos EC2 image! 37603: ALF-14462: Fixed same potential NegoEx problem in Share SSOAuthenticationFilter (although not observed) 37605: Merged V3.4-BUG-FIX to V4.0-BUG-FIX (RECORD ONLY) 37590: Merged V4.0-BUG-FIX to V3.4-BUG-FIX 37586: ALF-14309: Cannot run project using Alfresco SDK git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@37606 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
507c4d8bf8 |
Merged V4.0-BUG-FIX to HEAD
37207: BDE-69: Filter more tests for minimal build plan 37253: Fix for ALF-13634 Re-created category won't show up again on a node in Document Library. - also fixes deletion of secondary associations 37265: Merged V4.0 to V4.0-BUG-FIX 37224: ALF-14174: Part 14 for 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 - Fix syntax error on Oracle 37250: Fix for ALF-14174 The patch adding timestamps to acl_change_set breaks SOLR tracking - better cross DB fix 37298: ALF-14365 - added hazelcastConfig.xml.sample 37323: ALF-13247: Two nodes with the same primary path. -Fixed by initializing zone before parallel batch processing begins. 37326: ALF-13933 Alfresco needs to be able to support LibreOffice for transformations ALF-13452 Open office startup from Java not working on OSX - Added code to start LibreOffice 3.5 on Mac (requires different options to the command and ure-link is a directory rather than a file on mac) - Removes $DYLD_LIBRARY_PATH from the environment when starting either openoffice or libreoffice on mac so does not need to rely on the installer moving the soffice.bin process to .soffice.bin and then creating a soffice.bin shell script that removed $DYLD_LIBRARY_PATH - Indent TransformerDebug a bit more now we have fail over transformers at the top and lower levels (saves N.N.N.N.N.N getting mixed up with text) 37340: Merged V3.4-BUG-FIX (3.4.10) to V4.0-BUG-FIX (4.0.3) RECORD ONLY 37339: ALF-13452: Merged V4.0-BUG-FIX (4.0.3) to V3.4-BUG-FIX (3.4.10) 37326: ALF-13933 Alfresco needs to be able to support LibreOffice for transformations ALF-13452 Open office startup from Java not working on OSX - Added code to start LibreOffice 3.5 on Mac (requires different options to the command and ure-link is a directory rather than a file on mac) - Removes $DYLD_LIBRARY_PATH from the environment when starting either openoffice or libreoffice on mac so does not need to rely on the installer moving the soffice.bin process to .soffice.bin and then creating a soffice.bin shell script that removed $DYLD_LIBRARY_PATH - Indent TransformerDebug a bit more now we have fail over transformers at the top and lower levels (saves N.N.N.N.N.N getting mixed up with text) 36273: ALF-13933 Alfresco needs to be able to support LibreOffice for transformations - Return a dummy OpenOffice command even when there is no OpenOffice/LibreOffice installed or on the path. 36264: ALF-13933 Alfresco needs to be able to support LibreOffice for transformations - remove old jodconverter-core-3.0-beta-3.diff 36259: ALF-13933 Alfresco needs to be able to support LibreOffice for transformations << Developed on Windows 7. Might need more work on Linux to get LibreOffice to shut down, but should be okay with OpenOffice 3.2 which was used in the previous release. >> - Updated jodconverter to latest version jodconverter-core-3.0-SNAPSHOT-patched.jar 28/4/2012 which is newer than 3.0 beta-4 - Applied patch for http://code.google.com/p/jodconverter/issues/detail?id=103 to handle setting the env for LibreOffice 3.5 - Modified code to use partial GNU style options (not used for -env!) when using LibreOffice - Added OpenOfficeCommandLine to dynamically supply OpenOffice or LibreOffice command line args for OOoDirect - Tested to work with OpenOffice 3.4 and 3.2 on Windows 7 37353: Merged V3.4-BUG-FIX (3.4.10) to V4.0-BUG-FIX (4.0.3) 37352: ALF-13452, ALF-13933 Alfresco needs to be able to support LibreOffice for transformations - Build test failure 37359: New JUnit Rule to support automatic creation and cleanup of Share sites in test code. This is required for an imminent fix to ALF-14345, but I'm checking it in separately in order to merge this general utility. 37360: Fix for ALF-14345. Site Service list method does not recognise sub-types of st:site. 37364: Merged V3.4-BUG-FIX (3.4.10) to V4.0-BUG-FIX (4.0.3) RECORD ONLY (not needed in 4.0.x) 37363: ALF-13452, ALF-13933 Alfresco needs to be able to support LibreOffice for transformations - Build test failure x2 (reference to jodconverter*jar not needed in 4.0.x) 37370: Merged V3.4-BUG-FIX: ALF-11714: Updated WCMQS to ensure all FreeMarker variables output to HTML are protected with ?html to prevent XSS 37382: Translation (DE, IT, JA, NL) updates from Gloria, based on EN rev37081 37384: Fix for ALF-14219 SolrQueryHTTPClient unable to handle long queries (4096 bytes) 37386: Merged V4.0 to V4.0-BUG-FIX 37385: ALF-14238: Fix by Dmitry to correct iteration in ImapUnsubscribedAspectPatch git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@37387 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
77717de7f3 |
Merged BRANCHES/DEV/V4.0-BUG-FIX to HEAD:
36740: Fix for ALF-14002: "No dashlets listed when customizing Site dashboard for the "Web Site Design Project" sample Share Site " git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@36743 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
7effb5240c |
Merged V4.0-BUG-FIX to HEAD
36152: ALF-13904: Can we code round the malformed Lock-Token reported in OOo/LibreOffice in ALF-7916 36169: ALF-8755: After renaming content / space by Contributor via WebDAV new items are created 36174: Reversed revisions 35090 and 35107. Reinstating Kofax in service packs for now until universal build is ready. 36191: Fixed inconsistencies in the application of index control aspect and guessMimetype in ADMRemoteStore and AVMToADMRemoteStorePath since hidden aspect additions. Tested with large site migration. 36193: Pull out the Thread-local HttpClient creation from RemoteClient, and expose. Will go back into Surf at some point 36194: Convert to using the ThreadLocal HttpClient instances, and some extra steps to ensure we always tidy up after ourselves now the instance is shared 36196: ALF-13915: Inline edit is possible on someone else's working copy in Share - possible data loss with no warning - Fix by MF 36197: Chinese: First files translated into Chinese 36202: ALF-13483: Japanese: Incorrect date handle in a date Input filed - Reviewed by DWe 36203: ALF-11463: Corrected localized email template naming format - Fix by Pavel, reviewed by DWe 36204: Fixes: ALF-13777, adjusts the sort order so that the calendar entries are displayed in a consistent order 36223: Remove old module code from core * removed DOD module code (now found in separate RM archive) * removed proff of concept RM module (long since deprecated) * removed blog integration module (migrated into the core product many moons past) * updated build scripts, removing all DOD module related tasks and properties 36226: ALF-5285: Workflow: Setting default value to data type <default>0</default>, value is not retained. - Customer bug from 2008! Reviewed by Frederik 36228: ALF-12742: Fix Websphere classpath to allow OpenCMIS to work! - Changes researched by Dmitry - ALF-14023 logged for doc impact 36235: More for ALF-13723 SOLR does not include the same query unit tests as lucene - first half of embedded CMIS tests 36236: Fixes: ALF-13777. Fix tweaked for aesthetics. 36245: ALF-13244 SOLR Multi-threaded tracking is required for performance - simultaneous document transformations - multi-threaded tracking is now the default 36248: Fixed ALF-13705 "Could not load properties"/InvalidQNameException while trying to open/edit rule in Share 36255: ALF-13088: Upgrade to OpenCMIS 0.7.0 to solve Alfresco CMIS extension issues 36256: ALF-13088: Fix compilation error 36259: ALF-13933 Alfresco needs to be able to support LibreOffice for transformations << Developed on Windows 7. Might need more work on Linux to get LibreOffice to shut down, but should be okay with OpenOffice 3.2 which was used in the previous release. >> - Updated jodconverter to latest version jodconverter-core-3.0-SNAPSHOT-patched.jar 28/4/2012 which is newer than 3.0 beta-4 - Applied patch for http://code.google.com/p/jodconverter/issues/detail?id=103 to handle setting the env for LibreOffice 3.5 - Modified code to use partial GNU style options (not used for -env!) when using LibreOffice - Added OpenOfficeCommandLine to dynamically supply OpenOffice or LibreOffice command line args for OOoDirect - Tested to work with OpenOffice 3.4 and 3.2 on Windows 7 36263: Merged V4.0 to V4.0-BUG-FIX 36247: ALF-11027: temporarily remove import of maven.xml, since it makes ant calls fail from enterpriseprojects 36264: ALF-13933 Alfresco needs to be able to support LibreOffice for transformations - remove old jodconverter-core-3.0-beta-3.diff 36265: ALF-14025: Updated Surf libs to stop application context being added to non-checksum requested dependencies to allow relative paths to be requested. 36266: Merged V3.4-BUG-FIX to V4.0-BUG-FIX 36147: Removed nonsense comments from method information 36187: Merged DEV to V3.4-BUG-FIX 36121: ALF-234: There is no field restriction at the New Rule form in Share 'maxlength="1024"' parameter has been added to title and description fields in 'rule-edit.get.html.ftl' 36229: Merged DEV to V3.4-BUG-FIX 35115: ALF-13181:Stack Specific: Script error occurs when try to exute Task Done/Approve/Reject action on My Tasks (My Tasks WebScript) dashlet Dellay for 500 miliseconds was added to MyTasks.transitionTask() method. 36242: Fixed ALF-12287 "Share - metadataRefresh event removes version history" - The javascript component was listening to "metaDataRefresh" which made it refresh itself. However it also listened to dopcumentDetailsAvailable to enhance its dom (i.e. show itself). Meaning that if timing was bad and the "documentDetailsAvailable" was fired before the refresh had been performed it nwever showed itself. 36260: ALF-13936: Enabling IMAP can interfere with folder versioning 36262: ALF-13718: Reverting ORDER BY changes to child assoc query as they had more impact than expected and we turned out to be compensating for out of date SQL Server statistics 36269: Merged V3.4-BUG-FIX to V4.0-BUG-FIX 36268: ALF-14031: Merged PATCHES/V3.4.6 to V3.4-BUG-FIX 36176: ALF-13981: Fix registerReferenceCountingIndexReader() so that it works in a doWithFileLock() retry loop (whatever that means!) 36273: ALF-13933 Alfresco needs to be able to support LibreOffice for transformations - Return a dummy OpenOffice command even when there is no OpenOffice/LibreOffice installed or on the path. 36275: ALF-14029: Updating single-valued association (no List<NodeRef>) fixed. 36283: Translation updates to: DE, ES, FR, IT, JA, NL. Based on EN rev36165. 36284: ALF-13723 SOLR does not include the same query unit tests as lucene - InTree, InFolder, FTS, Access, DateFormatting, AspectJoin, FTSConnectives, LikeEscaping 36306: ALF-13672: Workflow Notification Emails are partially localized into other languages git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@36324 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
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 |
||
|
c3a622e3c4 |
Merged V4.0-BUG-FIX to HEAD
33836: Fix for ALF-10651 Fix patches that trigger reindexing and ALF-10656 SOLR: Patches execute search during bootstrap causing deadlock 33842: Fixes ALF-12797: i18n strings in activiti-admin login-screen escaped properly 33844: Fix for ALF-10651 Fix patches that trigger reindexing and ALF-10656 SOLR: Patches execute search during bootstrap causing deadlock - batch touch to limit the in clause size generated 33845: Manually added extra core Share extensions needed for the V4.0 Records Management module from the development branch. - Refactored JSON property decorators for the Document Library data webscripts - Document List banners (e.g. working copy) moved into metadata template config - Ability to override default document/folder title within Document Library (<title> element in metadata template - unused in core code) - Additional extension point in surf-doclist to override remote data URL - Better handling for missing content property 33852: ALF-12725: Merged V3.4-BUG-FIX (3.4.9) to V4.0-BUG-FIX (4.0.1) 33849: Merged V3 (3.4.8) to V3.4-BUG-FIX (3.4.9) 33848: ALF-10976 (relates to ALF-10412) Fixed bug to do with preview being stuck as always being 'Content cannot be previewed. Do you wish to download?' or a 'blank preview after a transformer is not found' for all content with the same mimetype. Cache in ThumbnailRegistory.getThumbnailDefinitions() now understands that transformers may have an upper content size limit. The choice between the two options was based on the size of the first file previewed of each mimetype. Needed to add getMaxSourceSizeBytes() to support this (see below). - refactored (previous refactor was incomplete) ContentTransformer so that the two halfs of isTransformable is now split into sub methods isTransformableMimetypes and isTransformableSize. This is why there are so many files changed. - Moved getMaxSourceSizeBytes() from AbstractContentTransformerLimits to ContentTransformer as there were becomming too many places in the code that needed needed to check if the ContentTransformer was an instanceof AbstractContentTransformerLimits before calling this method. - TransformerDebug now uses KB MB GB values in output to make it simpler to read. - TransformerDebug now uses thousand separaters in millisecond values to make it simpler to read. - TransformerDebug now reports the 'parent' transformer name rather than the sub-transformer name when an unavailable transformer is found. Makes it simpler to tie up with the 'available transformer' list with the new pushIsTransformableSize() calls. - TransformerDebug now uses trace logging for calls from ThumbnailRegistory.isThumbnailDefinitionAvailable() as it is normally followed by a ContentService.transform() which is logged at debug level anyway. - TransformerDebug now turns logging level to trace if the file size is 0 bytes. Request from Jan. Not sure how one uploads such a file! - Modified ComplexContentTransformer.isTransformable() so that it checks the mimetypes before the sizes so that TransformerDebug does not report 'unavailable transformers' that don't support the mimetype conversion. - Modified ComplexContentTransformer.getLimits and ComplexContentTransformer.isPageLimitSupported() to include the limits from the first sub transformer. Was not an issue until ContentTransformer.getMaxSourceSizeBytes() was introduced. - Added logger to RhinoScriptProcessor to debug requests run javascript on the server. - Dropped the sourceUrl parameter from ThumbnailRegistry.getThumbnailDefinitions() which was introduced with limits as it is logicall not needed. 33853: DiskInterface.renameFile() can now throw PermissionDeniedException to return a different status to the client. Part of ALF-12717. 33856: Merged V3.4-BUG-FIX to V4.0-BUG-FIX 33835: ALF-12546: Remove references to retired RegPaths.exe from installed apply_amps.bat script 33843: Fix for ALF-12775 33855: Merged V3.4 to V3.4-BUG-FIX 33851: ALF-12588: Documents Intermittently Do Not Appear in Share - Fix by Alex Busel for regression I accidentally caused in 3.4.6 - Simple typo in mergeDeletions() caused path deletions to sometimes not get applied or get processed twice - Yikes! git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@33857 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
4e7a0f6ef0 |
Merged V4.0-BUG-FIX to HEAD
33757: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/V4.0-BUG-FIX 33755: Latest Spring Surf libs: - Updates to convert FreeMarker directives for processing directives Spring Beans to allow their behaviour to be customized. - Changed Extensibility model objects to use a non-blocking GUID generator to avoid thread contention (small amount noticed with 1000 concurrent user test) - Removed old machine gun code to generate Object GUIDs, which weren't even valid GUIDs ironically. - Replaced with new non-blocking fast GUID generator in webscripts package. - Added Reentrant ReadWriteLock around resources in singleton Spring beans that are manipulated by multiple threads. - Added Reentrant ReadWriteLock around Advanced Component internal resources. - Surf performance improvements from Thor high load profiling in Jmeter/Jprofiler - Removed lock around ModelWriter (which is only used by a single request thread at a time) - Replaced StringBuffer with StringBuilder for Writer usage in extensibility framework to remove locking. - Performance improvements around retrieval of RemoteClient instance - avoid expensive Spring prototype bean retrieval, use a threadlocal clone of a base RemoteClient bean instead. - Concurrency fixes around CRUD operations on shared ModelObjects instances. - Surf ModelObjects are shared between all users in the model object caches - but the original machine gun code has no locking what-so-ever around CRUD operations - which meant that it was possible for incorrect property values to be received from a ModelObject in a heavily multi-threaded scenario on initialisation of a Surf application. - was causing nonsense warnings such as: WARN [extensions.webscripts.WebTemplateProcessor] [http-8081-exec-10] Unable to find a valid template path for uri: freemarker - Modified default web-tier server response codes for read timeout and connect timeout to return more sensible codes to client browsers. - Fix for concurrency issue resolving SpringMVC View objects found during heavy thread testing on web-tier startup. - Improved caching strategy for WebScripts View Resolver - move techniques from Surf down to WebScripts layer. - Improved general View Resolver strategy by caching failed view requests. - WebScript resource bundle extension module application thread safety modifications Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX 33684: Fixes for ALF-12628, ALF-12639 - timeout handling for READ_TIMEOUT from web-tier to Alfresco 33771: ALF-12488 - CIFS error occurs if Hazelcast Config is enabled 33773: ALF-12437 Switching from Lucene to Solr caused subsystems to be in inconsistent state and repository to hang - filter to include only updateable properties at persistence and start up time 33775: ALF-11870 Handle the odd way that Outlook requests yearly repeating events, and add unit tests for the yearly recurrence cases 33776: ALF-12569: org.postgresql.util.PSQLException Invalid ESCAPE on customizing alfresco share site dashboard Added backwards compatible PostgreSQL-specific ESCAPE fragment - fixes for PostgreSQL 9.1.2. 33784: Fixes: ALF-12111 - Publishing Error when authenticating Facebook channels using IE8. Required an update to stand-alone-auth-return.html. 33787: Fix for ALF-12337 Remove patch.siteLoadPatch.swsdp from being run for upgrades - only add the sample site for new installs and not upgrades 33794: ITALIAN: Translation updates based on EN r33523 33807: Merged V3.4-BUG-FIX to V4.0-BUG-FIX 33717: (RECORD ONLY) ALF-12632 Move the Site Service permissions to public-services-security-context.xml, to mirror the behaviour on 4.0, and add a (commented out) example of how to restrict site creation permissions with it 33806: Merged V3.4 to V3.4-BUG-FIX 33728: ALF-10976 Excel files bigger than 2mb cause soffice.exe to take 100% of one CPU for more than 2 minutes in previews. - Added configuration to limit older excel format 'xls' from Excel 5.0/95 and Excel 97-2003 Already had configuration for xlsx Microsoft Office 2007 33743: ALF-12724: Merge HEAD to V3.4 (3.4.8) Issue found while fixing ALF-9899 and again by QA when testing ALF-9899 32941: ALF-11300: - fix locking issues 33772: Merged DEV to V3.4 33768: ALF-12685 : Search isn't working correctly Index delete events were not getting fired for the entire tree of affected nodes when a node was archive Added a deletion of child nodes from indexes in DbNodeServiceImpl.pullNodeChildrenToSameStore() method. 33803: ALF-12724: Merged V4.0-BUG-FIX to V3.4 (Reverts previous revision and changes an error message to debug) 33137: Activities feed generator: change info log messages to debug log messages 33452: Fix for ALF-12536 33536: Fix for ALF-12536: hopefully this will be the final fix. 33805: ALF-12624: Fix regression introduced by ALF-9514 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@33808 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
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 |
||
|
a2d326dd48 |
Merged BRANCHES/DEV/V4.0-BUG-FIX to HEAD:
33109: ALF-11479: When upgrading from Alfresco Community 3.4.d to 4.0.b, some nodes that are blocked and have versions fail after the upgrade git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@33263 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
d5df03b091 |
ALF-12060 - Regression: patch.activitiesTemplatesUpdate once again expanded from acp to xml and fails
* failed due to recently expanded ACP file * Updated to use updated template patching helper base class git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32839 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
aac8f44c59 |
Merged V3.4-BUG-FIX to HEAD
32456: (RECORD ONLY) Removed extraneous debugging 32538: ALF-12075: Merged DEV/TEMPORARY to V3.4-BUG-FIX 32476: ALF-11499: "The association source type is incorrect: " when trying to add extra documents to inflight workflow after upgrade to 3.2.0r and later Patch that converts workflow package type and associations 32532: ALF-11499: "The association source type is incorrect: " when trying to add extra documents to inflight workflow after upgrade to 3.2.0r and later 1. Code comments 2. Removed potential catch of retryable exception 3. Removed unneccessary throw of PatchException 32541: Fix for ALF-11677 - Doing an HTTP POST to a repository webscript through the Share proxy fails on certain input 32712: ALF-12074 / ALF-10547: JMX settings lost after upgrade from 3.2.2 to 3.4.4 - MigrateAttrPropBackedBeanPatch now persists migrated data through the MBean interfaces (cluster and cache friendly) rather than going through the 'back door' 32734: ALF-12076: Fix ALF-11924 - HighlightFile after document upload in Share doclib 32738: ALF-11957: Merged PATCHES/V3.4.6 to V3.4-BUG-FIX 32617: ALF-11977 / ALF-11879: IMAP performance - Fix node batch loading - batch load ContentData to avoid N+1 problem with content properties - During cache preloading, use distinct transactions for each folder search, thus avoiding blowing the transactional caches 32619: ALF-11977 / ALF-11879: Fixed typo 32652: ALF-11977 / ALF-11879: Deactivate auto-versioning and auditing (and run as system) whilst setting magic IMAP aspect properties 32683: ALF-11978 / ALF-11915 iBatis synchronizes on the ClassInfo class during high concurrency Similar change made to ibatis ClassInfo.java as was made to mybatis (in 4.0) for ALF-11894 src.diff is diff from new SVN location at http://mybatis.googlecode.com/svn/tags/java_release_2.3.4-726/ibatis-2-core hence the revision number changes modified the pom to use Java 1.5 (1.6 does not work due to changes in abstract sql packages) and removed a plugin that no longer works 32788: ALF-12077: Fix for ALF-12050 - ensures that overly agressive caches won't cache Share PageView dynamic responses. 32818: Merged PATCHES/V3.4.6 to V3.4-BUG-FIX 32510: (RECORD ONLY) Merged V3.4-BUG-FIX to PATCHES/V3.4.6 32322: Possible fix for: (ALF-11344) SORT clause in CMIS query (ORDER BY) drastically affects performance of search. - English based locales will sort as Java String comparison. 32411: Fix for ALF-11344 SORT clause in CMIS query (ORDER BY) drastically affects performance of search. - use in memory sort rather than relying on the lucene field cache for result sets up to 1000 by default - this is configurable across all query languages (and per query via SearchParameters and QueryOptions) lucene.indexer.useInMemorySort=true lucene.indexer.maxRawResultSetSizeForInMemorySort=1000 32425: Fix for ALF-11344 SORT clause in CMIS query (ORDER BY) drastically affects performance of search. - fix for score sorting 32616: (RECORD ONLY) ALF-11849: Merged V3.4-BUG-FIX to PATCHES/V3.4.6 31653: ALF-8906: Ensure entire IMAP service startup transaction runs as system, to allow for any auto-aspect adding / versioning during cache warming 31676: ALF-8906: Fix IMAP unit test failures 32792: ALF-11894 / ALF-11915: Prevent contention in NodeService proxy by making NodeService_security proxy to a thread local! - Use org.springframework.aop.target.ThreadLocalTargetSource - Inventive or what? 32814: ALF-11894 / ALF-11915: Prevent contention in CMIS searches - Rolled back previous fix because it didn't work! - Patched ACEGI ConfigAttributeDefinition to use LinkedList rather than synchronized Vector to avoid contention on all NodeService accesses - Created NonBlockingLazyInitTargetSource, again to avoid contention on all NodeService calls 32816: (RECORD ONLY) ALF-12072: Merged V3.4-BUG-FIX to PATCHES/V3.4.6 32788: Fix for ALF-12050 - ensures that overly aggressive caches won't cache Share PageView dynamic responses. 32819: Merged V3.4 to V3.4-BUG-FIX (RECORD ONLY) 32817: Merged PATCHES/V3.4.6 to V3.4 (3.4.7) 32510: ALF-11840: Merged V3.4-BUG-FIX to PATCHES/V3.4.6 32322: Possible fix for: (ALF-11344) SORT clause in CMIS query (ORDER BY) drastically affects performance of search. - English based locales will sort as Java String comparison. 32411: Fix for ALF-11344 SORT clause in CMIS query (ORDER BY) drastically affects performance of search. - use in memory sort rather than relying on the lucene field cache for result sets up to 1000 by default - this is configurable across all query languages (and per query via SearchParameters and QueryOptions) lucene.indexer.useInMemorySort=true lucene.indexer.maxRawResultSetSizeForInMemorySort=1000 32425: Fix for ALF-11344 SORT clause in CMIS query (ORDER BY) drastically affects performance of search. - fix for score sorting 32792: ALF-11978 / ALF-11915: Prevent contention in NodeService proxy by making NodeService_security proxy to a thread local! - Use org.springframework.aop.target.ThreadLocalTargetSource - Inventive or what? 32814: ALF-11978 / ALF-11915: Prevent contention in CMIS searches - Rolled back previous fix because it didn't work! - Patched ACEGI ConfigAttributeDefinition to use LinkedList rather than synchronized Vector to avoid contention on all NodeService accesses - Created NonBlockingLazyInitTargetSource, again to avoid contention on all NodeService calls 32816: ALF-12050: Merged V3.4-BUG-FIX to PATCHES/V3.4.6 32788: Fix for ALF-12050 - ensures that overly aggressive caches won't cache Share PageView dynamic responses. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32821 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
bf7181452c |
Fix for ALF-10826
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32797 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
24a84a82d6 |
Fix for ALF-11658 - "surf-config" folders are visible in search results
- the "surf-config" folder now has the IsIndexed=false property applied during creation for both new sites and the 3.X->4.0 migration patch git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32751 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
dc665385f5 |
ALF-11463: Dutch - Localised Templates
* Dutch email templates added * Patch added git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32715 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
3d13f43826 |
ALF-11514: ALL LANG - Following_email Templates updated/localised
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32412 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
7a7f42743e |
End-of-life for several 2.1 and 2.2 patches
- Officially, all upgrades from 2.1.x, 2.2.x and 3.0.x must now go via 3.4.x - Allows upgrades without indexes in 4.0 e.g. 'patch.deploymentMigration' (ALF-11760) - When attempting to upgrade directly from V2.1 or V2.2, a message will appear: Patch ''{0}'' was last supported on version {1}.\n Please follow an incremental upgrade using version {2}. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32396 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
0b7432b4d0 |
Merged V3.4-BUG-FIX to HEAD
31987:Proper fix for ALF-11489: 'patch.sitesSpacePermissions' failed on upgrade 2.2.8 -> 3.4.6 - Just handle missing defined ACLs git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@31988 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
80cce9c0f2 |
Merged DEV to HEAD
31489: Fix MT NodeRef translation in policy filter (ALF-10178) 31452: Sync DEV branch with HEAD 30312: Reintegrated HEAD 30281: Comprehensive DEBUG logging to track behaviour enable/disable states for transactions - Part of ALF-10178: BehaviourFilter fails when nesting disable/enable calls 30280: Fixed importer's use of behaviour filter - The change in the BehaviourFilter contract means that all disable calls must be matched with an equivalent enable call. Enabling globally no longer wipes out vetos put in place by other code. - Part of ALF-10178: BehaviourFilter fails when nesting disable/enable calls 30279: Removed unnecessary behaviour enablement checks is VersionService (ALF-10178) 30278: Fixed behaviour re-enabling for StoreSelectorAspectContentStore (ALF-10178) 30240: Fixed ALF-10178: BehaviourFilter fails when nesting disable/enable calls - Behaviour enable/disable now uses reference counting to check the state of different behaviour levels - Added unit test to test - Re-enabled test for ALF-10177: Test disabled: CheckOutCheckInServiceImplTest.testalfrescoCheckoutDoesntModifyNode but renamed to CheckOutCheckInServiceImplTest.testAlfrescoCheckoutDoesNotModifyNode - Going into DEV branch to run through tests 30236: Branch for fixing BehaviourFilter nesting git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@31619 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
4df62abcbf |
Fix ALF-10893: Fail upgrade from 2.2.8 -> 4.0 on MySQL
- Included: ALF-10897: Patch SiteStorePatch must be changed to NoOpPatch - Site permission fixes not required if the site root is being imported (see <alternatives>) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@31325 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
1964bde460 |
ALF-10424: Add Task 'Message' text in workflow email notification
* Added missing patch to update templates. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@31300 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
38d03ca5ae |
Fix for ALF-10797 - "Recently added" and "Recently modified" sections in "My content" page are empty
- addition of index control aspect to surf-config objects - config xml files no longer indexed at all - refactoring of My Profile user contents fts-alfresco queries to search specific known containers only rather than all git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@31288 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
b50a208a59 |
Tweaks to patch performance.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30950 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
6c517ea99a |
Fix to AVM->ADM Share Site migration patch to disable rules during node processing
- recent changes (unsure which...) mean that somewhere in rules services a RunAs(system) is interfering with the RunAs(user) already set on the outer txn - this means that all Share sites migrated from 3.X to 4.0 in the last couple of weeks (including Community 4.0a) will not have the correct user permissions. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30914 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
74b9ff5845 |
ALF-9456 - Finish updating the Site Importer/Exporter now that Site Config is in the normal repo rather than in AVM
(The sample team site export had already been tweaked by Kev in June to include the surf-config) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30745 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
cb4d98449c |
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
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30683 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
53674e57eb |
Reworking of AVM to ADM RemoteStore patch to remove thread contention by precreating 'surf-config' folders for each site.
Also speeds up patch processing by ~20%. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30559 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
127ca27aa0 |
Fix for ALF-10326 - AVMToADMRemoteStorePatch fails with Duplicate child name not allowed: surf-config
- since fix for ALF-10280 rev 30468 a DuplicateChildNodeNameException no longer automatically retries in the txn - now throw out an exception that does retry instead. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30533 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
c5f4647c48 |
Merged DEV to HEAD
30321: ALF-10115: Working copies in repository upgraded to 4.0 does not get cm:original association - breaks document listing In WorkProvider.getNextWork() method, changed type of results to Set<Pair<Long, NodeRef>> to prevent duplicate nodes in the returned collection. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30322 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |
||
|
d004bc3e90 |
SOLR bug fixes
- Fix SOLR web app shutdown - Lucene search sub-system can start and self-test without being live - Fix passing faceting parameters - Model deletion on update/removal - ALF-9798 Share - doc lib - favourites fails to show with SOLR - incorrect query .... - ID now uses hidden LID field if it is a NodeRef - QNAME and other related queries generated against AUX doc git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@29624 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 |