inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-06-30 18:15:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,091 Commits 330 Branches 2,134 Tags
Commit Graph

193 Commits

Author SHA1 Message Date
Alan Davis
1a05b428a3 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 
57053: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      56520: Merged HEAD-BUG-FIX to V4.2-BUG-FIX (4.2.1)
         56403: Various format fixes made during investigations e.g. ALF-20221


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61687 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2014-02-11 19:01:50 +00:00
Alan Davis
f1c9210cfe Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 
57036: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      56503: Merged HEAD-BUG-FIX to V4.2-BUG-FIX (4.2.1)
         55926: <<NOT IN 4.1.6>> Merged V4.1-BUG-FIX (4.1.7) to HEAD-BUG-FIX (4.2)
            55707: Formatting during investigations of MNT-9510
            - did not include file in last commit


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61670 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2014-02-11 18:48:02 +00:00
Alan Davis
fcd4ab8d01 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 
57034: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      56501: Merged HEAD-BUG-FIX to V4.2-BUG-FIX (4.2.1)
         55924: <<NOT IN 4.1.6>> Merged V4.1-BUG-FIX (4.1.7) to HEAD-BUG-FIX (4.2)
            55706: Formatting during investigations of MNT-9510


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61667 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2014-02-11 18:46:30 +00:00
Samuel Langlois
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
 2013-08-20 17:17:31 +00:00
Kevin Roast
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
 2013-07-01 09:35:59 +00:00
Pavel Yurke
d2ca6021c2 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


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@49062 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2013-04-10 13:41:48 +00:00
Pavel Yurke
56e02f486c 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.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@49055 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2013-04-10 13:01:51 +00:00
Dave Ward
e89652d129 Merged CONV_HEAD to HEAD 
48422: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
      48397: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
           48391: Merged BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2 to BRANCHES/DEV/CLOUD2:
                48355: CLOUD-1458: Added MailActionExecuterTest to ActionTestSuite.
      48398: CONV: CLOUD2 - fix for CLOUD-1459 - Site invite between Networks throws an preferences error (can't get locale for ano user) when the emails are about to be sent
      48420: CONV: fix CLOUD-1351 - MultiTDemoTest.test21_ALF_12732
   48532: Merged CONV_V413 to CONV_HEAD
      46856: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
      Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
         31046: THOR-206 IMplemented sharing of workflows across tenants for Activiti.
      46896: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
         36063: Fix ActivitiMultitenantWorkflow test for cloud1
      46897: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
         37559: Fix build test failure.
      47181: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
      Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
         35994: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
              34517: Prevent 304 revalidations for unchanged thumbnails in document library, web preview and search
              34607: Ensure folders created containing "#" don't send document library into infinite loop.
              34615: Performance improvement: prevent unecessary 304 revalidation for user avatar thumbnails in header WebScript
              34638: Performance improvement: prevent unnecessary 304 revalidation for avatars in activity feeds
              34639: Performance improvement: prevent unnecessary 304 revalidation for avatars on following/follwers pages
              34658: Performance improvement: prevent unnecessary 304 revalidation for avatars on site colleagues dashlet
              34661: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS
                   34636: Fix for ALF-13365 SOLR: Recently modified docs dashlet sorts incorrectly
                          - respect short property names on sort requests @cm:created and not require the full @{uri...}created
              34662: Refactored revalidation code to remove previously added WebScripts that are now surplus to requirements
              34668: Fix build break
              34680: Fixed bean config problem (caused by r34662)
              34684: Performance improvement: prevent unnecessary 304 revalidation requests for thumbnails in detailed view of My-Documents and Recently Modified Documents dashlets
              34701: Further refactoring of 304 revalidation code to ensure backwards compatibility
              34723: Fix build break
         36003: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
              34895: Resolve THOR-1251: Text for Site URL field on Create Site Form Wrong
              34897: Resolve THOR-1250: Text on Accept Invite Page Wrong
              35036: Changed Upload REST API to no longer immediately request thumbnail for an uploaded document. Performance improvement as requested. (re ALF-1015)
              35142: Merged BRANCHES/V4.0 to BRANCHES/DEV/THOR1_SPRINTS:
                   35013: ALF-13561: Not found error after uploading new version (THOR-1304)
              35320: Fix to issue where 'Avatar' alt text was shown rather than user avatar in the Site Members (colleagues) dashlet.
              35546: Improve upload.post.js to use the "filename" argument if it is passed to set the name of the file on upload.
         36019: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
         36020: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
         36021: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
         36022: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
         36023: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
         36024: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
         36025: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
              34819: THOR-1255 - Define a GhostScript powered transformer for generating PNGs from PDF files, then override the regular PDF to Image transformer definitions from content-services-context.xml with ones that call GhostScript instead of the com.sun in-JVM one
         36026: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
         36027: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
         36028: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
         36029: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
         36030: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
              34921: THOR-1176: GoSquared analytics script
              34922: THOR-1176: Removed accidentally committed file
              34923: Merged BRANCHES/V4.0 to BRANCHES/DEV/THOR1_SPRINTS
                   34914: Merged DEV to V4.0 
                      34889: ALF-12678: Errors in log on startup (ts.alfresco.com 4.0)
                             BasicHttpAuthenticatorFactory.BasicHttpAuthenticator.authenticate(RequiredAuthentication, boolean) handles AuthenticationExceptions from authenticateAsGuest() calls. The result is a 401 Unauthorized response.
                   34920: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V4.0
                            34892: Fix for ALF-12930
                            34917: Fix for ALF-12930 - pushed down to 3.4.X
                          Also related tweak for ALF-10823 to EditionInterceptor now that the repository returns 401 for guest auth unsupported.
         36032: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
         36033: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
         36034: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
              35071: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS:
                   31745: ALF-11268 adding logging.properties and suppressing activiti-logging (which is not log4j but plain JUL)
                   32336: ALF-11607: "DB2/LINUXX8664" now recognized as DB2 database-type in activiti
                   32944: ALF-12066 issue with the db2 create-script for activiti
                   (note: pre-reqs for cleaner merge of r34747)
         36035: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
              35072: THOR-1245: initial fix for doclib test case
         36036: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
         36037: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
         36038: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
              35211: THOR-1182 "MOBREG-07: A page exists confirming the users registration and invites them to enter the password they registered with"
              35294: THOR-1309 - F405: Account Types aligned to sales and marketing requirements
              35311: Merged BRANCHES/DEV/THOR1_MOBREG to BRANCHES/DEV/THOR1_SPRINTS:
                   34958: Fix for THOR-1185 and change password hashing to use SHA-2
                   35026: THOR-1185: "MOBREG-16: New sample ACP for users home site is loaded"
                        - hook into documentLibrary node creation to do the sample acp import
                   35302: THOR-1185: "MOBREG-16: New sample ACP for users home site is loaded"
                        - use SHA for password hashing
                        - ensure that sample content is added only to home sites
                   35309: THOR-1185 "MOBREG-16: New sample ACP for users home site is loaded"
                       - minor update to sample content acp
                   35310: THOR-1185: "MOBREG-16: New sample ACP for users home site is loaded"
                        - removed un-needed properties from repository.properties
              35326: Merged BRANCHES/DEV/THOR1_MOBREG to BRANCHES/DEV/THOR1_SPRINTS:
                   35324: Fix build
              35327: Fix build
              35337: THOR-1309 - F405: Account Types aligned to sales and marketing requirements
              35533: THOR-1309: F405: Account Types aligned to sales and marketing requirements:
              35672: THOR-1313 - F410: List accounts filtered by account type
              35673: Minor: Update account type ids (as used by tests) to be consistent with the latest config (as per THOR-1309)
              35695: THOR-1313 - F410: List accounts filtered by account type
              35704: Fix Get Account Types REST API (to also include network admin quota) - related to THOR-1309 / THOR-335
              35770: Minor: add additional logging only (THOR-1323)
      47183: Fix merge issue
      47205: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts (note: AD mentioned content transform priority bits will change again when merging to HEAD)
         36617: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              36564: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                   35780: THOR-1312 - F409: List accounts optionally sorted by (numeric) account type id (ascending or descending)
                   35807: THOR-1335 - support bulk email address domain validation
                   35903: THOR-1312 / THOR-1313 -List accounts optionally filtered or sorted
                   35904: THOR-1310 / THOR-1311 - List accounts optionally sorted by total user account or total file size (or account type, as previously)
              35945: Merged BRANCHES/DEV/mward/thor_transforms to BRANCHES/DEV/THOR1_SPRINTS:
                   35819: Added transformation server changes.
                   35820: Fixed compilation error, though a size of -1 for getActiveTransformers(...) is not likely to be valid.
                   35823: Transformations: changed default transformation server URL to be blank.
                   35897: Remote transformations server: fixed webscript bean id so that it responds to requests correctly.
                   35898: Remote transformations server: fixed JSON generation/parsing.
                   35910: Remote transforms server: fixed broken RemoteAlfrescoTransformerTest
                   35920: Remote transformation server: fixed broken test.
                   35937: Remote transformation server: integrated HTTPS support via HttpClientFactory.
                   35939: Remote transformations: added a boolean client-enabling property.
                   35941: Remote transformations: changed ProxyContentTransformer to delegate isExplicit() calls to worker.
              36011: Merged BRANCHES/DEV/THOR1_QUICK_SHARE to BRANCHES/DEV/THOR1_SPRINTS:
                   34685: Creating Quick Share branch
                   34826: First cut of THOR-1270 "F387: As the link receiver, I can view the Document Preview in the browser without having to login"
                   34868: More on THOR-1270 "F387: As the link receiver, I can view the Document Preview in the browser without having to login"
                   34901: QuickShare REST API - WIP ... note: API will change :-)
                   34933: QuickShare REST API - WIP 
                   34934: QuickShare REST API - WIP 
                   34941: QuickShare REST API - WIP ... note: API will change :-)
                   34989: QuickShare REST API - WIP 
                   34995: QuickShare REST API - WIP
                   34996: QuickShare REST API - WIP
                   35011: QuickShare/PublicView REST API
                   35025: F387: As the link receiver, I can view the Document Preview in the browser without having to login
                   35035: QuickShare/PublicView REST API
                   35052: QuickShare/PublicView REST API
                   35069: More on THOR-1270 "F387 As the link receiver, I can view the Document Preview in the browser without having to login"
                   35094: Removed cpnfig property that was commited by mistake
                   35111: First cut of THOR-1268 "F378: As a user I can choose to share a document"
                   35252: THOR-1271 "F388: From the view page, I can easily sign up or login for Alfresco. Sign Up is embedded in the page and Login will redirect you to the Alfresco Login page" partial commit
                   35254: First cut of THOR-1268 "F378: As a user I can choose to share a document" part 2
                   35255: THOR-1270	"F387: As the link receiver, I can view the Document Preview in the browser without having to login"
                   35264: QuickShare/PublicView REST API
                   35317: THOR-1322: New metadata doesn't return "webpreview" in thumbnails (part 1)
                   35319: QuickShare REST API - fix tenant ref when share'ing
                   35330: QuickShare REST API - fix THOR-1322: New metadata doesn't return "webpreview" in thumbnails (part 2)
                   35368: QuickShare REST API - THOR-1336: (F418) Get context (nodeRef, siteId, tenantDomain) for a shared_id
                   35376: QuickShare REST API - fix THOR-1273 (unshare document)
                   35424: THOR-1271 "F388: From the view page, I can easily sign up or login for Alfresco. Sign Up is embedded in the page and Login will redirect you to the Alfresco Login page" partial commit
                   35425: THOR-1271 "F388: From the view page, I can easily sign up or login for Alfresco. Sign Up is embedded in the page and Login will redirect you to the Alfresco Login page" partial commit
                   35566: Fixed THOR-1268 "F378: As a user I can choose to share a document"
                   35617: THOR-1350: Update Slingshot API (doclib2) - make the "qshare:sharedBy" return full details (instead of just userName)
                   35624: THOR-1339: QuickShare REST API
                   35682: Fixed THOR-1268, THOR-1339 & THOR-1269   
                   35935: QuickShare REST API - add "system.quickshare.enabled" prop (if set to false then disables QuickShare service/API)
                   35996: Fixed THOR-1369 & THOR-1270  
                   35997: Fixed THOR-1369 & THOR-1270 part 2  
                   36000: Fixed THOR-1369 & THOR-1270 part 3   
              36082: THOR-1270 "F387: As the link receiver, I can view the Document Preview in the browser without having to login"
                   - Re-added "Document Details" link public share page
              36128: Merged THOR1_SITE_INVITE_THOR-809 to THOR1_SPRINTS
                   THOR-809 "Site Invites Usability - Finish as per original design"
                   - First cut of: #4. Need to be able to cut and paste a long list of emails into the box and have them turned into emails. List can be space, new line or comma separated.
                   THOR-809 "Site Invites Usability - Finish as per original design"
                   - Second cut of #4. Need to be able to cut and paste a long list of emails into the box and have them turned into emails. List can be space, new line or comma separated.
                      * Tooltip is now a common one for all emails rather than individual since that caused issues when being scrolled inside div element. This approach is also less intrusive
                   THOR-809 "Site Invites Usability - Finish as per original design"
                   - Third cut of #4. Need to be able to cut and paste a long list of emails into the box and have them turned into emails. List can be space, new line or comma separated.
                      * Scroll bar is only visible when needed
                      * Now works in IE7
              36153: THOR-694: File size upload limit is not adhered to by Alfresco repository
              36186: Merged BRANCHES/V4.0 to BRANCHES/DEV/THOR1_SPRINTS:
                   32842: ALF-11947: Contributor/consumer can't like/unlike or comment document/folder if versionable aspect applied
                   32850: ALF-11947: Contributor/consumer can't like/unlike or comment document/folder if versionable aspect applied
                   (THOR-1208, THOR-1210)
              36188: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS:
                   34193: ALF-12205 - Contributor can't comment document/folder if versinable aspect is applied
                   (THOR-1209, THOR-1302, THOR-1387)
              36237: THOR-28: Account Service - Get Account Method API
              36252: THOR-28: Account Service - Get Account Method API
         36624: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              36565: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                   36289: THOR-1314: Changed e-mail action in upgrade button to link
                   36290: MT fix for SiteService
                   36291: THOR-538 / THOR-1168 - auto remove external user from a secondary network when they no longer belong to any sites ...
                   36292: THOR-900: Modified URL rewrite filters to enforce encoding of "@" symbols sin URL so that the invalid session timeout error doesn't occur
         36631: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              36570: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                   36308: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS:
                        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
                   36313: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS:
                        33730: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX:
                             33726: ALF-7264 Upgrade Commons Validator to 1.4.0 Final, fixing VALIDATOR-292. Then, update the EmailValidator flags to allow local addresses during validation, so that Alfresco can send emails to @localhost addresses without error
                        33779: Upgrade Tika for ALF-12714
                        33782: ALF-12714 Add 3GPP/3GPP2 video, and MP4 Audio mimetypes
                        33783: Update Tika for more MP4/QuickTime support, and enable MP4 audio metadata extraction + "quick" testing
                        34884: Merged HEAD to BRANCHES/DEV/V4.0-BUG-FIX:
                             34883: Tika and POI upgrade for ALF-13106
                   36340: AttributeService improvement: update puc value + cache (based on keys rather than id)
                   36341: Tenant usage quotas improvement
                   36412: THOR-1403: added connection timeout property to HttpClientFactory.
                   36413: THOR-1403: added 3s connection timeout to transformer client configuration.
                   36425: Tenant usage quotas improvement
                   36428: Merged THOR1_SITE_INVITE_THOR-809 to THOR1_SPRINTS
                        THOR-809 "Site Invites Usability - Finish as per original design"
                           - Added semicolon as email separator
                           - Fixed seecltion bug for SF, text now selected on first click and deselected on 2nd click (tested IE, SF & Chrome)
                   36431: Resolve THOR-1406: Emails with apostrophes aren't accepted
                   36455: Resolve THOR-1146: qamy.alfresco.com: incorrect URL for the RSS items
                   36456: Resolve THOR-1061 Incorrect text for the 'Task History' link
                   36457: Resolve THOR-1345: Missing apostrophe on mobile / cloud sign-up web page
                   36459: Merged BRANCHES/DEV/mward/thor_transforms to BRANCHES/DEV/THOR1_SPRINTS:
                        36458: THOR-1411: New Alfresco remote transformation subsystem is DEBUG logging by default
                   36460: Resolve THOR-1294: Terms and Conditions Link in Sign up screen does not work
                   36464: Resolve THOR-1238: Missing message string: error.header.wrong-reset-user
                   36472: Merged DEV/THOR1_QUICK_SHARE to DEV/THOR1_SPRINTS
                        Improvements for THOR-1270 "F387: As the link receiver, I can view the Document Preview in the browser without having to login"
                        - Added new component evaluator for bringing in different components based on page id
                        - The title of the quickshare page now contains the document's name (to improve the social "Share with:" experience)
                        - Added new icon for page not found screen
                   36477: AttributeService improvement: fix test/build (PropertyValueDAOTest.testPropertyUniqueContextValue)
                   36482: Resolve THOR-1416: Remove Polymorph Client
                   36484: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS:
                        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
                        36264: ALF-13933 Alfresco needs to be able to support LibreOffice for transformations
                             - remove old jodconverter-core-3.0-beta-3.diff
                        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.
                   36485: Resolve THOR-1418: Switch off S3 encryption by default
                   36508: THOR-1200 (CORE CHANGE): Modification to forms-runtime to prevent field undefined errors
                   36509: THOR-1200 (MODULE CHANGE): Re-introduce folder rules
                   36517: THOR-1353: Ensure IE8 users can create tasks
                   36521: Resolve THOR-1348: Account Settings screen should display Account Type
                   36530: Fix solrcore.properties
                   36540: THOR-1200: Force folder rules to run asynchronously
         36634: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              36633: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                   36601: Merge from THOR1_QUICK_SHARE to THOR1_SPRINTS
                        36599: Improvements for THOR-1270 "F387: As the link receiver, I can view the Document Preview in the browser without having to login"
                           - Made the "Preparing previewer... text get rendered using javascript so Google+ won't
                             include it in its description when sharing quickshare links
      47278: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
      Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
         37509: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
              37167: Merged HEAD to BRANCHES/DEV/THOR1_SPRINTS:
                   37157: THOR-1459: WebDAV: site names cannot start with 'webdav'
              37302: THOR-1403: ensure indexing happens asynchronously on upload.
              37303: THOR-1403: removed thumbnail creation during file upload.
              37459: THOR-1429: Webdav returns 500 when you don't have access to moderated site 
              37469: THOR-1475: Fixed avatar thumbnails for users joining/leaving/role change on sites.
              37506: Resolve THOR-1481: Cannot preview PDFs over 3.5MB in size
      47279: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
         39341: Resolve CLOUD-181: Webdav Cluster Failiure in Cloud1 build 148 startup error: java.lang.ArrayIndexOutOfBoundsException: 72
      47281: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
         39314: Resolve CLOUD-203: WebDAV incorrectly handles file / directory names with spaces in them
         (also fix compile error introduced from earlier merges - partial changes sourced from CLOUD2)
      47359: Fix merge/test error (WebDAVMethodTest.canGetStatusForAccessDeniedException)
      47384: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
      Merged DEV/CLOUD_SIGN_UP into DEV/CLOUD1 (cloud priority 
      47389: 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
      47431: 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
      47516: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
      r44571 | dcaruana | 2012-12-10 17:55:00 +0000 (Mon, 10 Dec 2012) | 1125 lines
      Merged BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN to BRANCHES/DEV/CLOUD1:
         44527: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
              38425: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   33822: Merged BRANCHES/DEV/V4.0-BUG-FIX to HEAD:
                        33813: ALF-12736: Stack specific: 'Getting updates failed' notification appears when non-admin user creats DWS
                        33821: ALF-12212 - SPP/Vti requires that all links include a protocol and are valid, while share does not. When building the Vti response, prefix URLs with http:// if they lack a protocol at the start, and ignore any that are malformed
              38431: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   33893: SharePoint refactoring - first part of removing the old Alfresco v2 code
              38432: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   33905: SharePoint Refactoring - Move to only a single class for the VersionServiceHandler
              38433: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   33906: SharePoint Refactoring - Move to only a single class for the User and Groups Handler
              38434: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   33907: SharePoint refactoring - fix deprecation warnings by switching to the new way of finding people, when searching for a user with a given email address
              38435: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   33923: SharePoint refactoring - Start on merging the old style and new style List support, mark the old style as deprecated, and add TODOs where needed for future changes
              38440: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   35486: ALF-13028: Sharepoint broken by changes to WebDAV
              38442: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   35530: ALF-13028, ALF-13696: broken sharepoint module
              38443: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   36148: Merged BRANCHES/DEV/BELARUS/HEAD-2012_04_25 to HEAD:
                        35710: ALF-13028 : Sharepoint broken by changes to WebDAV
              38444: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   37648: Sharepoint: fixed typo in class name VtiDocumentHepler
              38447: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   37929: First try at incremental-spp-tomcat-exploded target
              38451: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   37943: Sharepoint: fix build for compile-spp dependency and for new incremental-spp-tomcat-exploded target.
              38453: Sharepoint: remove error causing property injection - probably came from a double-merge.
              38472: Sharepoint: fix missing singletonCache property for VtiPathHelper bean, probably lost in merges.
              38477: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   37926: Correct handling of GetMeetingsInfo - lcid may not always be set
              38478: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   37927: More parameters that are optional
              38481: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   37928: More parameters that are optional
              38483: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   37931: A site may not have a calendar container yet
              38485: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   37933: Set the response type to text/xml as required
              38486: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   37938: Stub out support for UpdateMeeting and SetWorkspaceTitle
              38487: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   37939: Fix title vs name confusion in meeting sites, support setWorkspaceTitle, and correct the error reporting on create site
              38488: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   37940: SPP Vti SOAP error codes must be zero padded to 8 characters
              38489: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   37941: Improve error handling in create/set title/delete, and match the required error codes
              38491: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   38005: Correct logic to fix test
              38493: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   38006: DTEND is optional in iCal, if not set it means the meeting ends at the start time
              38494: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   38007: Pull out commong workspace related code to a parent endpoint class
              38496: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   38009: Sharepoint [MS-VERSS]: GetVersions should state whether file has versioning enabled.
              38498: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   38011: More refactoring to use the new commong workspace parent endpoint
              38501: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   38012: Start to clean up how exceptions are done in the meeting handler layer
                   38013: Start to refactor the common parts of meetings to a parent abstract class, and stub out the SetAttendeeResponse endpoint
                   38014: Fix import warnings
                   38015: More towards Add/Update/Restore meeting
                   38016: Common building of the MeetingBean
                   38017: Improve error reporting on add/update meeting, to match the spec requirements
                   38018: Sharepoint [MS-DWSS]: CanCreateDwsUrl returns GUID if requested name is empty string.
                   38019: ALF-14687 - ISO8601 dates from non-Alfresco sources may have more than 3 millisecond digits
                   38020: Stub out the SetAttendeeResponse endpoint, but the handler does nothing with the details
                   38021: More meeting exception improvements
              38503: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   38077: Refactor the Meeting related endpoints to use common superclasses, and fix some common problems / exception handling in the process
                   38078: Further error handling checks
              38504: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   38080: Match the rather strange behaviour of getMeetingsWorkspaces and the recurring flag, as set down in the spec
              38505: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   38088: Sharepoint [MS-DWSS]: partial fix to XML fault message generation.
                   38089: Sharepoint [MS-DWSS]: fuerther partial fix to error message generation for CreateDws.
              38506: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   38091: Sharepoint [MS-DWSS]: S1_TC08: returning error with AlreadyExists but should be ServerFailure.
              38507: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   38093: Support filtering by boolean properties, as well as String ones, in GetChildrenCannedQuery
                   38094: Support for listing calendar entries by their outlook status (isOutlook / OutlookUID), via a Canned Query
                   38095: De-Lucene the SharePoint / Vti Meeting Service handler, using the new CalendarService list method
                   38096: Sharepoint [MS-DWSS]: S1_TC09 and others, hyphens in GUID were being translated to underscores.
                   38097: Vti/SPP support for restoring a deleted meeting (assuming it is still available in the archive store)
              38508: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   38099: Make the error message a bit more helpful, in the case that the assoc qname is too long
                   38100: Check for errors from the create site share call
                   38101: Validate that the site Short Name isn't too long during creation, and throw a helpful exception if it is. (Site Short Names get used in Authority Names, which are limited by the DB model to 100 characters)
                   38102: Update the site name max length check - need to account for the role group names too
                   38103: There is a maximum size of a site short name, based on the limits of the authority names in the permissions service, so truncate the Vti/SPP site name before creation to fit within that
                   38104: Specific error response needed for GetMeetingsInformation on a subsite
              38509: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   38134: Sharepoint [MS-VERSS]: S1_TC05 removed manual entity encoding of quotes, as dom4j was then escaping the ampersands.
              38510: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   38139: Sharepoint [MS-DWSS]: fixed error message generation for CreateFolder.
                   38140: Sharepoint [MS-DWSS]: Result element should be standalone XML.
                   38141: Start removing deprecated, old style lists in favour of the full list support
              38511: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   38143: Improve handling of abstract lists, and convert more classes to use that method
                   38144: More convertions to AbstractListEndpoint, and improve logging by centralising it better
              38512: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   38146: Prepare to do more of the List details not via hard coded FTL
                   38147: Convert to only having the fields hard coded in the ftl, and the rest dynamically generated
                   38148: Remove deprecated old style ListBean (now all replaced with ListInfoBean), and tidy up around the removal
              38514: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   38156: Start on processing the request for UpdateListItems, and support GetList by UID as well as Name
                   38157: Sharepoint [MS-WEBSS]: fixed GetWeb to respond with the "context site" if "." or "" requested in SOAP body.
              38515: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   38229: Improve the list definition model, and add more support for UpdateListItems
              38516: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   38231: Refactor the current (rather hard coded) GetListItems support into an abstract class, and then use that to stub out the other two GetListItems* endpoints
                   38232: Sharepoint [MS-WDVMODUU]: implemented WebDAV PUT method.
                   38233: Stub out Change Since support
              38517: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   38237: Improve error handling, and reduce some duplication
                   38238: More details needed
                   38239: Use the same rendering of a list details
              38518: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   38381: ALF-14835: Sharepoint/WebDAV: exclusive lock fails deemed to be owned by someone else.
                   38382: Sharepoint [MS-WDVMODUU]: activity posting disabled upon DELETE.
              38785: Merged alfresco/HEAD to alfresco/BRANCHES/DEV/CLOUD1_SP:
                   38752: WebDAV/Sharepoint: extracted WebDAVHelper to spring configuration.
         44543: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
              38996: WebDAV: added getUrlPathPrefix tests for WebDAVHelper.
              38997: WebDAV: added setter for urlPathPrefix property (to aid in spring config), ensures path prefix terminated in slash.
              39001: WebDAV: getURLForPath(...) appends trailing slash to path prefix if missing.
              39002: WebDAV: removed redundant createDAVHelper() method.
              39016: WebDAV: added getRepositoryPath(request) method (replaces WebDAV's static method)
              39017: WebDAV: replaced use of static WebDAV.getRepositoryPath(req) with non-static version in WebDAVHelper.
              39019: Cloud/SPP: thor module must have dependency on SPP module.
              39020: Cloud WebDAV: CloudWebDAVServlet no longer uses static getRepositoryPath(req) method.
              39021: Cloud WebDAV: override getRepositoryPath(req) with version that gets path within tenant.
              39023: SPP core: added hook to VtiWebDavAction to allow overriding of execution behaviour.
              39025: SPP: minor logging improvement.
              39026: SPP: define SPP version of WebDAV helper and inject into VtiWebDavAction instances.
              39060: Cloud SPP: introduced cloud/spp webdav helper.
              39061: Cloud SPP: missing part of commit, moved methods out of CloudWebDAVHelper and into SPPCloudWebDAVHelper.
              39095: Cloud WebDAV: move doclib URL munging out of core WebDAV.
              39182: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   39167: WebDAV: remove static replace(str, repl, with) method.
              39185: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   39172: WebDAV: removed static WebDAV.getRepositoryPath() method. Only use the non-static version.
              39186: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   39173: WebDAV: fix broken code from moving inlining of getRepositoryPath(...) from WebDAV to WebDAVHelper.
              39187: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   39174: WebDAV: removed redundant DIR_SEPARATOR constant.
              39189: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   39178: WebDAV/SPP: remove static WebDAV.getURLForPath(...) methods.
              39323: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   39203: WebDAV: fix broken UnlockMethodTest.
              39324: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   39204: WebDAV: fix broken WebDAVMethodTest.
              39325: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   39309: Sharepoint: no longer uses sysAdminParams to determine incoming URL path prefix.
              39330: Sharepoint: fix code broken by merge -c 39325 (from HEAD).
              39346: Cloud/sharepoint: fix for merge from HEAD, -c 39309 (remove sysAdminParams as supplier of URL path prefix)
              39365: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   39364: Sharepoint: making PROPFIND more tolerant of null values in a node's properties.
              39474: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   39473: WebDAV: introduce getChildren() method for helper.
         44544: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
              39541: Sharepoint: added test for decomposeDocumentURL functionality.
              39552: Sharepoint: added doDecomposeURLWork test for incorrect URI path prefix.
              39570: Sharepoint: refactoring for cloud overrides and testing improvements.
              39674: SPP core: use VtiPathHelper.getPathForURL() instead of using request directly.
              39676: SPP core: refactored action execution to provide hook for subclasses.
              39695: SPP: null GUID no longer results in an empty rid{}
              39696: SPP core: VtiWebDavAction - setting the method's details is delegated to the DAV executor.
              39698: SPP core: added hook for detecting whether a URI path does not specify a site.
              39701: SPP core: abstract parent for vtiRequestDispatcher makes it possible to override bean and inherit configuration.
              39702: SPP core: move support methods from test class into abstract base class.
              39705: SPP cloud: added cloud specific filter and path helpers.
              39707: SPP cloud: remove redundant code from CloudwebDavExecutorImpl
              39708: SPP cloud: introduce request handling logic in common for WebDAV and SPP.
              39709: Cloud SPP/webdav: WebDAV uses common request handling class.
              39710: SPP cloud: SPPCloudWebDAVHelper was incorrectly stripping off tenant domain for getRepositoryPath().
              39712: SPP cloud: introduce a cloud-specific VtiRequestDispatcher.
              39723: SPP core: servlet filter now registered for forwards as well as fresh requests.
              39724: SPP core: removed URL decoding of URL in XML response generation.
              39759: SPP core: use separate servlet mappings for /alfresco/* and /*
              39865: Cloud SPP: cleaned up runAsTenant usage.
              39868: SPP cloud: missing files from previous commit ("cleaned up runAsTenant usage")
              39916: CLOUD-28: cloud SPP raises activity posts for PUT, DELETE.
              39930: Cloud SPP: tenant domain is extract from RPC method request with "url" parameter, instead of through request URL path.
              39941: Cloud SPP: reintroduced separate instances of CommonRequestHandling that was lost by moving instantiation into spring.
              39971: CLOUD-137: 4.4 Add Mixpanel Analytics events to SharePoint Protocol
              39972: CLOUD-137: 4.4 Added an "spp" event source.
         44545: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
              40006: Bamboo/CI: added dependency on spp module when building cloud.
              40007: WebDAV - cloud only: added missing WebDAVHelper constructor argument to spring definition.
              40015: Cloud SPP: bake SPP module into WAR file at build time.
              40027: Cloud SPP: Committing binaries that can be used by ops for testing/prototyping.
              40365: WebDAV/SPP: moved webDAVLockService bean definition into webdav-context.xml
              40366: WebDAV/SPP: moved webDAVLockService to remote-api-context.xml
              40368: SPP: removed circular task dependency.
              40373: Cloud SPP: added incremental-spp-tomcat-exploded as dependency of incremental-cloud-repo-exploded
              40376: Test to see if this fixes build failures, by adding SPP classes/config to unit testing classpath.
              40380: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   38861: WebDAV: fixed dependency problem; fixes test RepositoryStartStopTest.
              40384: Cloud SPP: ensure jetty libs on classpath during test.
              40392: Cloud SPP: remote-api-context.xml must be loaded before cloud and SPP modules.
              40400: Cloud SPP: fix classpath to use fileset instead of pathelement.
              40444: SPP build problems: attempt to ensure thor config comes after SPP config in unit testing classpath
              40447: Cloud SPP: ensure SPP module is loaded prior to cloud module.
              40450: SPP Cloud: backing out change 40444 (CI build changes)
              40451: SPP Cloud: another attempt to straighten out testing classpath problems.
              40456: Temporarily disabling explicit SPP module import.
              40483: Cloud SPP: fixed broken test and clarified behaviour in comments.
              40519: Cloud SPP: remove exclusion of module.properties when copying resources during deploy-spp-tomcat-exploded ant target.
              40523: CLOUD-25: 3.1 The protocol must be secured using the user's standard Cloud credentials
         44546: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
              40551: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                   38401: Fix activities feed mail notifications.
                   38614: Resolve CLOUD-157: Cloud1 does not deploy due to addDutchEmailTemplates patch failing
                   38676: Exclude irrelevant tests even if minimal.testing? flag is not set
                   38726: Resolve CLOUD-160: "Data too long for column 'report' at row 1" when deploying Cloud1-144 to Test
                   38734: Fix CLOUD1 build to ensure test results from previous builds are cleaned
                   38754: Fix test
                   38765: Merged BRANCHES/V4.0 to BRANCHES/DEV/CLOUD1:
                        37766: Fix for ALF-14529 Share Solr admin console page shows "Unavailable: 05120041...
                        37800: ALF-14145 Flash preview quality is poor
                             - Reverting change r30483 V3.4-BUG-FIX Sept 13 2011 for ALF-9417
                                   swf.encoder.params=-s zoom=72 -s ppmsubpixels=1 -s poly2bitmap=1 -s bitmapfonts=1
                               being changed back to:
                                   swf.encoder.params=-s poly2bitmap,subpixels=72
                               The original 001-Cover_Cover.pdf file from ALF-9417 does now preview in 4.0.2
                   39058: CLOUD-190: Ensure that sub-folders of folders named "res" and "proxy" can accessed.
                   39206: Fixed CLOUD-198 "WASA - XSS issue with quickshare"
                   39210: Cloud1 build fix
                   39236: Fixed and baked in Share Hazelcast Cloud specific configuration into thor-share module. Now only need to override hz:hazelcast bean with AWS key specifics for test/production.
                   39314: Resolve CLOUD-203: WebDAV incorrectly handles file / directory names with spaces in them
                   39341: Resolve CLOUD-181: Webdav Cluster Failiure in Cloud1 build 148 startup error: java.lang.ArrayIndexOutOfBoundsException: 72
                   39357: CLOUD-164: Remove categories from document library
                   39358: Resolve CLOUD-186 500 error displayed when trying to add 'Content I'm editing' dashlet
                   39388: Resolve CLOUD-185: My / Site Activities displayed incorrectly
                   39391: Resolve CLOUD-161 Patching is taking too long - specifically patch.fixBpmPackages
                   39499: Resolve CLOUD-395 TEST server startup log - upgrading to cloud1
                   39500: Resolve CLOUD-187 java.lang.IllegalArgumentException: Must provide existing lockToken
                   39554: BDE-90: Setup build for deployment of Cloud artifacts to Maven repository
                   39559: Merged THOR1 to CLOUD1
                        38529: CLOUD-399 / ALF-14887: User sign-up issue
                           - Workflow prior to mobile registration did not have the isPreRegistered property. Changed it so that if the property does not exist, it defaults to false.
                           - Logged warning with email address in log for easier location of error.
                        39553: CLOUD-400 / ALF-15149: Prevent an infinite loop in AlfrescoSolrEventListener.RemoveNullEntriesCacheMatch.updateCache()
                   39563: Merge BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to DEV/CLOUD1 (r38673-39562)
                   39567: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                        39566: Allow the sync mode to be fetched by guest (it need not be hidden), then fetch from Share as guest, to avoid problems when fetching the sync mode if the current user's credentials have expired (otherwise it breaks the redirect back to the login)
                   39568: Fix YUI options to match the version in use (-p is no longer supported)
                   39569: Cloud is always build on top of enterprise, so remove the duplicated projects.xml taken from enterprise and use the enterprise projects.xml instead. (Fixes warnings during build)
                   39575: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                        39574: Cloud lacks a guest mode, so switch to unauthenticated for the sync mode fetch (user credentials may not be available)
                   39579: Undoing some CloudSync-specific restrictions on what test cases are run.
                   39584: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                        39580: CloudSync: fix Unsync - to ensure we don't leave sync aspects (such as failed, which reappears if src file is re-synced)
                   39586: Merged V4.1 to CLOUD1 (might fix the build)
                        39207: ALF-15015 follow-up: make sure the first enterprise test that runs has no specific license, since we just reset the database
                   39588: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                        39587: ALF-15222: Cloud Folder picker: Newly created folder isn't selected
                   39596: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                        39589: ALF-15098: Folder Picker causes JS error in the document details page
                        39561: Mark from Thor1 to V4.1 to Cloud1
                   39602: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                        39076: ALF-15013 ALF-15015: Reset database before running enterprise tests, otherwise SecurityTestSuite leaves it in a bad state
                   39608: Removed incorrect com.sun import
                   39610: Merged HEAD to BRANCHES/DEV/CLOUD1
                        38834: Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD
                           38607: Fix for ALF-14934 - Components YUI menus hit area is small. iPad specific CSS fix.
                           38631: ALF-14820 - Document Library - Upload actions and File Browse buttons (doclib, user profile image, upload vers   ion etc) - not appropriate for iOS.
                           38632: ALF-14934 - increased hit area for filter and tree/category nodes for ios.
                           38667: Repository toolbar changes for ALF-14820
                           38668: Patched YUI menus to support additional touch events (touchend specifically) and as custom menu events to fix   ALF-14809.
                           38738: Correct fix for ALF-13650:
                                  Double byte code white spaces in front and at the end of a file name should be removed as the same behavior of    Single byte code white space. Altered Alfresco.util.trim() in order to support double byte code white spaces.
                                   - did not handle null/defined which are returned when creating content in Wiki, Blog and Discussions.
                           38745: ALF-14807 - Fixes related to long file name display margins for iPad on Document Details page.
                           38790: ALF-14927: Ensure that RSS feed URLs are maintained in RSS dashlet when the URL contains request parameters
                           38792: ALF-13297 - removed install WebScript webscripts (updated Surf libs - r1094)
                           38831: Fix for ALF-14992 - Share: display list of rules for a folder: unterminated string literal
                                  - actually a wider spread issue of failing to handle multiple line field values (e.g. "description" fields) wh   en rendering json into a component page or template
                        39067: Fixed drag n drop issues for m.share on ipad
                               - Added ootb support for touch events to drag n drop classes in yui-patch.js
                               - ALF-14816 Dashboard - Cannot customize dashboard layout
                               - ALF-14817 Customize Site - Can't add or change the order of page components
                               - ALF-14822 Rules - Cannot reorder rules when multiple rules are defined on a folder
                               - This also means all "dividers" on the documentlibrary, discussions etc pages now work
                   39614: Reinstate repository tests (so far, only RepositoryStartupTest is run)
                   39615: BDE-90: do not try to deploy to Maven repo artifacts which are not built
                   39642: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                        39597: CloudSync: tweak a couple of unit tests
                        39598: CloudSync: ALF-14655 - update simple file sync (to test multiple sync'd files)
                        39606: CloudSync: minor log level adjustments
                        39607: CloudSync: ALF-14483 - SyncTracker - enable sync sets to be pushed in parallel
                        39613: Refactor of test code. SyncTrackerComponentTest now uses JUnit Rules to manage temporary content and to undo mocking out of services.
                        39616: CloudSync: CloudSync: ALF-14483 - SyncTracker - multiple syncs (to different tgt folders) with multiple files
                        39633: CloudSync: ALF-14483 - SyncTracker - enable sync sets to be processed in parallel
                        39639: ALF-15238: Bitrock Installer: Readme.txt should be updated - Alfresco version is 4.0
                        39640: ALF-15231 Restore, with refactorings / making more general, the ability to lazy create the remote credentials container if bootstrap has not created it (eg on Cloud)
                        39641: ALF-15230 Refactor the lazy container creation code, to use the new SystemNodeUtils helper
                   39644: ALF-15230/ALF-15231 Disable two patches on cloud, which create new system containers, as the number of tenants means this is a large amount of work. Services will not lazy create if needed, but for on-premise we retain the up-front creation to avoid surprises and allow predictable permissions in advance if required
                   39645: Disabling one test on CLOUD1, pending discussion with Mark, Jan.
                   39661: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1
                        39660: Fix for ALF-14244 - Sort options are not appropriate for some pre-canned Document Library queries and need disabling in the UI as they can confuse the user. Implemented by Valery Shikunets.
                   39666: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                        39665: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                             39664: CloudSync: ALF-14483 - SyncTracker unit tests - simple file sync test
                   39675: Resolve CLOUD-410: Disable multi-threaded SOLR
                   39680: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                        39643: ALF-15220: Indirect sync and sync failed indicators appeared together on nodes during the demo
                        39653: ALF-15041: Cloud Sync doesn't work with IE7
                        39670: Rework to cloud key license stuff - introduces a ValidLicenseEvent
                        39673: New unit test for adding checked out nodes into a sync set.
                        39677: ALF-14903 Move the Sync allowed/not-allowed check, based on Network/Tenant, to AbstractCloudSyncAbstractWebScript, and have this used by the webscripts based on this too. Then, allow UnSync to proceed no matter what the tenant status, and add unit tests
                   39699: ALF-14454: get rid of hrtlib.jar
                   39700: BDE-90: deploy cloud-specific artifacts
                   39731: CLOUD-421: Merged PATCHES/V4.0.2 to CLOUD1
                        39725: ALF-15176: Multi-threaded SOLR tracking suddenly stops leaving transactions unindexed
                           - Debugged on environment provided by Antonio
                           - If the last incomplete batch in a chunk consists entirely of empty transactions (or transactions consisting entirely of nodes updated in later transactions) it would loop forever
                   39738: CloudSync: add default (info) Sync log level
                   39744: Merged HEAD to BRANCHES/DEV/CLOUD1 (for BDE-73):
                        39282: Get context from classpath rather than file system
                        39409: fetch application context from classpath rather than file system
                        39433: tune AVM tests to make them resilient to a change of working folder
                        39743: Allow to override the location of test resources using a system property
                   39745: BDE-73: Add experimental pom.xml files
                   39755: BDE-73: Add experimental pom.xml files
                   39830: Resolve CLOUD-423: Concurrent registration / account activations are not handled gracefully
                   39855: BDE-73 Configure Sonar properly + filter a few failing tests
                   39877: CLOUD-438: Merged V3.4-BUG-FIX to CLOUD1
                        36446: Fix for ALF-13404 - Performance: 'Content I'm Editing' dashlet is slow to render when there is lots of data/sites
                         - Effectively removed all PATH based queries using the pattern /companyhome/sites/*/container//* as they are a non-optimized case
                         - Replaced the "all sites" doclist query using the above pattern with /companyhome/sites//* plus post query resultset processing based on documentLibrary container matching regex
                         - Optimized favorite document query to remove need for a PATH
                         - Optimized Content I'm Editing discussion PATH query to use /*/* instead of /*//*
                         - Fixed issue where Content I'm Editing discussion results would not always show the root topics that a user has edited
                         - Added some addition doclist.get.js query scriptlogger debugging output
                        36449: ALF-13404 - Fix for issue where favoriates for all sites would be shown in each site document library in the My Favorites filter.
                        37190: Merged PATCHES/V3.4.6 to V3.4-BUG-FIX
                           37189: ALF-13404: Performance: 'Content I'm Editing' dashlet is slow to render when there is lots of data/sites
                              - Additional query improvement by Pavel
                        37835: Fix for ALF-14429 - Recently Modified dashlet takes up to 30 seconds to load after upgrade to Alfresco 3.4.6.23
                   39878: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1
                        39775: ALF-15271: "Site Content" dashlet shows all documents from all the sites in Alfresco Share
                   39919: Added additional configurable datasource that is used by activiti IdGenerator to fetch new block of ID's. Can be defined using JNDI-lookup, reverts to default datasource based on well-know alfresco-properties.
                   39925: CLOUD-422: Reverted revision 39919, will be re-comitted after CLOUD1 released
                   39954: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                        39655: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                             39490: Changing the icon for creating a new folder in the cloud
                             39580: CloudSync: fix Unsync - to ensure we don't leave sync aspects (such as failed, which reappears if src file is re-synced)
                             39587: ALF-15222: Cloud Folder picker: Newly created folder isn't selected
                             39589: ALF-15098: Folder Picker causes JS error in the document details page
                             39597: CloudSync: tweak a couple of unit tests
                             39598: CloudSync: ALF-14655 - update simple file sync (to test multiple sync'd files)
                             39606: CloudSync: minor log level adjustments
                             39607: CloudSync: ALF-14483 - SyncTracker - enable sync sets to be pushed in parallel
                             39613: Refactor of test code. SyncTrackerComponentTest now uses JUnit Rules to manage temporary content and to undo mocking out of services.
                             39616: CloudSync: CloudSync: ALF-14483 - SyncTracker - multiple syncs (to different tgt folders) with multiple files
                             39633: CloudSync: ALF-14483 - SyncTracker - enable sync sets to be processed in parallel
                   39955: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                        39656: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                             39640: ALF-15231 Restore, with refactorings / making more general, the ability to lazy create the remote credentials container if bootstrap has not created it (eg on Cloud)
                             39641: ALF-15230 Refactor the lazy container creation code, to use the new SystemNodeUtils helper
                             39643: ALF-15220: Indirect sync and sync failed indicators appeared together on nodes during the demo
                             39653: ALF-15041: Cloud Sync doesn't work with IE7
                   39956: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                        39736: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                             39735: CloudSync: ALF-14483 - multi-threaded SyncTracker
                        39866: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                             39670: Rework to cloud key license stuff - introduces a ValidLicenseEvent
                             39673: New unit test for adding checked out nodes into a sync set.
                             39677: ALF-14903 Move the Sync allowed/not-allowed check, based on Network/Tenant, to AbstractCloudSyncAbstractWebScript, and have this used by the webscripts based on this too. Then, allow UnSync to proceed no matter what the tenant status, and add unit tests
                             39683: ALF-15162 - Unclear error message when delta syncing and the target is gone
                             39686: Replaced GPL license with enterprise licence.
                             39687: Enterprise license for enterprise remote api project
                        39867: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                             39747: ALF-14377	Need to decide what to do when SSD creator user is no longer valid 
                                  - part 1 nodes are marked.
                             39748: CloudSync: fix compile error
                             39767: CloudSync: fix ALF-15145 - Unsync of a folder (sync) that has a working copy file causes indirect icon to remain ...
                             39775: ALF-15271: "Site Content" dashlet shows all documents from all the sites in Alfresco Share
                             39810: ALF-15221: Cloud Sync Status: Failure message when getting location is misleading
                             39812: UI Bug Fixes:
                                  - ALF-15174: Uses already copied slingshot.properties file for message strings needed in both repo and Share
                                  - Cloud delete file message shouldn't refer to the cloud
                             39820: ALF-15267: Edit online is available for locked on-premise copy 
                             39826: ALF-14377 - Need to decide what to do when SSD creator user is no longer valid
                        39870: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                             39847: ALF-15185: YUI Overlay Mozilla Scrollbar fix should be prevented in recent versions of Firefox too.
                             39859: ALF-15249 Add a new method hasSyncSetDefintions, with unit test, and use this to skip the Sync Pull step on-premise if no SSDs have been defined on the local system
                             39860: ALF-14908: Update Sync status dialogue to include the local root folder for indirectly synced nodes.
                        39914: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                             39863: ALF-15268: Cancel button disabled in the target selection window for new folder creation in Cloud
                             39864: ALF-15003 Sync failed for the file (where write access on source removed for sync owner) but no matter this file appears in Cloud
                             39876: ALF-15301: IE8 specific: It is impossible creating a new folder in a cloud target selection window/Cloud location
                             39883: CloudSync: fix ALF-15270 - moving directly synced node (on source) causes target node to be deleted
                             39902: ALF-15041: Cloud Sync doesn't work with IE7
                             39903: ALF-15041: Cloud Sync doesn't work with IE7
                             39904: ALF-15041: Cloud Sync doesn't work with IE7
                        39920: Bug fixing for CSS issues
                   39959: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                        39951: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                             39915: ALF-14908: Update Sync status dialogue to include the local root folder for indirectly synced nodes
                             39924: CSS fixes for the sync panel
                             39942: ALF-14911 - Path shown in the version comments does not match the path shown in the sync status dialogue
                                  - first part share paths are now handled separatly
                             39943: CloudSync: fix remainder of ALF-15130 - sync time for initial sync of working copy (+ unit test)
                        39952: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                             38871: (RECORD ONLY) Adds edition check before calling enterprise only webscript. Sets sync to OFF for non enterprise editions.
                             38956: (RECORD ONLY) Chinese Translation for 4.1
                             39011: (RECORD ONLY) ALF-14225: Refactor Welcome Dashlet to show 4 columns, the 4th one of which is always the cloud sign up text.
                             39024: (RECORD ONLY) ALF-14225: Adds tracking to URL.
                        39958: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                             39957: CloudSync: minor - some info logging (applies to src + tgt)
                   39967: CLOUD-165: Merged 4.1-BUG-FIX to CLOUD1
                        39962: ALF-15158: Downloading Office 97 files with .doc extension result in file with .dot extension when using Google Chrome
                          - Added more complete and intelligent content disposition header with the aim of supporting  RFC 5987
                   39977: CLOUD-454 - merge asynchronous dashlet improvements and remove inappropriate sections.
                   40048: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1
                        40022: Fix for ALF-15144 - Slow Share doclib high-level folder browsing due to version history retrieval (CLOUD-467)
                        40047: Fix from Mike Hatfield for ALF-15372 - Chrome is blocking google map display for geo tagged pictures (CLOUD-468)
                   40078: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                        note: "blending" cloud sync fixes into CLOUD1 (as requested by BR)
                        39997: ALF-14377: Need to decide what to do when SSD creator user is no longer valid
                        40013: "Cloud Sync" link should not be shown in "My Profile" in the Cloud
                        40056: Merged the sync specific changes to the other presentation.css files
                        40070: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC: (record-only: NB - already manually merged)
                              39566: Allow the sync mode to be fetched by guest (it need not be hidden) ...
                              39574: Cloud lacks a guest mode, so switch to unauthenticated for the sync mode fetch (user credentials may not be available)
                        40071: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                             39996: ALF-14377: Need to decide what to do when SSD creator user is no longer valid
                             40010: Enhancement to TemporaryNodes JUnit @Rule so that it gracefully handles checked-out nodes during test code.
                             40017: During work for ALF-15296, I've fixed up the error handling during sync set creation.
                             40019: Having fixed the TemporaryNodes @Rule in rev 40010 so that it handles checked-out test files gracefully, I'm removing Jan's workaround for a checked-out test file.
                             40036: Addressing the important question raised in ALF-14950.
                             40054: CloudSync: add simple *folder* sync unit test !
                             40065: Removal of potential NullPointerException (not observed).
                             40067: CloudSync: ALF-15287 - folder sync to a clashing name hierarchy causes file to be indirectly synced to the wrong place
                             40068: Java doc corrections.
                             40069: ALF-15364: CloudSync: folder sync with lock on-premise - pulled new file is not auto-locked
                   40104: Fix for CLOUD-476 - userStatusRelativeTime is still referenced in org/alfresco/components/dashlets/my-profile.get.js and causes exception on user profile page when user status has been set.
                   40147: French: Cloud Translation update from Gloria (based on EN rev38372)
                   40173: Merged V4.1-BUG-FIX to CLOUD1
                        38178: ALF-14720: Get rid of big, unused class
                   40174: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                        40092: Changing the color of the "Synced Folder" link for each theme
                        40094: Property translation problem fixed: If there is a replacement parameter (e.g. {0}) and an apostrophe in a property the apostrophe needs to be escaped by using a double apostrophe otherwise the property cannot be translated correctly.
                        40172: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                             40072: Error message string updates, based on feedback from Docs.
                             40076: Fixes encoding error introduced in r40072.
                             40169: CloudSync: fix ALF-15380 - source file is deleted (or unsync with delete) but an unpulled target update causes target to remain synced (and/or not deleted)
                   40343: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                        40333: Probable fix for ALF-15430. sys:hidden aspect needs to be handled consistently by Hybrid Sync.
                   40363: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                        40356: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                             40176: CloudSync: add simple rename test (file + folder sync)
                             40282: CloudSync: ALF-15468 - Can't create cloud sync connection from Enterprise 4.1 to Alfresco "in the cloud" !
                             40328: CloudSync: minor - unit test updates (for simple move of directly synced nodes - file or folder)
                             40333: Probable fix for ALF-15430. sys:hidden aspect needs to be handled consistently by Hybrid Sync.
                             40334: Removing unused import - also want to trigger rebuild on this plan as I suspect it failed randomly.
                             40349: CloudSync: fix move out (=> target delete) - add unit tests ( ALF-14655 / ALF-15011 )
                   40402: Fix to CSS error in cloudsync merge - incorrectly overridden font-size in H3 dashlet contents (fix from Mr "I read CSS in my sleep" Hatfield).
                   40421: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                        40419: Fix for the MLText parts of ALF-15502.
         44550: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
              40565: CLOUD-23: core changes to allow overriding of "edit online" button's URL generation.
              40566: CLOUD-23: override "edit online" button's URL generation to work with cloud format SPP URLs.
              40628: Cloud SPP: stop SOAP/RPC requests being rejected when URL is outside of doclib.
              40653: CLOUD-26: 4.1 All protocol features outside browsing the document library should be disabled
              40667: CLOUD-26: core change to support both Thor and standard URL schemes.
              40668: CLOUD-26: fix Document Management sidebar before disabling unwanted features.
              40670: CLOUD-26: fixing "add new members..." to work with cloud (before disabling feature!)
              40677: Cloud SPP: fix disallowing of unsafe methods outside of doclib, fixed to allow all methods to Sharpoint protocol methods and fixed tests.
              40683: CLOUD-26: core changes to allow easy overriding of dwsServiceHandler bean without having to respecify configuration settings.
              40686: CLOUD-26: disable Members tab in Document Management sidebar of Office 2007.
              40693: CLOUD-26: disable Links tab of the Document Management sidebar in Office 2007.
              40814: Cloud SPP: users were unable to list/edit files within their non-home tenant.
              40846: CLOUD-28: made activity "appTool" parameter a configurable value.
         44551: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
              40861: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                   40854: ALF-15557: Sharepoint subsystem to create activity records
              40863: Cloud SPP: Removed activity posting code made redundant by commit 40861
              41037: CLOUD-23: SPP can be deployed to the root context, i.e. "/"
              41079: CLOUD-26: core SPP changes to allow overriding of behaviour.
              41080: CLOUD-26: disable "documents" tab in document management sidebar of Office 2007.
         44552: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
              41102: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                   40553: Remove on-premise style MT store Id extraction code from syncmode config lookup.
              41103: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                   40783: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                        40782: Fix ALF-15420: Move: child files/subfolders aren't synced after moving from parent folder and updating in Alfresco on-premise/Cloud
              41106: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                   40871: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                        40342: Merged BRANCHES/DEV/THOR1_REST_API1 to BRANCHES/DEV/THOR1_REST_API2:
                             35747: Merged BRANCHES/DEV/THOR1_REST_API to BRANCHES/DEV/THOR1_REST_API1:
                                  34235: Upgraded Jackson to 1.9.4
                                  34258: Removed invalid bean definitions (classes don't exist) for abstract="true" beans.
                                  34463: Exported=true 
                                  34464: Removed unused parent workflow
                                  34465: Added a createComment method (Just cut and pasted Neils testcase code).
                                  34466: Initial check-in of Rest Api code.  Still quite a bit to do.
                                  34619: Added sources
                                  34620: Going to start another Sprint so I need to check in everything up to date. WIP
                                  34691: Renamed Action interfaces for better consistency, Fixed up POST methods with better Metadata about resources and fixed failing tests
                                  34727: Reworked the Resource execution, added PUT webscript, improved the tests.
                                  34853: Implemented HTTP Methods: GET, PUT, POST, DELETE with better test cases
                                  34856: Initial cut of rest api implementations. Work in progress.
                                  34935: Added EmbeddedEntityResource and uniqueid annotations. Recursively calls embedded entities, improved tests.
                                  34956: Attempted simplification by removing the CollectionResource concept -> Just an EntityResource with 5 potential methods.
                                  34986: 2nd cut of rest api implementations: still wip.
                                  34987: Added a readById method for Resource GET using the relationship id
                                  35007: Rest API (THOR-1150, THOR-1151, THOR-1152, THOR-1153, THOR-1220, ):
                                      - explicitly set default timezone for date serialization/deserialization to UTC
                                      - more rest api implementation tests
                                      - rest api implementation re-factoring resulting from changes to the framework
                                  35024: Automatically sets the id of passedIn object for a HTTP PUT for relationship resources.
                                  35051: Further impl for public api: THOR-1150 -> THOR-1153 and THOR-1220
                                  35059: Separated the GET executor so the embedded objects are called correctly.
                                  35102: Added Paging, fixed up the Tests.
                                  35117: wip, rest api implementations
                                  35312: Made final
                                  35313: Better exception handling with messages
                                  35314: Improved paging/params and messages, started on embedded relations
                                  35322: Added support for relations projections, to filter by properties use "properties" param, to add in relations use the "relations" param
                                  35329: Handles null relationship keys
                                  35377: Checks for simple property types which don't allow embedding
                                  35496: WIP: rest implementations, test framework and tests
                                  35529: Initial commit of scope and versioning support.
                                  35539: Fixed the versioning for relationship resources
                                  35560: Quick cleanup
                                  35562: Embedded relationships is now working much better
                                  35586: Safer serialization of Maps/Collections
                                  35603: Added better version and filtering tests.
                                  35611: Added Entity and Relationship not found exceptions
                                  35612: Added Entity and Relationship not found exceptions
                                  35674: Rest api implementations:
                                       - node refs are represented solely by their uuid (workspace://SpacesStore is assumed)
                                       - updates to model classes (hashcodes, equals, etc)
                                       - more paging support
                                       - tests
                             35858: Merged BRANCHES/DEV/THOR1_REST_API to BRANCHES/DEV/THOR1_REST_API1:
                                  35773: Added api versioning with @WebApiDeleted annotation.  Better inheritance handling and improved tests.
                                  35774: Deleted, it wasn't supposed to be there.
                             35988: WIP:
                                 - sample requests
                                 - more tests
                                 - general fixes, including security fixes
                                 - tag entity
                             35990: Merged BRANCHES/DEV/THOR1_REST_API to BRANCHES/DEV/THOR1_REST_API1:
                                  35938: Reworked filtering in a big way. Hopefully now it works.
                                  35982: Clean up and bug fix the request
                                  35983: Clean up and bug fix the request
                             36002: Merged BRANCHES/DEV/THOR1_REST_API to BRANCHES/DEV/THOR1_REST_API1:
                                  35992: Clean up after discussions with David/Steve. New Parameter called "parameters"! 
                             36056: Clean up, not used
                             36057: Changed the way responses are rendered, more consistent "entry" entries.
                             36087: Changed the json structure for tests as well
                             36134: Added paging parameter, cleaned up imports, more tests
                             36146: WIP:
                                  - fixed up create tag return type
                                  - fixed up Person model entity so that it doesn't extend Node
                             36151: Fix for Serialization of recursive related Collection of results
                             36168: Better empty collection handling, initial sorting tests.
                             36189: Fixes embedded resources by correct id.
                             36210: WIP:
                                  - updates to rest api request files
                                  - changed Comment so that it doesn't extend Node. removed title
                                  - more tests
                             36211: WIP:
                                  - service paging and other fixes and updates
                             36298: Moved jetty files to fix the build (it's odd that cloud -r works and yet continuous.xml does not)
                             36299: Update classpath as a result of jetty jars move
                             36301: Fix to stop null values in hashmaps from being returned in results.
                             36302: Added copyright notices
                             36303: WIP:
                                  - split site service into a base class (dealing with site permissions and membership) and a subclass (everything else) to aid the following
                                  - moved site membership functionality into canned queries for person sites and site members relations
                                  - changed totalItems to an Integer so that it can be null if total items is not known
                                  - added siteId filtering for activities
                                  - copyright notices
                                  - creating a comment through the comment service raises a share-like activity
                             36304: WIP:
                                  - changed totalItems to an Integer so that it can be null if total items is not known
                                  - copyright notices
                             36309: Servlet API 2.5 needs to be included at the top for the embedded jetty to work - need to revisit this.
                             36310: Temporary fix for dealing with nodeRefs embedded in activity summaries: regex match and convert to NodeRef.
                             36312: Fix tests
                             36325: Add jetty jars to ant test classpath
                             36327: Site memberships fix, override search subsystem to force lucene, re-instate full site service implementation (Spring circular dependencies are ok)
                             36335: Add missing file
                             36367: Fixes to tests
                             36368: CommentService fix - permissions.
                             36438: WIP:
                                 - Person filtering (for cloud)
                                 - Disabled some tests that are preventing the test from running (will revisit)
                                 - Person-avatar relation
                             36522: WIP:
                                 - fix sort ordering for site members
                                 - fix site id filter for activity feed list (add tenant id)
                             36523: WIP:
                                 - more tests
                                 - improved robustness of tests
                                 - added status mappings for EntityNotFound and RelationResourceEntityNotFound
                                 - for avatar, return base 64 encoded avatar data and avatar node id
                                 - use more specific EntityNotFound and RelationResourceEntityNotFound exceptions.
                             36646: Changes resulting from review
                                  - make sure empty strings and null values are not output
                                  - person entity tidy-up
                                  - person visibility rules applied to person retrieval
                                  - more tests
                                  - return noderef of avatar node
                             36668: Fix build, add missing file
                             36694: Fix failing test
                             36764: WIP:
                                  - site containers canned query
                                  - node ratings: return null average (rather than -1) if there are no ratings
                                  - site membership canned query sorting - use an enum for sort fields
                             36767: Add missing files
                             36769: WIP:
                                  - node ratings: remove user rating summary, added rating date and fixed up tests
                             36770: WIP:
                                  - some changes to property names for activity feed entries
                             36823: WIP:
                                 - re-instate -1 for average rating when there are no ratings
                             36824: Changes resulting from review:
                                 - merge activities into one relation
                                 - quota model object to model network quotas
                                 - Change HomeAccount -> HomeNetwork
                                 - Changes to comment property names
                                 - If average rating is -1 (from the rating service) convert to null
                                 - remove readById from node entity resource
                                 - Favourite sites url renaming
                             36825: Removed debug logging for rest api
                             36826: Commented out tag related tests until I figure out how to get the lucene search working
                             36833: Added discoverablity for the documentation.  New @WebApiDescription, @WebApiParam annotations
                             36871: Added tests for @WebApiDecrition, @WebApiParam
                             37026: WIP:
                                  - added discoverability annotations
                                  - changes resulting from review:
                                     o node ratings output restructure
                                     o network quotas restructure (need to revisit this again)
                                  - activity summary post processing framework
                                  - added non-caching to rest api webscript (need to revisit)
                                  - don't output empty strings (need to revisit)
                                  - more tests
                             37058: WIP:
                                 - change tag service support
                             37141: WIP:
                                  - tag sorting
                                  - fix JSON issue in PreferencesService
                             37142: WIP:
                                  - refactoring: split functional areas into separate REST API implementation classes
                                  - added copyright notices
                                  - network quotas represented as a list
                                  - ensure empty (zero length) JSON strings coming into the REST api are treated as null
                             37300: WIP:
                                  - support for update comment
                                  - activity summary processing
                                  - web script set no caching and response content type
                             37301: WIP:
                                  - support for update comment
                             37354: Build fix: try rebuilding indexes
                             37369: Fix build: try again
                             37498: More logging to determine build failure using lucene for search
                             37608: Build fix?
                             37609: Fix build
                             37637: Fix build: try again
                             37672: Build fix (try again)
                             37860: Get networks: consolidate functionality so that it's easily callable from core Thor code and public api code
                             37861: Get networks: consolidate functionality so that it's easily callable from core Thor code and public api code
                             37862: Fix for THOR-1493: "OpenCMIS Change Object Id to be Node GUID"
                             37864: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api"
                             37866: Unit test fix
                             37950: Build fix for ApiTest (another try - override repository-properties bean to force lucene)
                             38051: Build/test fix (another try)
                             38072: Removed file no longer required
                             38114: Better representation of the Resource metadata.  Try calling: /alfresco/service/public/alfresco/versions/1
                             38230: Fix PublicApiTest on the build machine
                             38309: Public api test fixes
                             38319: Public api webscript transaction configuration. Make get webscript r/o transaction.
                             38320: Public rest api: make sure http response headers are written before the response content.
                             38340: More build test fixes
                             38349: Fix for THOR-1493: "OpenCMIS Change Object Id to be Node GUID"
                                 - fix up CMIS query fallout
                             38530: Fix tests
                             38531: Fix for THOR-1493: "OpenCMIS Change Object Id to be Node GUID"
                                  - fix up cmis queries
                             38552: Further test fixes
                             38574: Added some comments
                             38730: Added OPTIONS webscript to get metadata on the current url
                             38879: Refactored a little to make the code easier to extend / customise
                             38880: Fixed incorrect config, I should try not to delete things.
                             38986: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/THOR1_REST_API1:
                                  38954: Fix for ALF-14475: "CMIS : Wrong cmisra:numItems in folder sites and below with /cmisatom binding url"
                             39010: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/THOR1_REST_API1:
                                  39006: Fix for ALF-14475 part 2: "CMIS : Wrong cmisra:numItems in folder sites and below with /cmisatom binding url"
                             39090: Fixed broken webscript OPTIONS call
                             39159: Fix broken INFO url mapping
                             39326: Clean up, Added ResourceMetaDataWriter interface for different meta info presentation formats
                             39331: The tests need their own context
                             39609: Update to latest Chemistry libraries
                             39657: Fix for CLOUD-417, part 1: "Delete a Comment"
                             39741: Fix for CLOUD-409: "Change Endpoint for CMIS URLs in Staging"
                             39742: Fix for CLOUD-409: "Change Endpoint for CMIS URLs in Staging"
                             39750: Fix for CLOUD-417, part 2: "Delete a Comment"
                                 - added delete comment method to comment service
                             39754: Fix for CLOUD-417, part 3: "Delete a Comment"
                                 - fixed up activity generation for update and delete comment
                             39776: OpenCMIS TCK fix: getDescendants is using node service, which unlike the FileFolderService does not automatically remove hidden files.
                             39780: Shifted public api opencmis webscript definitions to Thor
                             39781: Shifted public api opencmis webscript definitions to Thor
                             39782: Fix for CLOUD-409: "Change Endpoint for CMIS URLs in Staging"
                             39783: Minor fixes, comments
                             39785: Public api tests
                                 - move jetty libraries to 3rd party
                                 - remove JettyComponent as a Spring bean and change how it's constructed
                             39786: Fix for THOR-1493: "OpenCMIS Change Object Id to be Node GUID"
                                 - for unversioned documents, the revision number should not be appended
                             39794: Added missing files for public api tests
                             39795: Update to latest Chemistry libraries
                             39834: Fix for THOR-1493: "OpenCMIS Change Object Id to be Node GUID"
                                 - for unversioned documents (or documents with version "1.0"), the revision number should not be appended
                             39835: Fix for CLOUD-362: "Discover Networks" API should be at "/tenants"
                             39836: Fix for THOR-1493: "OpenCMIS Change Object Id to be Node GUID"
                             39844: Public api tests
                                 - move jetty libraries to 3rd party
                                 - remove JettyComponent as a Spring bean and change how it's constructed
                             39854: Fix for CLOUD-362: "Discover Networks" API should be at "/tenants"
                             39856: Re-instate tests.
                             39857: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api"
                                  - removed cmisatom url binding (opencmis is now at .../public/cmis/versions/1/atom)
                             39926: Fix for CLOUD-442: "Public API : Tagging + Paging"
                             39927: Fix for CLOUD-442: "Public API : Tagging + Paging"
                                  - updates to public api tests
                             40185: Make sure LockService is injected into CommentService
                             40186: Make sure LockService is injected into CommentService
                             40187: Changes resulting from sprint demo:
                                 - changes to network and network membership representation
                                 - embed modifiedBy person object in comment
                             40211: Changes resulting from sprint demo:
                                 - changes to network and network membership representation
                             40212: Fix intermittently failing test
                             40223: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api"
                                  - changes resulting from end of spring demo (get repositories located at .../cmis/versions/1.0/atom)
                                  - removed browser binding for now
                             40224: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api" (Thor-specific changes)
                                  - changes resulting from end of spring demo (get repositories located at .../cmis/versions/1.0/atom)
                                  - removed browser binding for now
                             40225: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api"
                                  - changes resulting from end of spring demo (get repositories located at .../cmis/versions/1.0/atom)
                                  - removed browser binding for now
                             40254: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api"
                                  - changes resulting from end of spring demo (get repositories located at .../cmis/versions/1.0/atom)
                             40255: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api"
                                  - changes resulting from end of spring demo (get repositories located at .../cmis/versions/1.0/atom)
                             40256: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api"
                                  - changes resulting from end of spring demo (get repositories located at .../cmis/versions/1.0/atom)
                             40270: Turned stacktrace into a String
                             40339: CLOUD-488: "The activities feed in the public API is not returning all required summary data for comments"
                        40548: Merged PATCHES/V4.0.2 to BRANCHES/DEV/THOR1_REST_API2:
                             40526: Fixed ALF-15540: CMIS: Synchronized block in service interceptor
                        40644: Public api:
                        40645: Public Api:
                        40646: Public Api:
                        40649: Public api:
                        40650: Public api:
                        40657: Merged BRANCHES/DEV/THOR1_REST_API1 to BRANCHES/DEV/THOR1_REST_API2:
                             40515: CLOUD-390: Content models to be filtered out of Cloud CMIS implementation
                             40550: Public api:
                                 - updates to datetime property names
                             40552: Public api:
                                  - sort sites by site title (by default)
                             40596: Removed "system" from exclusions for CLOUD-495
                             40610: CLOUD-495: F414: Add multiple tags to a folder or document
                        40674: Public api:
                        40675: THOR-1324: "F414: Add multiple tags to a folder or document"
                        40676: Public api:
                        40678: Public api:
                        40715: Public api:
                        40730: Merged /alfresco/BRANCHES/DEV/THOR1_REST_API1:r40724  Better meta-data handling for PUT requests
                        40731: Merged /alfresco/BRANCHES/DEV/AMILLER/CLOUD-496:r40659: CLOUD-500: Add trusted auth with key validation.
                        40732: Fixed failing test
                        40739: Merged BRANCHES/DEV/V3.4-BUG-FIX:r40193: ALF-15307 / ALF-15190: FTS indexing can stick forever on purged nodes - May cut 50 minutes off the build time when merged
                        40742: Public api
                        40801: Public api:
                        40802: Public api
                        40803: Public api
                        40804: Public api
                        40807: Public api
                        40811: Public api
                        40815: Public api:
                        40826: Public api
              41108: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                   40898: Fix build
              41110: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                   40903: Fixed solrcore properties (merge error)
              41111: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                   41007: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                        40998: CLOUD-563: "View external member of the site if internal user is not a member of a site."
              41112: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                   41048: 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
              41245: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                   41128: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                        41003: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                        41026: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                        41039: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                        41086: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                        41115: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                        41126: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                             40364: Testcase for ALF-15178, which is not reproduced.
                             40419: Fix for the MLText parts of ALF-15502.
                             40782: Fix ALF-15420: Move: child files/subfolders aren't synced after moving from parent folder and updating in Alfresco on-premise/Cloud
                        41127: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                             41121: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/V4.1:
                                  41003: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                                  41026: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                                  41039: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                                  41086: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                             41123: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/V4.1:
                                  41115: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
              41247: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                   41149: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                        41146: Fix trusted authentication against OpenCMIS
              41248: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                   41157: BDE-73: finish adding all the code into Sonar report. Tests are not there yet.
              41249: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                   41180: 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
              41250: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                   41185: BDE-73: Add back web-framework-commons to fix reporting
              41251: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                   41192: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                        41191: Fix for OpenCMIS trusted authentication to allow local opencmis access as before
              41252: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                   41209: BDE-73: workaround MDEP-98 encountered with Sonar
              41253: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                   41212: CLOUD-610: "Public APIs causing problem with mobile app"
         44553: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
              41293: Cloud SPP only: fix IDE project dependency and classpath for PublicApiTest (and others no doubt) to run.
              41294: Cloud SPP: ensure vti and thor module dependency is handled correctly.
              41312: Fix build problem: some unit tests had been split out and needed the sharepoint module on the classpath.
              41379: Cloud SPP: remove remote-api dependency from repository.
         44554: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
              41695: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                   41114: Merged DEV\V4.1-BUG-FIX to DEV\CLOUD1
                         40977: (Record only) Sync parser generation
              41696: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                   41302: CLOUD-622: "Mobile App connection to testmy build 227 issue"
              41698: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                   41375: BDE-73: remove never-ending test for reporting
              41699: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                   41377: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                        40859: public api:
                        40862: CLOUD-555: "Updating comment fails because node not found"
                        40961: CLOUD-566: "Site object shouldn't contain the "sitePreset" property"
                        40979: Added tests for non-numeric params and non-european characters
                        41030: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/THOR1_REST_API2:
                             41027: ALF-15193: "Folder Is Not a Folder CmisInvalidArgumentException thrown when using cmis:objectId"
                        41097: Added quickshare and cloudsync to cmis filter list
                        41098: Renamed serializer/deserializer lists for RestJsonModule
                        41099: Cleaned up consistent Rest responses - CLOUD-574
                        41100: Meta info webscript is disabled because its not been reviewed / in the correct format
                        41104: Meta info webscript is really disabled because its not been reviewed / in the correct format
                        41105: Added key for trusted layer7 relationship
                        41137: Public api:
                        41168: Public apI;
                        41169: CLOUD-565: "API / URL returns a "tenant required" error"
                        41170: public api:
                        41171: public api:
                        41172: public api:
                        41183: CLOUD-598: "API: "GET network" response has unnecessary JSON nesting"
                        41186: Fix solrcore properties
                        41282: CLOUD-616: "CMIS API: Repository names should be more descriptive"
                        41283: CLOUD-601: "API /networkId/public/cmis/versions/ returns a 400"
                        41325: Public api:
                        41367: CLOUD-636: "REST API: Nodes: Tags: Not allowed DELETE method proceeds with status 204"
                        41369: Public api:
              41700: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                   41474: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                        41422: Sample OAuth call for the Resource Owner Password flow
                        41427: Sample OAuth call for the Client Credentials flow
                        41433: Public api: (1) parameterize site members/people sorting in service api
                        41434: Public api: minor comment service fix
                        41438: CLOUD-629: "REST API: It is possible to add a comment to comment"
                        41439: Public api: fix for default tenant id in CMIS requests
                        41449: CLOUD-629: "REST API: It is possible to add a comment to comment"
                        41456: CLOUD-644: "Performing a Checkout in OpenCMIS Results in an Exception in the Share Doc Library"
                        41457: Fix build
                        41461: Public api: more tests
              41701: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                   41560: CLOUD-657: "cmis root service document returning incorrect urls"
              41702: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                   41627: CLOUD-676: "OpenCMIS Returns Error 500 on GET: https://testp.alfresco.me/alfresco/a/cmis/versions/1.0/atom"
              41703: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                   41670: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                        41521: CLOUD-660: "GET favourite sites results in exception when skipCount is greater than number of items"
                        41606: Fix for CLOUD-668 - POSTing to a relationship by id now returns an InvalidArgumentException
                        41607: CLOUD-668 : changed ordering so errors fire in correct order.
                        41628: Public api: more tests
         44555: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
              41709: CLOUD-640: Notification is not displayed for consumer for updating/editing document added by other user
              42331: Cloud SPP: really fix import order.
              42364: Cloud SPP: fix Spring bean filename typo.
              43078: CLOUD-868: incorrect URL for Sharepoint protocol
              43153: CLOUD-747: SPP: Checking document out doesn't work
              43221: CLOUD-896: Unable to open specific version of document from MS Word
              43222: CLOUD-896: Unable to open specific version of document from MS Word
              43247: CLOUD-896: missing class CloudVersionsServiceHandler from previous commit.
              43256: CLOUD-896: fix broken test
         44556: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
              43472: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                   41710: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                        41672: CLOUD-672: "404 Error when browsing child files/folder "
                        41673: Public api: more tests
                        41675: CLOUD-674: "Root network calls need to return application/json content type"
                   41754: Merged BRANCHES/DEV/FEATURES/CLOUD1_LAYER7 to BRANCHES/DEV/CLOUD1:
                        41677: No-op skeletons of Public API gateway filter and URL rewrite filter
                        41683: Url rewrite rules for new and old-style public api
                        41705: First working version of gateway filter
                        41732: Trim authenticator keys from config
                        41734: Productising code - tests and bug fixing with layer7, code tidyup, configuration, error handling
                        41753: SSL support for accepting self-signed certificates
                   41794: Merged BRANCHES/DEV/FEATURES/CLOUD1_LAYER7 to BRANCHES/DEV/CLOUD1:
                        41792: Fixes for Gateway authentication filter after end to end testing on staging.
                   41798: Merged BRANCHES/DEV/FEATURES/CLOUD1_LAYER7 to BRANCHES/DEV/CLOUD1:
                        41797: Ensure authentication filter provides enough info to gateway for full analytics
                   41815: Merged BRANCHES/DEV/FEATURES/CLOUD1_LAYER7 to BRANCHES/DEV/CLOUD1:
                        41814: Fix regression where old style apigee route failed
                   41842: CLOUD-619: "CMIS query for objectId throws exception"
                   41843: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                        41790: CLOUD-629: "REST API: It is possible to add a comment to comment"
                        41791: CLOUD-629: "REST API: It is possible to add a comment to comment"
                        41793: CLOUD-629: "REST API: It is possible to add a comment to comment"
                        41823: Public api: more tests
                        41825: Fix for CLOUD-684 - wraps the list, not sure if I like the paging
                   41855: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                        41853: CLOUD-700: "The mobile SDK needs a way to map an accessToken to a user identifier"
                   42005: Merged BRANCHES/DEV/FEATURES/CLOUD1_DAM to BRANCHES/DEV/CLOUD1:
                        37644: Resolve CLOUD-34: Incorporate Gallery View
                        39105: Moved to AMP produced from modules/dam/BRANCHES/V1.0 with overrideSource=cloud build property
                        39268: ALF-13984: High Resolution Mime-Aware Place Holder Icons
                             - Implemented in DAM 1.0.2.0
                        39651: Deployed DAM module version 1.0.3 to CLOUD1_DAM which fixes:
                             - CLOUD-380: Document library displayed incorrectly in Gallery view in IE7
                             - DAM-36: CLONE - Document library displayed incorrectly in Gallery view in IE7
                             - DAM-37: Gallery View: No Border Around Selected Items in IE7
                             - DAM-38: Gallery View: Two Items Must be Selected in IE7 for Multi-select Actions
                             - DAM-39: Gallery View: Slider Behavior is Erratic in IE7
                             - DAM-40: Gallery View: Upload Instructions Throws Error in IE7
                        40083: CLOUD-378: Drag and drop within document library doesn't work in Gallery view
                             - Deployed DAM 1.0.4.0
                        40507: Changed name of DAM module to Media Management
                        40534: Version 1.0.5.1 of MM module which includes:
                             - DAM-61: Multi-Select Checkboxes Are No Longer Present in 1.0.5
                        40723: Deployed version 1.0.5.3 of the Media Management module which includes fixes for:
                             - CLOUD-544 / DAM-66: 'Share' Link Displayed Incorrectly on Info Panel
                             - CLOUD-543 / DAM-65: Gallery View Content Display Should Support Dynamic Changing of Browser Width
                        41174: Deployed Media Management module 1.0.5.4 which includes:
                             - DAM-67: Gallery View Changes the Size of Dragging Thumbnails in Other Views
                             - DAM-68: Gallery VIew Should Hide Its Container on destroyView
                             - DAM-69: Gallery View Resizing Should Fire Only When Resizing has Stopped
                             - DAM-71: Gallery View Thumbnail Generation Should Accept Thumbnail Definition Parameter
                        41536: Merged HEAD to BRANCHES/DEV/FEATURES/CLOUD1_DAM:
                             40870: m.share fixes
                        41537: Merged HEAD to BRANCHES/DEV/FEATURES/CLOUD1_DAM:
                             40919: m.share fixes
                        41538: Merged HEAD to BRANCHES/DEV/FEATURES/CLOUD1_DAM:
                             41432: Fixed CLOUD-587 "Drag and Drop Changes Conflict with Hover Events on Touch Devices"
                        41614: Changed version of gallery view only MM module to 0.1
                        42004: Upgraded to MM 0.1.5.5 which contains fix for DAM-74
                   42047: Merged DEV/CLOUD_SIGN_UP into DEV/CLOUD1 (cloud priority 
                   42049: 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
                   42050: 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
                   42121: Merged BRANCHES/DEV/AMILLER/CLOUD1 to BRANCHES/DEV/CLOUD1:
                        39663: CLOUD-153 - Invite box doesn't parse email addresses properly
                   42160: Merged BRANCHES/DEV/AMILLER/CLOUD1 to BRANCHES/DEV/CLOUD1:
                        38864: CLOUD-41 - Resize logo banner on upload
                        38878: CLLOUD-42 - Image previews should be larger
                   42199: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/CLOUD1:
                        41113: Creating new [bug fix] branch from BRANCHES/DEV/CLOUD1
                        41211: QuickShare: CLOUD-593: prevent copying of QuickShare props on node copy [+ minor refactor]
                        41612: QuickShare: Merged form THOR1_QUICK_SHARE to CLOUD1-BUG-FIX
                           36363: QuickShare: Improvment for THOR-1268 "F378: As a user I can choose to share a document"
                        41639: QuickShare: Fixed bug where the display of quickshare was based on the showComments property
                   42200: Merged DEV/CLOUD1-BUG-FIX into DEV/CLOUD1: Record-only (r41650 and r41674)
                   42201: Merged DEV/CLOUD1-BUG-FIX into DEV/CLOUD1: Record-only (r41650 and r41674)
                   42203: CLOUD-71: Patch was there, but reference to it from "postUpgrade..." was lost in merge, preventing it from being executed
                   42204: Merged BRANCHES/DEV/HEAD_QUICK_SHARE_TMP to BRANCHES/DEV/CLOUD1:
                        41733: QuickShare: fix ShareContentGet NPE (fix for Document Details redirect if logged in)
                   42206: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/CLOUD1:
                        41213: CLOUD-452: reconfigure Activities DAOs to use common Alfresco datasource
                        41214: CLOUD-452: reconfigure Activities DAOs to use common Alfresco datasource (DO NOT MERGE to Enterprise/HEAD)
                        41270: CLOUD-452 / ALF-15823: reconfigure Activities DAOs to use common Alfresco datasource
                   42209: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/CLOUD1:
                        41292: CLOUD-520: Convert TicketCleanupJob to a StatfulJob
                        41410: CLOUD-119: Change status code to 409 (Conflict), from 400 (Bad Request), when parent folder does not exist
                   42211: Fix pesky solrcore.properties ... remove hardcoded amiller ;-)
                   42231: CLOID-71: TEMP - comment-out previous r42203 (breaks build/tests)
                   42241: Updated Media Management module to 0.1.5.6 which contains fixes for:
                        - CLOUD-740/MM-76: Empty space in the page footer when switching to Gallery View
                        - CLOUD-741/MM-75: IE7: Opacity of Folder Icon not Rendered Correctly in Gallery View
                        - CLOUD-741/MM-77: Gallery View Continually Recalculates Height in IE
                        - CLOUD-753/MM-78: Links for 'Create a folder' and 'Upload files' in the Empty Folder Instructions Don't Work in Gallery View
                        - MM-79: Disable Fade Animation on Resize of Gallery View
                   42252: 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
                   42267: CLOUD-153: Update CloudInvitationServiceImpl to only use the address part of an email string and ignore the personal name. 
                   42285: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                        41867: CLOUD-711: "It should be possible to remove a favourite site"
                        41957: Public api: - error handling improvements - more tests
                        41970: Public api: - fix build  (add missing files)
                        41972: Public api: - more tests (including OpenCMIS TCK)
                        42046: Added some debug timings.  Enabled using log4j.logger.org.alfresco.rest.framework.webscripts=debug
                        42058: Public api: changed logging package name
                        42124: Public api: - more tests - minor fixes
                        42125: CLOUD-734: "CMIS: Query Issues Discovered During Testing"
                        42126: Public api: fix up OpenCMIS tests
                        42171: Consistency fix for CLOUD-695.
                        42180: Fix build
                        42181: CLOUD-695 "Requests to un-implemented urls do not consistently return http status 405 (Method not allowed)": fix up public api tests
                        42214: Public api tests (cmis)
                        42251: Changed the serializer for embedded entities, (related to CLOUD-746)
                        42253: Fix build
                   42288: Fix build - fix merge problem
                   42302: Updated Media Management module to 0.1.5.7 which contains fixes for:
                        - CLOUD-788/MM-89: "Rename" Icon is not Displayed Correctly in Gallery View
                   42320: Fix build (fix dodgy merge)
                   42334: Fixed build of Media Management module for:
                        - CLOUD-789/MM-91: MM AMPs Produced No Longer Contain module.properties
                   42341: Fixed CLOUD-755 "Label needs to be renamed and icon should be present"
                   42344: Fixed CLOUD-755 "Label needs to be renamed and icon should be present" part 2
                   42365: CLOUD-153: Fix additional invite paths.
                   42373: Updated Media Management module to 0.1.5.8 which contains:
                        - MM-92: Change Default View for Cloud to Detailed Rather than Gallery
                   42513: CLOUD-808: fixed issue with timers due when alfresco boots
                   42577: CLOUD-808: Fix for timer deploying MT-process when shared is required caused test to fail
                   42588: BDE-73: fix compilation + switch to MySQL to make cloud tests pass 
                   42595: Add salesforce modules to privatemodules.  Contains only models.
                   42596: Add salesforce module build properites and ant build tasks.
                   42601: Updated salesforce amp with correct version number and updated module-context.xml
                   42668: BDE-73 Fix Sonar reporting
                   42709: FRENCH: Translation updates based on EN r42416
                   42867: CLOUD-71: add explicit schema number for workflow timers redeploy patch
                   42871: GERMAN: Cloud Translation, based on r 42416
                   42879: SPANISH: Cloud Translation, based on r 42416
                   42890: ITALIAN: Cloud Translation, based on r 42416
                   43120: 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
                   43243: BDE-73: Fork for each test, otherwise some fail because of previous test leftovers
                   43323: Merged BRANCHES/DEV/FEATURES/CLOUD1_GRANULARPERMISSIONS1 to BRANCHES/DEV/CLOUD1:
                        42257: CLOUD-649: Updates UI action for Granular Permissions
                        42295: CLOUD-33: Updates labels
                        42303: CLOUD-651: Limit user search to site members only.
                        42352: CLOUD-780: Adds a rolesWhitelist to only display those roles that are allowed. Currently set to: ["Consumer", "Contributor", "Collaborator"]. This is only used in the site view. The Repository view behaviour has not changed.
                        42427: Removes multi-select manage-permissions dialogue.
                        42520: CLOUD-802: Change the way the user is returned to the previous page to work around suspected Chrome bug.
                        42604: CLOUD-840: Automatically add SiteManger permisions when inheritAll is switched off. Pervent remaoval of siteManager authority.
                        42606: Fixed CLOUD-840 "Granular Permissions: Site Manager should retain access when inherit permissions is turned off"
                        42807: CLOUD-863: Reordered code to avoid AccessDeniedException
                        43259: CLOUD-901: Revert showComments check so it handles undefined permission
                        43266: CLOUD-900: Old Manage permissions form is opened via Permissions panel
                        43307: CLOUD-900: Follow-up fix
                   43353: Fix for remote transform server with new cloud environment
                   43457: Merged BRANCHES/DEV/FEATURES/CLOUD1_GOOGLEDOCS to BRANCHES/DEV/CLOUD1:
                        39869: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_GOOGLEDOCS:
                             Merged /integrations/GoogleDocs/BRANCHES/THOR1_SPRINTS_GOOGLEDOCS to BRANCHES/V4.1   
                               36307 Fixed THOR-1402 "Need a callback option for Create Content menu"
                                  - Will be revisited to add better comments
                               36350 Fixed THOR-1402 "Need a callback option for Create Content menu" part 2
                                  - Changed callback obj to match action object better: { nodeRef, node, jsNode }
                                  - Better code documentation
                                  - Removed dev/test code
                                  - Improved error config handling
                               36358 THOR-1402 "Need a callback option for Create Content menu" part 3
                                  - Changed "link" parameter to "href" (instead of "page") to match actions.
                               39256 Consistency fix of doclib & repo toolbar templates after work on THOR-1402
                               39260 Bugfix for "destination" parameter not being resolved correctly THOR-1402
                        39875: Configurtion changes to enable Google Docs V2 within the web tier.
                        39881: It's extension ... not extention
                        39938: Update CLOUD1_GOOGLEDOCS ant build to include installing googledocs amp files
                        39944: CLOUD-437: Ensure that custom doclib action resources are requested after documentlist.js
                        40468: Alfresco GoogleDocs AMPS.  Fixes for [GOOGLEDOCS-73], [GOOGLEDOCS-70], [GOOGLEDOCS-75], [GOOGLEDOCS-76]
                        40624: Update Google Docs AMPs
                        40635: Merge Google Docs Cloud AMPS to Feature Branchs
                        40824: Update Google Docs AMPS, fixing [GOOGLEDOCS-79]
                        40897: Google Docs AMP update 
                        41165: Merge Updated AMPs for [GOOGLEDOCS-83]
                        41179: Update AMPs for [GOOGLEDOCS-87]
                        41262: Update AMPs for GOOGLEDOCS-89
                        41493: Update AMPs for [GOOGLEDOCS-93]
                        41635: AMP update for [GOOLGEDOCS-98] [GOOGLEDOCS-99] [GOOGLEDOCS-100]
                        41805: Update AMPs for [GOOGLEDOCS-101]
                        41840: Add AMPs with i18n strings
                        43316: (RECORD ONLY) Rebase CLOUD1_GOOGLEDOCS with CLOUD1
                        43317: (RECORD ONLY) Re-merge build.properties and projects.xml to include googledocs amps in build
                        43320: Add googledocs repo declaration
         44557: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
              43751: CLOUD-747: SPP: Checking document out doesn't work
              43765: CLOUD-747: fixes ${localname} substitution in vti.server.external.host value
              43780: CLOUD-747: Sharepoint version of PROPFIND handler must return 'href' containing the externally visible base URL
              43785: CLOUD-747: fix for proxied repository - more robust parsing of URLs.
              44001: Fix pesky solrcore properties
              44036: Resolve CLOUD-877: UI button for SharePoint Protocol needs to be updated
              44211: CLOUD-747: checkout/checkin works for spaces in document
         44564: Fix construction of vti activity processor after merge
         44565: Remove unnecessary build of war and amps for exploded target (NOTE: may fail in continuous build)
      47521: Fix merge - WebDAVHelper 
      - fix NPE on login (missing hiddenAspect injection)
      47645: Fix merge - build/test - RenditionServiceIntegrationTest.testBuiltinRenditionDefinitions
      - junit.framework.AssertionFailedError: expected:<image/jpeg> but was:<image/png>
      - manual/partial re-merge of CLOUD-42
      - note: thumbnail code merge/converge will required additional review and testing
      47971: Fix merge issue for SPP WebDAV
      48059: Redo the WebDAVHelper merge the way it was done on HEAD to enable dependency injection again (aka 'un-butcher')
      - This will temporarily break CLOUD2 compilation. I will fix that next.
      48061: Enable easier overide of webDavHelper by defining an abstract bean definition
      48084: CLOUD-1448: Make it possible to override beans defined in remote-api-context.xml within modules by adjusting the loading order
      48087: CLOUD-1356: Fixed failing Activiti MT-test
      48128: Add small script to install build result to local Maven repo
      48427: CLOUD-1356: Stabilized MT workflow-functionality after cloud-convergence
      48496: CONV: fix CLOUD-1483 - rework exclusion of admin@tenant
      - to fix failed CLOUD2 test (NetworkAdminTest testPaging)
      48499: CONV: fix CLOUD-1483 - rework exclusion of admin@tenant
      - to fix failed CLOUD2 test (NetworkAdminTest testPaging)
      - follow-on to fix boundary condition
      48501: CONV: fix CLOUD-1479 "Invite People" - new user in network (that does not exist yet)
      - initial fix (pending regress fix from CLOUD-1458)
      48508: CONV: fix CLOUD-1483 / CLOUD-1407 - rework exclusion of admin@tenant
      - to fix failed CLOUD2 test (NetworkAdminTest testPaging)
      - test and fix expected total count (if requested)
      48511: CONV: fix CLOUD-1479 "Invite People" - new user in network (that does not exist yet)
      - follow-on fix (pending regress fix from CLOUD-1458)
   48533: Merged CONV_V413 to CONV_HEAD
      48524: CONV: CONV_V413 - comment test back in ...
      ... RenditionServiceIntegrationTest.testRenderFreeMarkerTemplate"
   48534: Remove duplicate old joda time version
   48535: Fixed merge issue
   48539: Fix MailActionExecuter handling of non-tenant users
   48544: Hopeful build fix - restore Jan's domain logic


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@48546 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2013-03-25 09:37:19 +00:00
Jan Vonka
32586e279f Merged BRANCHES/DEV/CONV_HEAD to HEAD: 
48314: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD 
        47545: Merged DEV/CLOUD2 to DEV/CONV_V413
           43457: Merged BRANCHES/DEV/FEATURES/CLOUD1_GOOGLEDOCS to BRANCHES/DEV/CLOUD1:
              39869: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_GOOGLEDOCS:
                   Merged /integrations/GoogleDocs/BRANCHES/THOR1_SPRINTS_GOOGLEDOCS to BRANCHES/V4.1   
                     36307 Fixed THOR-1402 "Need a callback option for Create Content menu"
                        - Will be revisited to add better comments
                     36350 Fixed THOR-1402 "Need a callback option for Create Content menu" part 2
                        - Changed callback obj to match action object better: { nodeRef, node, jsNode }
                        - Better code documentation
                        - Removed dev/test code
                        - Improved error config handling
                     36358 THOR-1402 "Need a callback option for Create Content menu" part 3
                        - Changed "link" parameter to "href" (instead of "page") to match actions.
                     39256 Consistency fix of doclib & repo toolbar templates after work on THOR-1402
                     39260 Bugfix for "destination" parameter not being resolved correctly THOR-1402
              39875: Configurtion changes to enable Google Docs V2 within the web tier.
              39881: It's extension ... not extention
              39938: Update CLOUD1_GOOGLEDOCS ant build to include installing googledocs amp files
              39944: CLOUD-437: Ensure that custom doclib action resources are requested after documentlist.js
              40468: Alfresco GoogleDocs AMPS.  Fixes for [GOOGLEDOCS-73], [GOOGLEDOCS-70], [GOOGLEDOCS-75], [GOOGLEDOCS-76]
              40624: Update Google Docs AMPs
              40635: Merge Google Docs Cloud AMPS to Feature Branchs
              40824: Update Google Docs AMPS, fixing [GOOGLEDOCS-79]
              40897: Google Docs AMP update 
              41165: Merge Updated AMPs for [GOOGLEDOCS-83]
              41179: Update AMPs for [GOOGLEDOCS-87]
              41262: Update AMPs for GOOGLEDOCS-89
              41493: Update AMPs for [GOOGLEDOCS-93]
              41635: AMP update for [GOOLGEDOCS-98] [GOOGLEDOCS-99] [GOOGLEDOCS-100]
              41805: Update AMPs for [GOOGLEDOCS-101]
              41840: Add AMPs with i18n strings
              43316: (RECORD ONLY) Rebase CLOUD1_GOOGLEDOCS with CLOUD1
              43317: (RECORD ONLY) Re-merge build.properties and projects.xml to include googledocs amps in build
              43320: Add googledocs repo declaration
   48315: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47438: Merged DEV/CLOUD2 to DEV/CONV_V413
             42160: Merged BRANCHES/DEV/AMILLER/CLOUD1 to BRANCHES/DEV/CLOUD1:
                38864: CLOUD-41 - Resize logo banner on upload
                38878: CLOUD-42 - Image previews should be larger
   48316: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD (RECORD ONLY)
        47558: Merged DEV/CLOUD2 to DEV/CONV_V413 (RECORD ONLY)
           47542: Overriding entire surf-config.xml (instead of modifying the core slingshot code) with a copy of the core code modified to fit the cloud requirements.
   48318: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD (UI ONLY)
        47613: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
           47610: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD2:
                47157: Merged BRANCHES/DEV/FEATURES/CLOUD1_SAML1 to BRANCHES/DEV/CLOUD1:
                     44058: Creating DEV/FEATURES/CLOUD1_SAML1 branch from revision 44032 of CLOUD1 b316
                     44095: Cloud SAML: Repo SAML Auth API - webscript placeholders (for SSO/SLO request/response)
                     44177: Cloud SAML: Repo SAML Auth API - webscript placeholders (for SSO request/response)
                     44227: SAML - Share implementation - Note WIP!
                     44249: Cloud SAML: Repo SAML Auth API - skeleton SAMLConfigAdminService (enable/disable)
                     44273: CLOUD-1000, CLOUD-1002: added SAML SSO services to Thor.
                     44274: Added opensaml libs to the build file.
                     44284: Added opensaml dependency, to fix the failed build.
                     44298: Cloud SAML: Repo SAML SSO (Auth) API -  check whether network/tenant is SAML-enabled or not (CLOUD-1018)
                     44315: added jks keystore.
                     44323: added correct version of saml.keystore.jks
                     44350: Changed the issuer.name in the sp-config, and the alias in the key store to reflect the issuer name.
                     44351: Changed the key store type to JKS.
                     44440: Cloud SAML: Share SAML - follow-on to r44227 to fix/add missing SAML authnRequest fields (CLOUD-1039)
                     44448: Cloud SAML: Repo SAML SSO Authn Request (CLOUD-998)
                     44477: Cloud SAML: Repo SAML SSO Authn Response (CLOUD-999)
                     44524: Made SAMLAuthnResponseController to redirect Idps Response to repo. Also added idps.properties file in order to test multiple IdPs.
                     44588: Cloud SAML: Repo SAML - minor: change REST urls from ".../cloud/saml/..." to just ".../saml/..."
                     44609: CLOUD-1002: Modified SAMLResponse processing implementation to get the SAMLResponse from share via json rather than directly through HttpServletRequest that OpenSAML requires.
                     44611: Added a few modifications to improve SAMLHttpPostSimpleSignDecoder implementation.
                     44633: CLOUD-1070: SAML sprint 4: Repo REST - Get SP (Alfresco) Public Certificate
                     44634: Modified ACS post json data, to endued null for non-existent user.
                     44635: CLOUD-1040 "SAML sprint 4: Share UI (SAML-based login) - handle SAML auth response (IdP -> Repo)" checkpoint/wip
                     44645: Cloud SAML: Repo REST API - Get SP (Alfresco) metadata (specific to Network)
                     44684: Cloud SAML: CLOUD-1053 - Email links (signup/invite)
                     44703: Cloud SAML: CLOUD-1058 - Repo REST API to Get SP (Alfresco) metadata (specific to Network)
                     44717: Cloud SAML: CLOUD-1079 - additional login validation when Registering/Creating a new user for a IdP/SAML-enabled Network
                     44721: Modified SAML admin config to include the required attributes to set SSO. The most important attributes are ssoEnabled and IdP’s SSO URL. For setting the attributes, see the wiki page. Note: IdP's certificate uploading/storing hasn't been implemented yet.
                     44739: Cloud SAML: CLOUD-1079 - additional login validation when Registering/Creating a new user for a IdP/SAML-enabled Network
                     44774: Cloud SAML: CLOUD-1053 - UI/Email flows when user exists in IdP but not Alfresco => signup/invite + IdP login form + enter profile & activate
                     44793: Cloud SAML: CLOUD-1049 - override "normal" login to redirect for SAML-enabled network/tenant (if implied by username)
                     44794: Cloud SAML: CLOUD-1049 - override "normal" login to redirect for SAML-enabled network/tenant (if implied by username)
                     44799: Cloud SAML: CLOUD-1049 - override "normal" login to redirect for SAML-enabled Network/Tenant (if implied by username and not a Network/Admin)
                     44809: Cloud SAML: CLOUD-1039 - SAML login entrypoint (localhost:8081/share/{network}/saml) 
                     44810: Cloud SAML: minor - comment only
                     44833: Cloud SAML: CLOUD-1053 - UI/Email flows when user exists in IdP but not Alfresco => signup/invite + IdP login form + enter profile & activate
                     44837: Added OpenSAML dependencies into projects.xml.
                     44840: Added a valid certificate to the saml.keystore.jks, as the certificate was expired.
                     
                     44856: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_SAML1: (CLOUD-1103)
                     44857: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_SAML1: (CLOUD-1103)
                     44858: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_SAML1: (CLOUD-1103)
                     44859: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_SAML1: (CLOUD-1103)
                     44860: (RECORD ONLY) Fix pesky solrcore.properties
                     
                     44896: Cloud SAML: minor comments/descriptor updates for SAML config admin (CLOUD-1051 & CLOUD-1052)
                     44915: Fixed CLOUD-1111 "SAML: Share UI - allow /share/{network} as a SAML entry point (if network is SAML-enabled)"
                     44919: Removed unecessary url encoding of sso & slo urls in json response
                     44926: WIP commit for CLOUD-1085 "SAML: Share UI - new page/form for SAML config settings (accessible by Network Admin)"
                     44934: Cloud SAML: CLOUD-1088 - SLO (SingleLogOut) - Repo REST/Service (WIP)
                     44948: Cloud SAML: CLOUD-1088 - SLO (SingleLogOut) - Repo REST/Service (WIP)
                     45027: Fixed CLOUD-1111 "SAML: Share UI - allow /share/{network} as a SAML entry point (if network is SAML-enabled)" part 2
                          - Is now triggered for urls w a trailing slash after the network name, i.e. /share/alfresco.com/
                     45036: Cloud SAML: CLOUD-1088 - SLO (SingleLogOut) - Repo REST/Service
                     45058: CLOUD-1051, CLOUD-1052: Added functionalities to store java certificate as content in order to make OpenSAML to validate IdP's signature dynamically.
                     45067: First cut of CLOUD-1051, CLOUD-1052, check-in, included the wrong classes. Added the correct files now.
                     45087: CLOUD-1085 "SAML: Share UI - new page/form for SAML config settings (accessible by Network Admin)" - WIP
                     45143: CLOUD-1052: added functionalities to SAMLConfigAdmin to return the certificate status and expiration date. Also fixed SAMLConfigAdmin update bug.
                     45151: Fixed saml-config-admin-get template.
                     45173: Cloud SAML:  lowercase userId/emailAddress (for SAML requests/responses)
                     45206: Cloud SAML: CLOUD-1088 - SLO (SingleLogOut) - Repo REST/Service
                     45229: CLOUD-1090 "SAML: SLO (SingleLogOut) - Share UI - Logout (SP-initiated)" - WIP
                     45240: CLOUD-1051: Added functionalities to handle multipart form-data submitted by SAML Config Admin screen.
                     45262: Cloud SAML: CLOUD-1129 - SLO - use "session index" (from original SSO) in logout request
                     45269: Added edit-cancel-16.png icon
                     45270: CLOUD-1085 "SAML: Share UI - new page/form for SAML config settings (accessible by Network Admin)"
                     45276: CLOUD-1090 "SAML: SLO (SingleLogOut) - Share UI - Logout (SP-initiated)"
                     45279: Adding common download file icon
                     45280: CLOUD-1085 "SAML: Share UI - new page/form for SAML config settings (accessible by Network Admin)"
                     45281: Cloud SAML: CLOUD-1088 - Repo REST/Services for SLO - fix to invalidate user's current ticket ...
                     45284: CLOUD-1146: Upgraded commons-codec from 1.4 to 1.5
                     45285: Fix pesky solrcore.properties
                     45288: CLOUD-1146: Upgraded commons-codec from 1.4 to 1.5
                     45305: Cloud SAML: CLOUD-1088 - Repo REST/Services for SLO - check SAML logout response (status code) and throw exception
                     45311: CLOUD-1051: Added functionalities to support DER-formatted certificate upload.
                     45314: Prepared config admin screen download links to use the attached header, so they become proper download links (rather than "view in browser" links)
                     45320: Updating certificate input field label after request form Jamal to "Upload to IdP certificate"
                     45321: Fine tuning the certificate label for Jamal, hopefully he's happy with this version :-)
                     45322: CLOUD-1112 "SAML: Share UI: updated profile page - to explain to user's that they're entering an Alfresco password"
                     45327: CLOUD-1113 "SAML: Share UI - updated Change Password page"
                     45341: Cloud SAML: CLOUD-770 / CLOUD-1159 - Repo Services - new user login direct to profile page (not using email link)
                     45353: CLOUD-1085 "SAML: Share UI - new page/form for SAML config settings (accessible by Network Admin)"
                          - Added additional field for IDP initiated logout request
                          - Refactored field name for SP initiated logout request
                     45365: Cloud SAML: CLOUD-770 / CLOUD-1159 - Repo Services - new user login direct to profile page (not using email link)
                     45372: CLOUD-1109 "SAML: Share UI - New user - login + profile page (without requiring a signup/invite email link)"
                     45374: Cloud SAML: CLOUD-770 / CLOUD-1159 - Repo Services - new user login direct to profile page (not using email link)
                     45377: CLOUD-1052: Fixed enable/disable SAML SSO config page for an existing SAML setup.
                     45390: CLOUD-1051, CLOUD-1052: Added support for IdP SLO response URL. Also, renamed idpSloURL to be idpSloRequestURL.
                     45391: Cloud SAML: CLOUD-1158 - Repo-side to allow SP cert/metadata links to be downloaded rather than just viewed (in Share)
                     45403: Refactored urls before implementing idp initiated logouts to avoid name clashes
                     45429: CLOUD-1128 "SAML: SLO (SingleLogOut) - Share UI - handle SAML logout request (IdP-initated)"
                          - Note! Share SAML SP Service urls have been changed and needs to be (re)configured in the IDP:
                             * Assertion Consumer Service URL 
                               - Endpoint URL: /share/alfresco.com/saml/authnresponse (POST)
                             * SLO Service URLs 
                               - Endpoint URL: /share/alfresco.com/saml/logoutrequest (POST) 
                               - Response URL: /share/alfresco.com/saml/logoutresponse (POST)
                     45433: CLOUD-1069 "SAML: draft text for Network Admin screen - field names / "i"nfo pop-up"
                     45464: Improved error test for saml settings screen.
                     45465: CLOUD-1135 "SAML: SLO (SingleLogOut) - Share UI - error/warning page if SLO fails unexpectedly" part 1 of 2
                     45490: CLOUD-1181: Fixed IdP initiated SLO, by adding RelayState.
                     45492: Message component improvements and a generic guest message page
                     45493: CLOUD-1135 "SAML: SLO (SingleLogOut) - Share UI - error/warning page if SLO fails unexpectedly" part 2 of 2
                     45524: Cloud SAML: CLOUD-1191 - initial fix for SLO error (affects PingFederate, not OpenAM) due to multiple sessionIndexes
                     45552: Making callback pattern consistent with the pattern that should be used in all other multipart webscripts
                     45639: Cloud SAML: CLOUD-1192 - Improve Repo INFO logging - eg. also show Assertion ID (as requested by customer/partner)
                     45647: CLOUD-1091: Changed SAML keystore loading functionalities, to use existing alf keystore.
                     45684: CLOUD-1213: Added support for Network-Specific SP entityID. 
                     45704: Cloud SAML: CLOUD-1209 - SLO failure after directly activating a new user (ie. login + complete profile)
                47164: Fix SVN merge
                47168: Fix merge/test
                47250: Fix merge issue (remove unwanted files)
                47444: Fixes: CLOUD-1397: Incorrectly encoded copyright messages.
                47462: Merged BRANCHES/DEV/FEATURES/CLOUD1_SAML1 to BRANCHES/DEV/CLOUD1:
                     47461: Share fix for: CLOUD-1399: Check tenant is SAML enabled before getting IDP details
                47467: Repo fix for: CLOUD-1399: Reduce ERROR/stacktrace to one line WARN if non-SAML enabled network tries to access repo saml web script
                47502: Fixes CLOUD-1397: corrects copyright encoding in Share footer.
   48319: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: (already up-to-date - effectively a record-only)
        47403: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             42199: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/CLOUD1:
                  41113: Creating new [bug fix] branch from BRANCHES/DEV/CLOUD1
                  41211: QuickShare: CLOUD-593: prevent copying of QuickShare props on node copy [+ minor refactor]
                  41612: QuickShare: Merged form THOR1_QUICK_SHARE to CLOUD1-BUG-FIX
                     36363: QuickShare: Improvment for THOR-1268 "F378: As a user I can choose to share a document"
                  41639: QuickShare: Fixed bug where the display of quickshare was based on the showComments property
   48320: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: (no changes)
        47404: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             42204: Merged BRANCHES/DEV/HEAD_QUICK_SHARE_TMP to BRANCHES/DEV/CLOUD1:
                  41733: QuickShare: fix ShareContentGet NPE (fix for Document Details redirect if logged in)
   48324: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47453: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             44059: Merged BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2 to BRANCHES/DEV/CLOUD1:
                  43797: Merged BRANCHES/DEV/FEATURES/CLOUD1_SOLR to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       42526: Merged BRANCHES/DEV/V4.0-BUG-FIX, BRANCHES/V4.1, BRANCHES/DEV/4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_SOLR for CLOUD-798
                             V4.0-BUG_FIX
                                 36393: Final part of ALF-13723 SOLR does not include the same query unit tests as lucene
                                 36434: Test fix for ALF-13723 SOLR does not include the same query unit tests as lucene
                                 36608: First part of ALF-14209 SOLR - does not support query for all stores
                                 36676: Fix for ALF-14216 Solr Exception when you try to sort folders or files by size.
                                 36954: ALF-14209 SOLR - does not support query for all stores
                                 37075: Fix for ALF-14267 SOLR index check - First transaction time used instead of first ACL time - indexCheck, checkInitialState
                                 37135: Fix for ALF-13993 It fails to find documents whose tag is longer than 255 characters
                                 37253: Fix for ALF-13634 Re-created category won't show up again on a node in Document Library.
                                 37384: Fix for ALF-14219 SolrQueryHTTPClient unable to handle long queries (4096 bytes)
                                 37628: Build Fix
                                 37749: Fix for ALF-14582 SOLR tracking allows incompatible model changed to the current index to be made
                                 37863: Fix for ALF-14631 Extraneous Backslash in Solr Configuration File
                                 37896: Fix for ALF-14582 SOLR tracking allows incompatible model changed to the current index to be made
                                 38008: Fix for ALF-14042 Customisable Alfresco contextPath in Alfresco AbstractHttpClient (used e.g. by Solr CoreTracker)
                                 38010: Fix for ALF-14686 https://localhost:8443/solr/admin/cores?action=CHECK - checks the index - it should check the cache
                             V4.1
                                 38179: Fix for ALF-14620 SOLR searches run by system user in archive store return fewer results than for admin user
                             V4.1-BUG-FIX
                                 40401: Part for for ALF-15406 Index Tracker seems not to gracefully stop upon shutdown keeping all other threads in waiting
                                 41201: Fix for ALF-15767 Group query using cm:authorityName
                                 41202: Additional unit tests related to ALF-15731  TYPE:"..." queries no longer work for Lucene on 4.X
                                 41203: Part 1 for ALF-15811 SOLR query increases DocBitSet inefficiently
                                 41210: Part 2:  ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                 41303: Fix for ALF-15799 Under high concurrency load balanced Solr throws an Antlr related NPE
                                 41322: Fix for ALF-15858 SOLR ACL tracking can stall or miss acls during tracking
                                 41323: Chemistry client java to create test data for ALF-15858, ALF-15782, CLOUD-596, ALF-15753 etc
                                 41487: Fix for ALF-15910 SOLR - Add index warming and filter pointless entries from the filter cache
                                        Fix for ALF-15851 Too many live instances of SolrIndexSearcher at one time resulting in OOM - Alfresco 4.1.1 - build 151
                                 41730: Fix for ALF-15995 NodeRef is missing in log on "Problem converting to Freemarker" error
                                 41747: Fix for ALF-15811 SOLR query increases DocBitSet inefficiently
                                        Part of ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                 41748: Fix for ALF-15950 Solr: throws NPE: org.alfresco.solr.SolrLuceneAnalyser.loadAnalyzer
                                 41752: Fix for ALF-13634 Re-created category won't show up again on a node in Document Library.
                                 41940: Fix for ALF-16086 SOLR tracking does not include transformation status etc (error in header name)
                                 42136: Last SOLR side update for ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                 42143: In-memory bridge table for ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                 42183: Build fix - unit test runs in 64M - for all the washing machines out there ....
                       42547: Fix the model used for embedded tests.
                       42659: Add missing test model
                       42663: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_SOLR
                             42612: Further fix for ALF-16164 Cloud monitoring of SOLR is CPU intensive due to its repeated use of the SOLR stats page 
                             42657: Fix for     ALF-16359 Fix SOLR logging in production and other environments 
                       42660: (RECORD ONLY) Merged DEV/CLOUD1 to DEV/FEATURES/CLOUD_SOLR
                             working copy sync r42514 through r42659
                  43799: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       42377: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX:
                            42363: ALF-16213: renaming versioned file results in file being deleted.
                       42411: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX:
                            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
                       42428: ALF-16217: Remove unnecessary restriction on content type
                       42432: CLOUD-795: Optimise activities feed: rollup multiple (WebDAV) document adds/deletes into a single activity
                  43802: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       42559: Merged BRANCHES/DEV/CLOUD1_SPRINT1/ to BRANCHES/DEV/CLOUD1-BUG-FIX:
                            42548: CLOUD-712: Ensure that all CSS files are loaded in IE (latest Spring Surf libs r1170)
                       42565: CLOUD-837: TenantContentUsageImpl does not handle failed lock
                  43811: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       42570: CLOUD-810: ""emailFeedDisabled" in person JSON needs to be called "emailNotificationsEnabled""
                  43813: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       42572: CLOUD-794: "Activities should be posted for CMIS (to enable both Public API + Mobile clients)"
                       42576: CLOUD-842: Activities Feed: post lookup - job lock + max items per cycle
                       42579: CLOUD-846: Minor optimisation for Site lookup (for a nodeRef)
                  43814: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       42609: CLOUD-712: Updated Surf libs (r1171) to change the number of @import statements supported by each <style> element in IE from 32 to 31
                  43815: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       42694: Fix build (merge issues) + fixes for CLOUD-839: "Activities Are Not Posted For Ratings", CLOUD-860: "Content Created With CMIS Cannot be Rated" and CLOUD-397: "The JSON response of the networks request is incorrect"
                  43816: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       42737: CLOUD-463: Now checks if the current user has read permission for the shared node, before displaying "Document Details" button.
                       42847: CLOUD-794: "Activities should be posted for CMIS (to enable both Public API + Mobile clients)"
                       42868: Fix failing build tests + further/revised public api tests
                       42875: CLOUD-869: "Remove cmiscustom types from the CMIS dictionary"   
                       42884: ALF-1059 / CLOUD-469: Post activities for folder(s) add + delete
                       42899: Fix build
                  43817: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       42950: CLOUD-726: Ensure that i18n messages fall back to properties defined by less specific locale files (updated Surf libs: 1174)
                  43818: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       43138: Fixed CLOUD-491 "'New Folder' form is not displayed on IE7, IE8"
                       43234: CLOUD-313: Implment Transport pooling in email sender.
                       43349: Fix CLOUD-918: Failed to delete folder via Folder Details page
                       43351: Fix CLOUD-905 - activity for Share folder delete are not displayed (OK via WebDAV)
                       43440: CLOUD-928: Cope with missing shredId attributes, due to the copying of QuickShare properties, prior to CLOUD-593 
                       43451: Merged HEAD to BRANCHES/DEV/CLOUD1-BUG-FIX:
                            43449: ALF-16669: removing a site member may break the activity feed (CLOUD-931)   
                  43819: Fix merge error
                  43820: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       43465: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)"
                  43821: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       43477: Merged HEAD to BRANCHES/DEV/CLOUD1-BUG-FIX:
                            39205: Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD 
                               39084: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.1-BUG-FIX 
                               39081: Fix for ALF-6139 and ALF-13959 - Incomplete site creation issues - latest Surf libs and related changes to allow atomic creation of multiple Surf objects in a single REST call. Originally authored by Dave Ward for 3.2 - now migrated to SpringSurf. Implemented ADMRemoteStore changes for above change to apply to 4.0.
                       43488: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)"
                  43822: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       43537: ALF-16706: CLONE - POI becoming irresponsive and causing jvm to freeze with XLS that includes fraction formats 
                            43520: ALF-16694 POI becoming irresponsive and causing jvm to freeze for a while with certain XLS (fraction formats)
                               - Patched POI to:
                                 - limit the length of fractions to four digits (more than that takes too long to process) e.g. "# #/#####" is too long and will be reduced to "# #/####" which still takes about a second!
                                 - handle the -ve fraction format part (i.e. n in p;n;z), so its length is not interpret as part of the fraction format of the +ve fraction part.
                                 - handle custom formats a bit better (strip them) rather than interpret the text length as part of the fraction format
                                 - handle -ve fractions (just did not work)
                                 - limitations:
                                   - custom text gets stripped (still better than before)
                                   - formats that have p (+ve) and n (-ve) parts must include a fraction format in each part. Otherwise +ve and -ve values are not formatted as a fraction (still better than before)
                       43564: CLOUD-939: <Record Only>
                            43558: ALF-16694 POI becoming irresponsive and causing jvm to freeze with XLS that includes fraction formats
                               - Original jar did not get removed in previous commit
                               << NO NEED TO MERGE TO CLOUD1-BUG-FIX as there was a tree conflict and the original jar was removed. >>
                  43823: Fix merge error
                  43824: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       43579: Public api test, fix intermittent test failures (hopefully)
                       43721: CLOUD-935: Update thor override of remoteadm.post.desc.xml
                       43726: PUBLICAPI-11: "Extract metadata needs to be called after uploading new content via CMIS"
                  43828: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       43728: Merged BRANCHES/DEV/AMILLER/CLOUD1 to BRANCHES/DEV/CLOUD1-BUG-FIX:
                            38211: CLOUD-115 - Remove Network Admins on downgrade to free/public
                  43829: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       43731: Resolve CLOUD-965: A known config which has been tested can be modified when deploying to production
                       43733: PUBLICAPI-11: "Extract metadata needs to be called after uploading new content via CMIS"
                       43762: Fix the build
                  43830: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       43788: CLOUD-942: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX:
                            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
                            40112: ALF-9254: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1)
                                 40111: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration
                                    - Patched jooconverter to handle non western characters in text files, by using the same properties that JOD uses.
                                 40073: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration
                                    - Refactored JodContentTransformer and OpenOfficeContentTransformerWorker. Moved common code into OOoContentTransformerHelper,
                                      including fixes that existed on only one or the other.
                                    - For text files, change file encoding from SHIT JIS (and others) to UFT-8, as OpenOffice/LibreOffice do not support this as
                                      an input. They do support it in other file types but not text. JOD now works, but OOo still has problems.
                       43789: CLOUD-942: Add mergeinfo, missed by initial commit from Cornerstone. 
                  43831: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       43488: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)"
                  43832: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       43762: Fix the build
                  43833: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       42692: (RECORD ONLY) Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1-BUG-FIX:
                            40859: public api:
                            40862: CLOUD-555: "Updating comment fails because node not found"
                            40961: CLOUD-566: "Site object shouldn't contain the "sitePreset" property"
                            40979: Added tests for non-numeric params and non-european characters
                            41030: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/THOR1_REST_API2:
                                 41027: ALF-15193: "Folder Is Not a Folder CmisInvalidArgumentException thrown when using cmis:objectId"
                            41097: Added quickshare and cloudsync to cmis filter list
                            41098: Renamed serializer/deserializer lists for RestJsonModule
                            41099: Cleaned up consistent Rest responses - CLOUD-574
                            41100: Meta info webscript is disabled because its not been reviewed / in the correct format
                            41104: Meta info webscript is really disabled because its not been reviewed / in the correct format
                            41105: Added key for trusted layer7 relationship
                            41137: Public api:
                            41146: Fix trusted authentication against OpenCMIS
                            41168: Public apI;
                            41169: CLOUD-565: "API / URL returns a "tenant required" error"
                            41170: public api:
                            41171: public api:
                            41172: public api:
                            41183: CLOUD-598: "API: "GET network" response has unnecessary JSON nesting"
                            41186: Fix solrcore properties
                            41191: Fix for OpenCMIS trusted authentication to allow local opencmis access as before
                            41282: CLOUD-616: "CMIS API: Repository names should be more descriptive"
                            41283: CLOUD-601: "API /networkId/public/cmis/versions/ returns a 400"
                            41325: Public api:
                            41367: CLOUD-636: "REST API: Nodes: Tags: Not allowed DELETE method proceeds with status 204"
                            41369: Public api:
                            41422: Sample OAuth call for the Resource Owner Password flow
                            41427: Sample OAuth call for the Client Credentials flow
                            41433: Public api: (1) parameterize site members/people sorting in service api
                            41434: Public api: minor comment service fix
                            41438: CLOUD-629: "REST API: It is possible to add a comment to comment"
                            41439: Public api: fix for default tenant id in CMIS requests
                            41449: CLOUD-629: "REST API: It is possible to add a comment to comment"
                            41456: CLOUD-644: "Performing a Checkout in OpenCMIS Results in an Exception in the Share Doc Library"
                            41457: Fix build
                            41461: Public api: more tests
                            41521: CLOUD-660: "GET favourite sites results in exception when skipCount is greater than number of items"
                            41606: Fix for CLOUD-668 - POSTing to a relationship by id now returns an InvalidArgumentException
                            41607: CLOUD-668 : changed ordering so errors fire in correct order.
                            41628: Public api: more tests
                            41672: CLOUD-672: "404 Error when browsing child files/folder "
                            41673: Public api: more tests
                            41675: CLOUD-674: "Root network calls need to return application/json content type"
                            41790: CLOUD-629: "REST API: It is possible to add a comment to comment"
                            41791: CLOUD-629: "REST API: It is possible to add a comment to comment"
                            41793: CLOUD-629: "REST API: It is possible to add a comment to comment"
                            41823: Public api: more tests
                            41825: Fix for CLOUD-684 - wraps the list, not sure if I like the paging
                            41853: CLOUD-700: "The mobile SDK needs a way to map an accessToken to a user identifier"
                            41867: CLOUD-711: "It should be possible to remove a favourite site"
                            41957: Public api: - error handling improvements - more tests
                            41970: Public api: - fix build  (add missing files)
                            41972: Public api: - more tests (including OpenCMIS TCK)
                            42046: Added some debug timings.  Enabled using log4j.logger.org.alfresco.rest.framework.webscripts=debug
                            42058: Public api: changed logging package name
                            42124: Public api: - more tests - minor fixes
                            42125: CLOUD-734: "CMIS: Query Issues Discovered During Testing"
                            42126: Public api: fix up OpenCMIS tests
                            42171: Consistency fix for CLOUD-695.
                            42180: Fix build
                            42181: CLOUD-695 "Requests to un-implemented urls do not consistently return http status 405 (Method not allowed)": fix up public api tests
                            42214: Public api tests (cmis)
                            42251: Changed the serializer for embedded entities, (related to CLOUD-746)
                            42253: Fix build
                       42735: (RECORD ONLY) Fix build (fix merge error)
                  43834: Merged BRANCHES/DEV/FEATURES/CLOUD1_GOOGLEDOCS to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       43702: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder
                       43703: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder
                       43744: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder
                  43846: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       43840: [CLOUD-955] Add request header config to remove Origin Header in share proxy calls.
                  43855: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       41731: Fix for ALF-16002 - Dashlet - My Documents - I've recently modified - executes unlimited query. In SOLR unlimited (all sites query) is really unlimited, for Lucene it is not. Improved jscript Search debugging to correctly output limit value on query.
                  43881: Revert CLOUD-942: Reverse merge r43830 
                  43885: CLOUD-942: Reapply changes backed out in r43881 and Comment out faling unit tests.
                  43921: Resolve CLOUD-990: REGRESS: No items error is displayed on DocumentLibrary Page (for some files)
                  43924: Disable intermittent OpenCMIS tests
                  43925: Disable intermittent test
                  43952: CLOUD-993: Insure login button is shown when user isn't logged in.
                  43992: Resolve CLOUD-1001: REGRESS: New Application Theme and Logo are not applied after re-login
   48327: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47496: CONV: Fix build/tests - AVMLockingServiceTest testLockModification & AVMLockingServiceTest testGroupBasedLocking
        47505: Resolve 3rd party lib (commons-pool) issue within eclipse (ensure exported)
        47512: Fix build/tests
   48328: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47525: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             45271: Merged BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2 to BRANCHES/DEV/CLOUD1:
                  44289: PUBLICAPI-43: "CMIS endpoints need to report incorrect methods as a 405 error"
                  44707: PUBLICAPI-56: "Creating comments can fail intermittently"
                       - tests to follow
                  44742: CLOUD-1073: "Unable to upload documents intermittently"
                  45070: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: (PUBLICAPI-57)
                       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.
                  45168: CLOUD-1140: Activities PostLookup : "Skipping activity post 1234567"and occasionally "Exception during update of posts" (due to InvalidNodeRefException)
                  45169: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       45082: CLOUD-1139: Cloud feednotifier running on 2 boxes
   48333: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47530: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             45853: Merged BRANCHES/DEV/FEATURES/CLOUD1-EMAIL-REFRESH to BRANCHES/DEV/CLOUD1:
                  44041: Merged BRANCHES/DEV/CLOUD1_SPRINT1 to BRANCHES/DEV/FEATURES/CLOUD1-EMAIL-REFRESH:
                       40496: Merged from BRANCHES/DEV/AMILLER/CLOUD1_SPRINT_1 to BRANCHED/DEV/CLOUD1_SPRINT1
                            CLOUD-189: Created e-mail template macros and css lib files
                            CLOUD-189: E-mail template image assets
                            CLOUD-189: Updated macros and CSS lib plus finished site invitation template
                            CLOUD-189: Reset password e-mails
                            CLOUD-189: More e-mail templates
                            CLOUD-189: Workflow template
                            CLOUD-144: Refactor AbstractUserNotifier to allow custom models to be passed to template.
                            CLOUD-144: Custom activity feed model builder, for cloud.
                            CLOUD-144: Activities e-mail template
                       40958: CLOUD-580: Added alt text for images
                       40960: CLOUD-585: Added missing quotes to invitation e-mail
                       40967: CLOUD-144: Add joins aggregation to activites feed model and fix missed merge.
                       40970: CLOUD-144: Added joins to activities e-mail
                       40982: CLOUD-582: Fix subject
                       41028: CLOUD-582: Fix unit test assertion on email subject
                       41231: CLOUD-612: Add generation time to model.
                       41276: CLOUD-612: Added date to activity e-mail template
                       41279: CLOUD-614: Added missing footer text to activities e-mail
                       41502: CLOUD-611: Remove corner images
                       41728: CLOUD-681: Add others category to activities e-mail
                       42138: CLOUD-613: Remove exclusions from site activities, sort grouping by site name and improve logic for determining network.
                       42196: CLOUD-613: Group activities by site
                       42914: Translated e-mail templates
                  44174: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1-EMAIL-REFRESH:
                       43983: GERMAN: Translation updates based on EN r43703
                       43984: SPANISH: Translation updates based on EN r43703
                       43985: FRENCH: Translation updates based on EN r43703, includes file missing from previous commit.
                       43986: ITALIAN: Translation updates based on EN r43703.
                       43987: JAPANESE: Translation updates based on EN r43703.
                       43990: BDE-108: add workaround of http://jira.codehaus.org/browse/MNG-4979 in Maven Surefire configuration to be able to use JaCoCo easily
                       44024: JAPANESE: Translation updates based on EN r43703. Corrects files missing from previous commit.
                       44031: JAPANESE: Translation updates based on EN r43703. Corrects file missed from previous commit.
                       44032: GERMAN: Translation updates based on EN r43703. Corrects missing line break.
                       44059: Merged BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2 to BRANCHES/DEV/CLOUD1:
                            43797: Merged BRANCHES/DEV/FEATURES/CLOUD1_SOLR to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 42526: Merged BRANCHES/DEV/V4.0-BUG-FIX, BRANCHES/V4.1, BRANCHES/DEV/4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_SOLR for CLOUD-798
                                       V4.0-BUG_FIX
                                           36393: Final part of ALF-13723 SOLR does not include the same query unit tests as lucene
                                           36434: Test fix for ALF-13723 SOLR does not include the same query unit tests as lucene
                                           36608: First part of ALF-14209 SOLR - does not support query for all stores
                                           36676: Fix for ALF-14216 Solr Exception when you try to sort folders or files by size.
                                           36954: ALF-14209 SOLR - does not support query for all stores
                                           37075: Fix for ALF-14267 SOLR index check - First transaction time used instead of first ACL time - indexCheck, checkInitialState
                                           37135: Fix for ALF-13993 It fails to find documents whose tag is longer than 255 characters
                                           37253: Fix for ALF-13634 Re-created category won't show up again on a node in Document Library.
                                           37384: Fix for ALF-14219 SolrQueryHTTPClient unable to handle long queries (4096 bytes)
                                           37628: Build Fix
                                           37749: Fix for ALF-14582 SOLR tracking allows incompatible model changed to the current index to be made
                                           37863: Fix for ALF-14631 Extraneous Backslash in Solr Configuration File
                                           37896: Fix for ALF-14582 SOLR tracking allows incompatible model changed to the current index to be made
                                           38008: Fix for ALF-14042 Customisable Alfresco contextPath in Alfresco AbstractHttpClient (used e.g. by Solr CoreTracker)
                                           38010: Fix for ALF-14686 https://localhost:8443/solr/admin/cores?action=CHECK - checks the index - it should check the cache
                                       V4.1
                                           38179: Fix for ALF-14620 SOLR searches run by system user in archive store return fewer results than for admin user
                                       V4.1-BUG-FIX
                                           40401: Part for for ALF-15406 Index Tracker seems not to gracefully stop upon shutdown keeping all other threads in waiting
                                           41201: Fix for ALF-15767 Group query using cm:authorityName
                                           41202: Additional unit tests related to ALF-15731  TYPE:"..." queries no longer work for Lucene on 4.X
                                           41203: Part 1 for ALF-15811 SOLR query increases DocBitSet inefficiently
                                           41210: Part 2:  ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                           41303: Fix for ALF-15799 Under high concurrency load balanced Solr throws an Antlr related NPE
                                           41322: Fix for ALF-15858 SOLR ACL tracking can stall or miss acls during tracking
                                           41323: Chemistry client java to create test data for ALF-15858, ALF-15782, CLOUD-596, ALF-15753 etc
                                           41487: Fix for ALF-15910 SOLR - Add index warming and filter pointless entries from the filter cache
                                                  Fix for ALF-15851 Too many live instances of SolrIndexSearcher at one time resulting in OOM - Alfresco 4.1.1 - build 151
                                           41730: Fix for ALF-15995 NodeRef is missing in log on "Problem converting to Freemarker" error
                                           41747: Fix for ALF-15811 SOLR query increases DocBitSet inefficiently
                                                  Part of ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                           41748: Fix for ALF-15950 Solr: throws NPE: org.alfresco.solr.SolrLuceneAnalyser.loadAnalyzer
                                           41752: Fix for ALF-13634 Re-created category won't show up again on a node in Document Library.
                                           41940: Fix for ALF-16086 SOLR tracking does not include transformation status etc (error in header name)
                                           42136: Last SOLR side update for ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                           42143: In-memory bridge table for ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                           42183: Build fix - unit test runs in 64M - for all the washing machines out there ....
                                 42547: Fix the model used for embedded tests.
                                 42659: Add missing test model
                                 42663: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_SOLR
                                       42612: Further fix for ALF-16164 Cloud monitoring of SOLR is CPU intensive due to its repeated use of the SOLR stats page 
                                       42657: Fix for     ALF-16359 Fix SOLR logging in production and other environments 
                                 42660: (RECORD ONLY) Merged DEV/CLOUD1 to DEV/FEATURES/CLOUD_SOLR
                                       working copy sync r42514 through r42659
                            43799: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 42377: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                      42363: ALF-16213: renaming versioned file results in file being deleted.
                                 42411: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                      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
                                 42428: ALF-16217: Remove unnecessary restriction on content type
                                 42432: CLOUD-795: Optimise activities feed: rollup multiple (WebDAV) document adds/deletes into a single activity
                            43802: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 42559: Merged BRANCHES/DEV/CLOUD1_SPRINT1/ to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                      42548: CLOUD-712: Ensure that all CSS files are loaded in IE (latest Spring Surf libs r1170)
                                 42565: CLOUD-837: TenantContentUsageImpl does not handle failed lock
                            43811: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 42570: CLOUD-810: ""emailFeedDisabled" in person JSON needs to be called "emailNotificationsEnabled""
                            43813: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 42572: CLOUD-794: "Activities should be posted for CMIS (to enable both Public API + Mobile clients)"
                                 42576: CLOUD-842: Activities Feed: post lookup - job lock + max items per cycle
                                 42579: CLOUD-846: Minor optimisation for Site lookup (for a nodeRef)
                            43814: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 42609: CLOUD-712: Updated Surf libs (r1171) to change the number of @import statements supported by each <style> element in IE from 32 to 31
                            43815: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 42694: Fix build (merge issues) + fixes for CLOUD-839: "Activities Are Not Posted For Ratings", CLOUD-860: "Content Created With CMIS Cannot be Rated" and CLOUD-397: "The JSON response of the networks request is incorrect"
                            43816: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 42737: CLOUD-463: Now checks if the current user has read permission for the shared node, before displaying "Document Details" button.
                                 42847: CLOUD-794: "Activities should be posted for CMIS (to enable both Public API + Mobile clients)"
                                 42868: Fix failing build tests + further/revised public api tests
                                 42875: CLOUD-869: "Remove cmiscustom types from the CMIS dictionary"   
                                 42884: ALF-1059 / CLOUD-469: Post activities for folder(s) add + delete
                                 42899: Fix build
                            43817: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 42950: CLOUD-726: Ensure that i18n messages fall back to properties defined by less specific locale files (updated Surf libs: 1174)
                            43818: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 43138: Fixed CLOUD-491 "'New Folder' form is not displayed on IE7, IE8"
                                 43234: CLOUD-313: Implment Transport pooling in email sender.
                                 43349: Fix CLOUD-918: Failed to delete folder via Folder Details page
                                 43351: Fix CLOUD-905 - activity for Share folder delete are not displayed (OK via WebDAV)
                                 43440: CLOUD-928: Cope with missing shredId attributes, due to the copying of QuickShare properties, prior to CLOUD-593 
                                 43451: Merged HEAD to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                      43449: ALF-16669: removing a site member may break the activity feed (CLOUD-931)   
                            43819: Fix merge error
                            43820: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 43465: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)"
                            43821: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 43477: Merged HEAD to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                      39205: Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD 
                                         39084: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.1-BUG-FIX 
                                         39081: Fix for ALF-6139 and ALF-13959 - Incomplete site creation issues - latest Surf libs and related changes to allow atomic creation of multiple Surf objects in a single REST call. Originally authored by Dave Ward for 3.2 - now migrated to SpringSurf. Implemented ADMRemoteStore changes for above change to apply to 4.0.
                                 43488: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)"
                            43822: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 43537: ALF-16706: CLONE - POI becoming irresponsive and causing jvm to freeze with XLS that includes fraction formats 
                                      43520: ALF-16694 POI becoming irresponsive and causing jvm to freeze for a while with certain XLS (fraction formats)
                                         - Patched POI to:
                                           - limit the length of fractions to four digits (more than that takes too long to process) e.g. "# #/#####" is too long and will be reduced to "# #/####" which still takes about a second!
                                           - handle the -ve fraction format part (i.e. n in p;n;z), so its length is not interpret as part of the fraction format of the +ve fraction part.
                                           - handle custom formats a bit better (strip them) rather than interpret the text length as part of the fraction format
                                           - handle -ve fractions (just did not work)
                                           - limitations:
                                             - custom text gets stripped (still better than before)
                                             - formats that have p (+ve) and n (-ve) parts must include a fraction format in each part. Otherwise +ve and -ve values are not formatted as a fraction (still better than before)
                                 43564: CLOUD-939: <Record Only>
                                      43558: ALF-16694 POI becoming irresponsive and causing jvm to freeze with XLS that includes fraction formats
                                         - Original jar did not get removed in previous commit
                                         << NO NEED TO MERGE TO CLOUD1-BUG-FIX as there was a tree conflict and the original jar was removed. >>
                            43823: Fix merge error
                            43824: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 43579: Public api test, fix intermittent test failures (hopefully)
                                 43721: CLOUD-935: Update thor override of remoteadm.post.desc.xml
                                 43726: PUBLICAPI-11: "Extract metadata needs to be called after uploading new content via CMIS"
                            43828: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 43728: Merged BRANCHES/DEV/AMILLER/CLOUD1 to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                      38211: CLOUD-115 - Remove Network Admins on downgrade to free/public
                            43829: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 43731: Resolve CLOUD-965: A known config which has been tested can be modified when deploying to production
                                 43733: PUBLICAPI-11: "Extract metadata needs to be called after uploading new content via CMIS"
                                 43762: Fix the build
                            43830: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 43788: CLOUD-942: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                      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
                                      40112: ALF-9254: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1)
                                           40111: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration
                                              - Patched jooconverter to handle non western characters in text files, by using the same properties that JOD uses.
                                           40073: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration
                                              - Refactored JodContentTransformer and OpenOfficeContentTransformerWorker. Moved common code into OOoContentTransformerHelper,
                                                including fixes that existed on only one or the other.
                                              - For text files, change file encoding from SHIT JIS (and others) to UFT-8, as OpenOffice/LibreOffice do not support this as
                                                an input. They do support it in other file types but not text. JOD now works, but OOo still has problems.
                                 43789: CLOUD-942: Add mergeinfo, missed by initial commit from Cornerstone. 
                            43831: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 43488: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)"
                            43832: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 43762: Fix the build
                            43833: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 42692: (RECORD ONLY) Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                      40859: public api:
                                      40862: CLOUD-555: "Updating comment fails because node not found"
                                      40961: CLOUD-566: "Site object shouldn't contain the "sitePreset" property"
                                      40979: Added tests for non-numeric params and non-european characters
                                      41030: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/THOR1_REST_API2:
                                           41027: ALF-15193: "Folder Is Not a Folder CmisInvalidArgumentException thrown when using cmis:objectId"
                                      41097: Added quickshare and cloudsync to cmis filter list
                                      41098: Renamed serializer/deserializer lists for RestJsonModule
                                      41099: Cleaned up consistent Rest responses - CLOUD-574
                                      41100: Meta info webscript is disabled because its not been reviewed / in the correct format
                                      41104: Meta info webscript is really disabled because its not been reviewed / in the correct format
                                      41105: Added key for trusted layer7 relationship
                                      41137: Public api:
                                      41146: Fix trusted authentication against OpenCMIS
                                      41168: Public apI;
                                      41169: CLOUD-565: "API / URL returns a "tenant required" error"
                                      41170: public api:
                                      41171: public api:
                                      41172: public api:
                                      41183: CLOUD-598: "API: "GET network" response has unnecessary JSON nesting"
                                      41186: Fix solrcore properties
                                      41191: Fix for OpenCMIS trusted authentication to allow local opencmis access as before
                                      41282: CLOUD-616: "CMIS API: Repository names should be more descriptive"
                                      41283: CLOUD-601: "API /networkId/public/cmis/versions/ returns a 400"
                                      41325: Public api:
                                      41367: CLOUD-636: "REST API: Nodes: Tags: Not allowed DELETE method proceeds with status 204"
                                      41369: Public api:
                                      41422: Sample OAuth call for the Resource Owner Password flow
                                      41427: Sample OAuth call for the Client Credentials flow
                                      41433: Public api: (1) parameterize site members/people sorting in service api
                                      41434: Public api: minor comment service fix
                                      41438: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                      41439: Public api: fix for default tenant id in CMIS requests
                                      41449: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                      41456: CLOUD-644: "Performing a Checkout in OpenCMIS Results in an Exception in the Share Doc Library"
                                      41457: Fix build
                                      41461: Public api: more tests
                                      41521: CLOUD-660: "GET favourite sites results in exception when skipCount is greater than number of items"
                                      41606: Fix for CLOUD-668 - POSTing to a relationship by id now returns an InvalidArgumentException
                                      41607: CLOUD-668 : changed ordering so errors fire in correct order.
                                      41628: Public api: more tests
                                      41672: CLOUD-672: "404 Error when browsing child files/folder "
                                      41673: Public api: more tests
                                      41675: CLOUD-674: "Root network calls need to return application/json content type"
                                      41790: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                      41791: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                      41793: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                      41823: Public api: more tests
                                      41825: Fix for CLOUD-684 - wraps the list, not sure if I like the paging
                                      41853: CLOUD-700: "The mobile SDK needs a way to map an accessToken to a user identifier"
                                      41867: CLOUD-711: "It should be possible to remove a favourite site"
                                      41957: Public api: - error handling improvements - more tests
                                      41970: Public api: - fix build  (add missing files)
                                      41972: Public api: - more tests (including OpenCMIS TCK)
                                      42046: Added some debug timings.  Enabled using log4j.logger.org.alfresco.rest.framework.webscripts=debug
                                      42058: Public api: changed logging package name
                                      42124: Public api: - more tests - minor fixes
                                      42125: CLOUD-734: "CMIS: Query Issues Discovered During Testing"
                                      42126: Public api: fix up OpenCMIS tests
                                      42171: Consistency fix for CLOUD-695.
                                      42180: Fix build
                                      42181: CLOUD-695 "Requests to un-implemented urls do not consistently return http status 405 (Method not allowed)": fix up public api tests
                                      42214: Public api tests (cmis)
                                      42251: Changed the serializer for embedded entities, (related to CLOUD-746)
                                      42253: Fix build
                                 42735: (RECORD ONLY) Fix build (fix merge error)
                            43834: Merged BRANCHES/DEV/FEATURES/CLOUD1_GOOGLEDOCS to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 43702: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder
                                 43703: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder
                                 43744: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder
                            43846: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 43840: [CLOUD-955] Add request header config to remove Origin Header in share proxy calls.
                            43855: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 41731: Fix for ALF-16002 - Dashlet - My Documents - I've recently modified - executes unlimited query. In SOLR unlimited (all sites query) is really unlimited, for Lucene it is not. Improved jscript Search debugging to correctly output limit value on query.
                            43881: Revert CLOUD-942: Reverse merge r43830 
                            43885: CLOUD-942: Reapply changes backed out in r43881 and Comment out faling unit tests.
                            43921: Resolve CLOUD-990: REGRESS: No items error is displayed on DocumentLibrary Page (for some files)
                            43924: Disable intermittent OpenCMIS tests
                            43925: Disable intermittent test
                            43952: CLOUD-993: Insure login button is shown when user isn't logged in.
                            43992: Resolve CLOUD-1001: REGRESS: New Application Theme and Logo are not applied after re-login
                  44185: Merged BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE to BRANCHES/DEV/FEATURES/CLOUD1-EMAIL-REFRESH:
                       43021: CLOUD-803, CLOUD-487: Send localised e-mails
                       43024: CLOUD-486 - Choose UI language.
                       43085: CLOUD-803, CLOUD-487: Revert changes to pre-existing process(String, Object, Writer) method.
                       43086: CLOUD-803, CLOUD-487: Fix broken unit tests
                       43106: CLOUD-486 - Choose UI language.
                       43159: CLOUD-486 - Choose UI language.
                       43160: CLOUD-803, CLOUD-487: Fix broken unit tests
                       43182: CLOUD-803, CLOUD-487: Fix broken unit tests.
                       43230: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE:
                            42950: CLOUD-726: Ensure that i18n messages fall back to properties defined by less specific locale files (updated Surf libs: 1174)
                       43246: Bug fix for CLOUD-899.  Added if to catch null values.
                       43267: CLOUD-486 - Choose UI language.
                       43329: CLOUD-911 - Localization change is not working in the preference page from CLOUD-486 - Fixed by setting cookie path to /
                       43626: CLOUD-909 - Keep Email address when language changes
                       43631: CLOUD-909 - Keep Email address when language changes - Updated Spring Surf version
                       43704: Enables all currently cloud supported languages in Cloud specific config file
                       43723: CLOUD-486 - Fix right border of select options and add extra languages
                       43880: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE:
                            43879: FRENCH: Translation updates based on EN r43703
                       43965: CLOUD-486 - Add French, German, Spanish, Italian and Japanese for new fields and pages.
                       43988: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE:
                            43983: GERMAN: Translation updates based on EN r43703
                            43984: SPANISH: Translation updates based on EN r43703
                            43985: FRENCH: Translation updates based on EN r43703, includes file missing from previous commit.
                            43986: ITALIAN: Translation updates based on EN r43703.
                            43987: JAPANESE: Translation updates based on EN r43703.
                       44021: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE:
                            42871: GERMAN: Cloud Translation, based on r 42416
                            42879: SPANISH: Cloud Translation, based on r 42416
                            42890: ITALIAN: Cloud Translation, based on r 42416
                       44026: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE:
                            44024: JAPANESE: Translation updates based on EN r43703. Corrects files missing from previous commit.
                       44033: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE:
                            44031: JAPANESE: Translation updates based on EN r43703. Corrects file missed from previous commit.
                            44032: GERMAN: Translation updates based on EN r43703. Corrects missing line break.
                       44077: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE:
                            43721: CLOUD-935: Update thor override of remoteadm.post.desc.xml
                       44093: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE:
                            42867: CLOUD-71: add explicit schema number for workflow timers redeploy patch
                            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
                            43120: 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
                            43243: BDE-73: Fork for each test, otherwise some fail because of previous test leftovers
                            43323: Merged BRANCHES/DEV/FEATURES/CLOUD1_GRANULARPERMISSIONS1 to BRANCHES/DEV/CLOUD1:
                                 42257: CLOUD-649: Updates UI action for Granular Permissions
                                 42295: CLOUD-33: Updates labels
                                 42303: CLOUD-651: Limit user search to site members only.
                                 42352: CLOUD-780: Adds a rolesWhitelist to only display those roles that are allowed. Currently set to: ["Consumer", "Contributor", "Collaborator"]. This is only used in the site view. The Repository view behaviour has not changed.
                                 42427: Removes multi-select manage-permissions dialogue.
                                 42520: CLOUD-802: Change the way the user is returned to the previous page to work around suspected Chrome bug.
                                 42604: CLOUD-840: Automatically add SiteManger permisions when inheritAll is switched off. Pervent remaoval of siteManager authority.
                                 42606: Fixed CLOUD-840 "Granular Permissions: Site Manager should retain access when inherit permissions is turned off"
                                 42807: CLOUD-863: Reordered code to avoid AccessDeniedException
                                 43259: CLOUD-901: Revert showComments check so it handles undefined permission
                                 43266: CLOUD-900: Old Manage permissions form is opened via Permissions panel
                                 43307: CLOUD-900: Follow-up fix
                            43353: Fix for remote transform server with new cloud environment
                            43457: Merged BRANCHES/DEV/FEATURES/CLOUD1_GOOGLEDOCS to BRANCHES/DEV/CLOUD1:
                                 39869: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_GOOGLEDOCS:
                                      Merged /integrations/GoogleDocs/BRANCHES/THOR1_SPRINTS_GOOGLEDOCS to BRANCHES/V4.1   
                                        36307 Fixed THOR-1402 "Need a callback option for Create Content menu"
                                           - Will be revisited to add better comments
                                        36350 Fixed THOR-1402 "Need a callback option for Create Content menu" part 2
                                           - Changed callback obj to match action object better: { nodeRef, node, jsNode }
                                           - Better code documentation
                                           - Removed dev/test code
                                           - Improved error config handling
                                        36358 THOR-1402 "Need a callback option for Create Content menu" part 3
                                           - Changed "link" parameter to "href" (instead of "page") to match actions.
                                        39256 Consistency fix of doclib & repo toolbar templates after work on THOR-1402
                                        39260 Bugfix for "destination" parameter not being resolved correctly THOR-1402
                                 39875: Configurtion changes to enable Google Docs V2 within the web tier.
                                 39881: It's extension ... not extention
                                 39938: Update CLOUD1_GOOGLEDOCS ant build to include installing googledocs amp files
                                 39944: CLOUD-437: Ensure that custom doclib action resources are requested after documentlist.js
                                 40468: Alfresco GoogleDocs AMPS.  Fixes for [GOOGLEDOCS-73], [GOOGLEDOCS-70], [GOOGLEDOCS-75], [GOOGLEDOCS-76]
                                 40624: Update Google Docs AMPs
                                 40635: Merge Google Docs Cloud AMPS to Feature Branchs
                                 40824: Update Google Docs AMPS, fixing [GOOGLEDOCS-79]
                                 40897: Google Docs AMP update 
                                 41165: Merge Updated AMPs for [GOOGLEDOCS-83]
                                 41179: Update AMPs for [GOOGLEDOCS-87]
                                 41262: Update AMPs for GOOGLEDOCS-89
                                 41493: Update AMPs for [GOOGLEDOCS-93]
                                 41635: AMP update for [GOOLGEDOCS-98] [GOOGLEDOCS-99] [GOOGLEDOCS-100]
                                 41805: Update AMPs for [GOOGLEDOCS-101]
                                 41840: Add AMPs with i18n strings
                                 43316: (RECORD ONLY) Rebase CLOUD1_GOOGLEDOCS with CLOUD1
                                 43317: (RECORD ONLY) Re-merge build.properties and projects.xml to include googledocs amps in build
                                 43320: Add googledocs repo declaration
                            43538: Fix pesky solrcore.properties ... remove hardcoded amiller ;-)
                            43605: Merged BRANCHES/DEV/FEATURES/CLOUD1_TRIAL_NETWORK to BRANCHES/DEV/CLOUD1:
                                 43033: Merged BRANCHES/DEV/AMILLER/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_TRIAL_NETWORK:
                                      39313: CLOUD-194: Add new trial network account type.
                                      39332: CLOUD-194: Add translation for new network account type.
                                 43218: CLOUD-194: Change Trail Network subscription level to Enterprise
                            43658: Merged HEAD to BRANCHES/DEV/CLOUD1:
                                 43655: BDE-73: exclude more failing tests which are never run
                                 43653: BDE-73: tune surefire config to make it pass with Sonar 3.3
                            43752: Merged HEAD to CLOUD1
                                 BDE-73: Repair coverage report, broken since Sonar upgrade   
                            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.
                            43990: BDE-108: add workaround of http://jira.codehaus.org/browse/MNG-4979 in Maven Surefire configuration to be able to use JaCoCo easily
                            44059: Merged BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2 to BRANCHES/DEV/CLOUD1:
                                 43797: Merged BRANCHES/DEV/FEATURES/CLOUD1_SOLR to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                      42526: Merged BRANCHES/DEV/V4.0-BUG-FIX, BRANCHES/V4.1, BRANCHES/DEV/4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_SOLR for CLOUD-798
                                            V4.0-BUG_FIX
                                                36393: Final part of ALF-13723 SOLR does not include the same query unit tests as lucene
                                                36434: Test fix for ALF-13723 SOLR does not include the same query unit tests as lucene
                                                36608: First part of ALF-14209 SOLR - does not support query for all stores
                                                36676: Fix for ALF-14216 Solr Exception when you try to sort folders or files by size.
                                                36954: ALF-14209 SOLR - does not support query for all stores
                                                37075: Fix for ALF-14267 SOLR index check - First transaction time used instead of first ACL time - indexCheck, checkInitialState
                                                37135: Fix for ALF-13993 It fails to find documents whose tag is longer than 255 characters
                                                37253: Fix for ALF-13634 Re-created category won't show up again on a node in Document Library.
                                                37384: Fix for ALF-14219 SolrQueryHTTPClient unable to handle long queries (4096 bytes)
                                                37628: Build Fix
                                                37749: Fix for ALF-14582 SOLR tracking allows incompatible model changed to the current index to be made
                                                37863: Fix for ALF-14631 Extraneous Backslash in Solr Configuration File
                                                37896: Fix for ALF-14582 SOLR tracking allows incompatible model changed to the current index to be made
                                                38008: Fix for ALF-14042 Customisable Alfresco contextPath in Alfresco AbstractHttpClient (used e.g. by Solr CoreTracker)
                                                38010: Fix for ALF-14686 https://localhost:8443/solr/admin/cores?action=CHECK - checks the index - it should check the cache
                                            V4.1
                                                38179: Fix for ALF-14620 SOLR searches run by system user in archive store return fewer results than for admin user
                                            V4.1-BUG-FIX
                                                40401: Part for for ALF-15406 Index Tracker seems not to gracefully stop upon shutdown keeping all other threads in waiting
                                                41201: Fix for ALF-15767 Group query using cm:authorityName
                                                41202: Additional unit tests related to ALF-15731  TYPE:"..." queries no longer work for Lucene on 4.X
                                                41203: Part 1 for ALF-15811 SOLR query increases DocBitSet inefficiently
                                                41210: Part 2:  ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                                41303: Fix for ALF-15799 Under high concurrency load balanced Solr throws an Antlr related NPE
                                                41322: Fix for ALF-15858 SOLR ACL tracking can stall or miss acls during tracking
                                                41323: Chemistry client java to create test data for ALF-15858, ALF-15782, CLOUD-596, ALF-15753 etc
                                                41487: Fix for ALF-15910 SOLR - Add index warming and filter pointless entries from the filter cache
                                                       Fix for ALF-15851 Too many live instances of SolrIndexSearcher at one time resulting in OOM - Alfresco 4.1.1 - build 151
                                                41730: Fix for ALF-15995 NodeRef is missing in log on "Problem converting to Freemarker" error
                                                41747: Fix for ALF-15811 SOLR query increases DocBitSet inefficiently
                                                       Part of ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                                41748: Fix for ALF-15950 Solr: throws NPE: org.alfresco.solr.SolrLuceneAnalyser.loadAnalyzer
                                                41752: Fix for ALF-13634 Re-created category won't show up again on a node in Document Library.
                                                41940: Fix for ALF-16086 SOLR tracking does not include transformation status etc (error in header name)
                                                42136: Last SOLR side update for ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                                42143: In-memory bridge table for ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                                42183: Build fix - unit test runs in 64M - for all the washing machines out there ....
                                      42547: Fix the model used for embedded tests.
                                      42659: Add missing test model
                                      42663: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_SOLR
                                            42612: Further fix for ALF-16164 Cloud monitoring of SOLR is CPU intensive due to its repeated use of the SOLR stats page 
                                            42657: Fix for     ALF-16359 Fix SOLR logging in production and other environments 
                                      42660: (RECORD ONLY) Merged DEV/CLOUD1 to DEV/FEATURES/CLOUD_SOLR
                                            working copy sync r42514 through r42659
                                 43799: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                      42377: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                           42363: ALF-16213: renaming versioned file results in file being deleted.
                                      42411: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                           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
                                      42428: ALF-16217: Remove unnecessary restriction on content type
                                      42432: CLOUD-795: Optimise activities feed: rollup multiple (WebDAV) document adds/deletes into a single activity
                                 43802: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                      42559: Merged BRANCHES/DEV/CLOUD1_SPRINT1/ to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                           42548: CLOUD-712: Ensure that all CSS files are loaded in IE (latest Spring Surf libs r1170)
                                      42565: CLOUD-837: TenantContentUsageImpl does not handle failed lock
                                 43811: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                      42570: CLOUD-810: ""emailFeedDisabled" in person JSON needs to be called "emailNotificationsEnabled""
                                 43813: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                      42572: CLOUD-794: "Activities should be posted for CMIS (to enable both Public API + Mobile clients)"
                                      42576: CLOUD-842: Activities Feed: post lookup - job lock + max items per cycle
                                      42579: CLOUD-846: Minor optimisation for Site lookup (for a nodeRef)
                                 43814: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                      42609: CLOUD-712: Updated Surf libs (r1171) to change the number of @import statements supported by each <style> element in IE from 32 to 31
                                 43815: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                      42694: Fix build (merge issues) + fixes for CLOUD-839: "Activities Are Not Posted For Ratings", CLOUD-860: "Content Created With CMIS Cannot be Rated" and CLOUD-397: "The JSON response of the networks request is incorrect"
                                 43816: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                      42737: CLOUD-463: Now checks if the current user has read permission for the shared node, before displaying "Document Details" button.
                                      42847: CLOUD-794: "Activities should be posted for CMIS (to enable both Public API + Mobile clients)"
                                      42868: Fix failing build tests + further/revised public api tests
                                      42875: CLOUD-869: "Remove cmiscustom types from the CMIS dictionary"   
                                      42884: ALF-1059 / CLOUD-469: Post activities for folder(s) add + delete
                                      42899: Fix build
                                 43817: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                      42950: CLOUD-726: Ensure that i18n messages fall back to properties defined by less specific locale files (updated Surf libs: 1174)
                                 43818: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                      43138: Fixed CLOUD-491 "'New Folder' form is not displayed on IE7, IE8"
                                      43234: CLOUD-313: Implment Transport pooling in email sender.
                                      43349: Fix CLOUD-918: Failed to delete folder via Folder Details page
                                      43351: Fix CLOUD-905 - activity for Share folder delete are not displayed (OK via WebDAV)
                                      43440: CLOUD-928: Cope with missing shredId attributes, due to the copying of QuickShare properties, prior to CLOUD-593 
                                      43451: Merged HEAD to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                           43449: ALF-16669: removing a site member may break the activity feed (CLOUD-931)   
                                 43819: Fix merge error
                                 43820: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                      43465: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)"
                                 43821: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                      43477: Merged HEAD to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                           39205: Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD 
                                              39084: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.1-BUG-FIX 
                                              39081: Fix for ALF-6139 and ALF-13959 - Incomplete site creation issues - latest Surf libs and related changes to allow atomic creation of multiple Surf objects in a single REST call. Originally authored by Dave Ward for 3.2 - now migrated to SpringSurf. Implemented ADMRemoteStore changes for above change to apply to 4.0.
                                      43488: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)"
                                 43822: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                      43537: ALF-16706: CLONE - POI becoming irresponsive and causing jvm to freeze with XLS that includes fraction formats 
                                           43520: ALF-16694 POI becoming irresponsive and causing jvm to freeze for a while with certain XLS (fraction formats)
                                              - Patched POI to:
                                                - limit the length of fractions to four digits (more than that takes too long to process) e.g. "# #/#####" is too long and will be reduced to "# #/####" which still takes about a second!
                                                - handle the -ve fraction format part (i.e. n in p;n;z), so its length is not interpret as part of the fraction format of the +ve fraction part.
                                                - handle custom formats a bit better (strip them) rather than interpret the text length as part of the fraction format
                                                - handle -ve fractions (just did not work)
                                                - limitations:
                                                  - custom text gets stripped (still better than before)
                                                  - formats that have p (+ve) and n (-ve) parts must include a fraction format in each part. Otherwise +ve and -ve values are not formatted as a fraction (still better than before)
                                      43564: CLOUD-939: <Record Only>
                                           43558: ALF-16694 POI becoming irresponsive and causing jvm to freeze with XLS that includes fraction formats
                                              - Original jar did not get removed in previous commit
                                              << NO NEED TO MERGE TO CLOUD1-BUG-FIX as there was a tree conflict and the original jar was removed. >>
                                 43823: Fix merge error
                                 43824: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                      43579: Public api test, fix intermittent test failures (hopefully)
                                      43721: CLOUD-935: Update thor override of remoteadm.post.desc.xml
                                      43726: PUBLICAPI-11: "Extract metadata needs to be called after uploading new content via CMIS"
                                 43828: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                      43728: Merged BRANCHES/DEV/AMILLER/CLOUD1 to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                           38211: CLOUD-115 - Remove Network Admins on downgrade to free/public
                                 43829: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                      43731: Resolve CLOUD-965: A known config which has been tested can be modified when deploying to production
                                      43733: PUBLICAPI-11: "Extract metadata needs to be called after uploading new content via CMIS"
                                      43762: Fix the build
                                 43830: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                      43788: CLOUD-942: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                           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
                                           40112: ALF-9254: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1)
                                                40111: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration
                                                   - Patched jooconverter to handle non western characters in text files, by using the same properties that JOD uses.
                                                40073: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration
                                                   - Refactored JodContentTransformer and OpenOfficeContentTransformerWorker. Moved common code into OOoContentTransformerHelper,
                                                     including fixes that existed on only one or the other.
                                                   - For text files, change file encoding from SHIT JIS (and others) to UFT-8, as OpenOffice/LibreOffice do not support this as
                                                     an input. They do support it in other file types but not text. JOD now works, but OOo still has problems.
                                      43789: CLOUD-942: Add mergeinfo, missed by initial commit from Cornerstone. 
                                 43831: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                      43488: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)"
                                 43832: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                      43762: Fix the build
                                 43833: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                      42692: (RECORD ONLY) Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                           40859: public api:
                                           40862: CLOUD-555: "Updating comment fails because node not found"
                                           40961: CLOUD-566: "Site object shouldn't contain the "sitePreset" property"
                                           40979: Added tests for non-numeric params and non-european characters
                                           41030: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/THOR1_REST_API2:
                                                41027: ALF-15193: "Folder Is Not a Folder CmisInvalidArgumentException thrown when using cmis:objectId"
                                           41097: Added quickshare and cloudsync to cmis filter list
                                           41098: Renamed serializer/deserializer lists for RestJsonModule
                                           41099: Cleaned up consistent Rest responses - CLOUD-574
                                           41100: Meta info webscript is disabled because its not been reviewed / in the correct format
                                           41104: Meta info webscript is really disabled because its not been reviewed / in the correct format
                                           41105: Added key for trusted layer7 relationship
                                           41137: Public api:
                                           41146: Fix trusted authentication against OpenCMIS
                                           41168: Public apI;
                                           41169: CLOUD-565: "API / URL returns a "tenant required" error"
                                           41170: public api:
                                           41171: public api:
                                           41172: public api:
                                           41183: CLOUD-598: "API: "GET network" response has unnecessary JSON nesting"
                                           41186: Fix solrcore properties
                                           41191: Fix for OpenCMIS trusted authentication to allow local opencmis access as before
                                           41282: CLOUD-616: "CMIS API: Repository names should be more descriptive"
                                           41283: CLOUD-601: "API /networkId/public/cmis/versions/ returns a 400"
                                           41325: Public api:
                                           41367: CLOUD-636: "REST API: Nodes: Tags: Not allowed DELETE method proceeds with status 204"
                                           41369: Public api:
                                           41422: Sample OAuth call for the Resource Owner Password flow
                                           41427: Sample OAuth call for the Client Credentials flow
                                           41433: Public api: (1) parameterize site members/people sorting in service api
                                           41434: Public api: minor comment service fix
                                           41438: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                           41439: Public api: fix for default tenant id in CMIS requests
                                           41449: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                           41456: CLOUD-644: "Performing a Checkout in OpenCMIS Results in an Exception in the Share Doc Library"
                                           41457: Fix build
                                           41461: Public api: more tests
                                           41521: CLOUD-660: "GET favourite sites results in exception when skipCount is greater than number of items"
                                           41606: Fix for CLOUD-668 - POSTing to a relationship by id now returns an InvalidArgumentException
                                           41607: CLOUD-668 : changed ordering so errors fire in correct order.
                                           41628: Public api: more tests
                                           41672: CLOUD-672: "404 Error when browsing child files/folder "
                                           41673: Public api: more tests
                                           41675: CLOUD-674: "Root network calls need to return application/json content type"
                                           41790: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                           41791: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                           41793: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                           41823: Public api: more tests
                                           41825: Fix for CLOUD-684 - wraps the list, not sure if I like the paging
                                           41853: CLOUD-700: "The mobile SDK needs a way to map an accessToken to a user identifier"
                                           41867: CLOUD-711: "It should be possible to remove a favourite site"
                                           41957: Public api: - error handling improvements - more tests
                                           41970: Public api: - fix build  (add missing files)
                                           41972: Public api: - more tests (including OpenCMIS TCK)
                                           42046: Added some debug timings.  Enabled using log4j.logger.org.alfresco.rest.framework.webscripts=debug
                                           42058: Public api: changed logging package name
                                           42124: Public api: - more tests - minor fixes
                                           42125: CLOUD-734: "CMIS: Query Issues Discovered During Testing"
                                           42126: Public api: fix up OpenCMIS tests
                                           42171: Consistency fix for CLOUD-695.
                                           42180: Fix build
                                           42181: CLOUD-695 "Requests to un-implemented urls do not consistently return http status 405 (Method not allowed)": fix up public api tests
                                           42214: Public api tests (cmis)
                                           42251: Changed the serializer for embedded entities, (related to CLOUD-746)
                                           42253: Fix build
                                      42735: (RECORD ONLY) Fix build (fix merge error)
                                 43834: Merged BRANCHES/DEV/FEATURES/CLOUD1_GOOGLEDOCS to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                      43702: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder
                                      43703: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder
                                      43744: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder
                                 43846: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                      43840: [CLOUD-955] Add request header config to remove Origin Header in share proxy calls.
                                 43855: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                      41731: Fix for ALF-16002 - Dashlet - My Documents - I've recently modified - executes unlimited query. In SOLR unlimited (all sites query) is really unlimited, for Lucene it is not. Improved jscript Search debugging to correctly output limit value on query.
                                 43881: Revert CLOUD-942: Reverse merge r43830 
                                 43885: CLOUD-942: Reapply changes backed out in r43881 and Comment out faling unit tests.
                                 43921: Resolve CLOUD-990: REGRESS: No items error is displayed on DocumentLibrary Page (for some files)
                                 43924: Disable intermittent OpenCMIS tests
                                 43925: Disable intermittent test
                                 43952: CLOUD-993: Insure login button is shown when user isn't logged in.
                                 43992: Resolve CLOUD-1001: REGRESS: New Application Theme and Logo are not applied after re-login
                  44196: CLOUD-678 - Incorrect link for 'To change your notifications settings, go here.' message
                  44201: CLOUD-486 - Choose UI language
                  44202: CLOUD-487: Fix emails after merge of template refresh and localised mail features
                     44414: JAPANESE: Cloud email template translation
                  44622: Fixes: CLOUD-1037 - removes unnecessary elements from inside the a tag.
                  44623: Cloud-189 - Corrects text and layout for already created email templates.
                  44624: Fixes: CLOUD-1044: Updates Email template
                  44625: Fixes: CLOUD-1042: Updates Email template
                  44626: Fixes: CLOUD-1043: Updates Email template
                  44627: Fixes: CLOUD-1041: Updates Email template
                  44764: CLOUD-1080: Fixes encoding error.
                  44767: CLOUD-1086: Text update to email template
                  44888: Email template updates - fixes CLOUD-1099 and CLOUD-1102.
                  44892: Fixes error with Activities email - the template fails to process if the only activities are based on follow events. It now processes and gets sent, but with some confusion, see CLOUD-1123
                  44914: Fixes CLOUD-1097 - Alt text not displaying due to unspecified image dimensions and colour. Also minor code clean up.
                  45145: CLOUD-1123 - Filter out "Following" activities from activity feed email.
                  45251: Email template text updates following review.
                  45289: Fix issue where email was not sent for 'Invite People'
                  45306: Externalises strings for cloud emails
                  45316: Adds some defensive code to prevent unused variables being a problem for templates.
                  45328: Email translation updates
                  45334: Resolve CLOUD-1162: Ability to change sign-up, reminder and reset password timer durations via properties
                  45369: Fixes Following Email template
                  45376: Resolve CLOUD-1172: Following email does not show domain correctly
                  45401: Corrects layout bug in email template
                  45407: Removes unnecessary full stop.
                  45408: Adds missing email template translations
                  45430: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1-EMAIL-REFRESH:
                       45329: FRENCH: Cloud translation updates based on EN r45266
                       45330: GERMAN: Cloud translation updates based on EN r45266
                       45332: SPANISH: Cloud translation updates based on EN r45266
                       45333: JAPANESE: Cloud translation updates based on EN r45266
                       45427: SPANISH: Cloud 1 translation updates based on EN r45266
                  45453: Fix for CLOUD-1164 - Failed login is not handled correctly (on email refresh branch)
                  45474: Fixes: CLOUD-1189: Incorrect variable used in translated property files.
                  45484: Fixes: CLOUD-1190 incorrect quote marks in JA file
                  45487: CLOUD-1186: Fixes issue with reminder emails not being localised.
                  45501: Potential fix for: CLOUD-678
                  45503: Resolve CLOUD-1188: Emails are not rendered as HTML, even though they are HTML
                  45539: Resolve CLOUD-1195: Invite people email not rendering as HTML, even though it is HTML
                  45559: CLOUD-1197: Fixes issue with reset password template not recognising all the variables in all cases.
                  45579: Resolve CLOUD-1186: Email not localized, CLOUD-1202: Invite people / Invite site email sometimes comes in English and is not localized
                  45609: Resolve test failures introduced fixing CLOUD-1186
                  45613: Resolve CLOUD-1210: Locale is not replicated across tenants if a user has been invited to one or more secondary tenants
                  45616: Resolve CLOUD-1205: activities email template the feed are not localized
                  45642: Fixes: CLOUD-1211 and CLOUD-1212 - externalises two hard coded strings. Translations to follow.
                  45645: CLOUD-1205: activities email template the feed are not localized
                  45646: CLOUD-1203: Invite to Site and site reminder the role should be localized
                  45654: ALL LANG: Translation updates to email templates, following fixes made for CLOUD-1212, CLOUD-1211.
                  45678: Removes hidden chars at start of the file.
                  45680: Fixes more hidden chars that the start of UTF8 files.
                  45683: Fixes: CLOUD-1216: Typo in Italian properties file.
                  45693: Resolve CLOUD-1204: Task type in the workflow emails are not localized
                  45702: Minor translation updates following linguistic review.
                  45717: GERMAN: Translation updates based on linguistic review
                  45719: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1/ to BRANCHES/DEV/FEATURES/CLOUD1-EMAIL-REFRESH:
                       45718: ITALIAN: Translation updates based on EN r45266 (missed from previous bundle import)
                  45797: Resolve CLOUD-1226: The task details are not showing in localized details in task list
                  45798: Fix single quote encoding in language property file (related to CLOUD-1230, but does not resolve it across the board).
        47532: Fix merge/compile error (AlfrescoCmisServiceImpl.java - copyToTempFile/removeTempFile)
        47533: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             46011: Fix NPE while sending emails (in non-test mode)
   48348: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47554: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             46321: Merged BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2 to BRANCHES/DEV/CLOUD1:
                  44210: CLOUD-957: Insure moderated and private sites' containers do not inherit pemissions from the paernt site, and that group EVERYONE does not have read permisions.
                  44238: CLOUD-957: Fix broken unit test
                  44286: CLOUD-794: "Activities should be posted for CMIS (to enable both Public API + Mobile clients)"
                  44287: more public api tests
                  44299: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       44280: Fixes: CLOUD-919 - adds defensive code to prevent error if Get Satisfaction script doesn't load.
                  44311: more public api tests - fix build
                  44313: PUBLICAPI-45: "Get Networks Call for Not-Network User Throws NullPointerException"
                  44328: Fixes: CLOUD-1025 - adds meta robot noindex & nofollow tag to global template and excludes it from the login page.
                  44344: more public api tests - fix build
                  44355: Tweak robots metatag: delimit content with a comma.
                  44380: Merged HEAD to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2
                       44375: Modified large thumbnail generation mimetype from PNG to JPG:
                              - hugely reduces the file size of the 900x900 thumbnail image that is generated for JPG images in the gallery view e.g. uploaded photos
                              - average file size reduced from ~3000K to ~300K for large photo thumbnails
                              - also reduces the time take to generate a page full of large thumbnails in the background from around 20secs to 10secs
                  44388: Updated mimetype to image/jpeg to stop warnings from Chrome
                  44396: Fixes JUnit test (RenditionServiceIntegrationTest)
                  44619: CLOUD-1075: "Bulk filesystem import does not work"
                  44637: CLOUD-1024
                  44685: Fixes: CLOUD-1009 - Visual changes the Quickshare header.
                  44705: CLOUD-1009: Moves gradient to CSS & adds 3d effects suggested by Lee.
                  44706: CLOUD-1009: Bumps up font size as requested by Jessie.
                  45234: Resolve CLOUD-1130: Incorrect copyright message
                  45248: Resolve CLOUD-1077: File size limits for Transforms need increasing for Cloud
                  45337: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       43879: FRENCH: Translation updates based on EN r43703
                       43983: GERMAN: Translation updates based on EN r43703
                       43984: SPANISH: Translation updates based on EN r43703
                       43985: FRENCH: Translation updates based on EN r43703, includes file missing from previous commit.
                       43986: ITALIAN: Translation updates based on EN r43703.
                       43987: JAPANESE: Translation updates based on EN r43703.
                       43990: BDE-108: add workaround of http://jira.codehaus.org/browse/MNG-4979 in Maven Surefire configuration to be able to use JaCoCo easily
                       44024: JAPANESE: Translation updates based on EN r43703. Corrects files missing from previous commit.
                       44031: JAPANESE: Translation updates based on EN r43703. Corrects file missed from previous commit.
                       44032: GERMAN: Translation updates based on EN r43703. Corrects missing line break.
                       44059: Merged BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2 to BRANCHES/DEV/CLOUD1:
                            43797: Merged BRANCHES/DEV/FEATURES/CLOUD1_SOLR to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 42526: Merged BRANCHES/DEV/V4.0-BUG-FIX, BRANCHES/V4.1, BRANCHES/DEV/4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_SOLR for CLOUD-798
                                       V4.0-BUG_FIX
                                           36393: Final part of ALF-13723 SOLR does not include the same query unit tests as lucene
                                           36434: Test fix for ALF-13723 SOLR does not include the same query unit tests as lucene
                                           36608: First part of ALF-14209 SOLR - does not support query for all stores
                                           36676: Fix for ALF-14216 Solr Exception when you try to sort folders or files by size.
                                           36954: ALF-14209 SOLR - does not support query for all stores
                                           37075: Fix for ALF-14267 SOLR index check - First transaction time used instead of first ACL time - indexCheck, checkInitialState
                                           37135: Fix for ALF-13993 It fails to find documents whose tag is longer than 255 characters
                                           37253: Fix for ALF-13634 Re-created category won't show up again on a node in Document Library.
                                           37384: Fix for ALF-14219 SolrQueryHTTPClient unable to handle long queries (4096 bytes)
                                           37628: Build Fix
                                           37749: Fix for ALF-14582 SOLR tracking allows incompatible model changed to the current index to be made
                                           37863: Fix for ALF-14631 Extraneous Backslash in Solr Configuration File
                                           37896: Fix for ALF-14582 SOLR tracking allows incompatible model changed to the current index to be made
                                           38008: Fix for ALF-14042 Customisable Alfresco contextPath in Alfresco AbstractHttpClient (used e.g. by Solr CoreTracker)
                                           38010: Fix for ALF-14686 https://localhost:8443/solr/admin/cores?action=CHECK - checks the index - it should check the cache
                                       V4.1
                                           38179: Fix for ALF-14620 SOLR searches run by system user in archive store return fewer results than for admin user
                                       V4.1-BUG-FIX
                                           40401: Part for for ALF-15406 Index Tracker seems not to gracefully stop upon shutdown keeping all other threads in waiting
                                           41201: Fix for ALF-15767 Group query using cm:authorityName
                                           41202: Additional unit tests related to ALF-15731  TYPE:"..." queries no longer work for Lucene on 4.X
                                           41203: Part 1 for ALF-15811 SOLR query increases DocBitSet inefficiently
                                           41210: Part 2:  ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                           41303: Fix for ALF-15799 Under high concurrency load balanced Solr throws an Antlr related NPE
                                           41322: Fix for ALF-15858 SOLR ACL tracking can stall or miss acls during tracking
                                           41323: Chemistry client java to create test data for ALF-15858, ALF-15782, CLOUD-596, ALF-15753 etc
                                           41487: Fix for ALF-15910 SOLR - Add index warming and filter pointless entries from the filter cache
                                                  Fix for ALF-15851 Too many live instances of SolrIndexSearcher at one time resulting in OOM - Alfresco 4.1.1 - build 151
                                           41730: Fix for ALF-15995 NodeRef is missing in log on "Problem converting to Freemarker" error
                                           41747: Fix for ALF-15811 SOLR query increases DocBitSet inefficiently
                                                  Part of ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                           41748: Fix for ALF-15950 Solr: throws NPE: org.alfresco.solr.SolrLuceneAnalyser.loadAnalyzer
                                           41752: Fix for ALF-13634 Re-created category won't show up again on a node in Document Library.
                                           41940: Fix for ALF-16086 SOLR tracking does not include transformation status etc (error in header name)
                                           42136: Last SOLR side update for ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                           42143: In-memory bridge table for ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                           42183: Build fix - unit test runs in 64M - for all the washing machines out there ....
                                 42547: Fix the model used for embedded tests.
                                 42659: Add missing test model
                                 42663: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_SOLR
                                       42612: Further fix for ALF-16164 Cloud monitoring of SOLR is CPU intensive due to its repeated use of the SOLR stats page 
                                       42657: Fix for     ALF-16359 Fix SOLR logging in production and other environments 
                                 42660: (RECORD ONLY) Merged DEV/CLOUD1 to DEV/FEATURES/CLOUD_SOLR
                                       working copy sync r42514 through r42659
                            43799: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 42377: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                      42363: ALF-16213: renaming versioned file results in file being deleted.
                                 42411: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                      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
                                 42428: ALF-16217: Remove unnecessary restriction on content type
                                 42432: CLOUD-795: Optimise activities feed: rollup multiple (WebDAV) document adds/deletes into a single activity
                            43802: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 42559: Merged BRANCHES/DEV/CLOUD1_SPRINT1/ to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                      42548: CLOUD-712: Ensure that all CSS files are loaded in IE (latest Spring Surf libs r1170)
                                 42565: CLOUD-837: TenantContentUsageImpl does not handle failed lock
                            43811: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 42570: CLOUD-810: ""emailFeedDisabled" in person JSON needs to be called "emailNotificationsEnabled""
                            43813: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 42572: CLOUD-794: "Activities should be posted for CMIS (to enable both Public API + Mobile clients)"
                                 42576: CLOUD-842: Activities Feed: post lookup - job lock + max items per cycle
                                 42579: CLOUD-846: Minor optimisation for Site lookup (for a nodeRef)
                            43814: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 42609: CLOUD-712: Updated Surf libs (r1171) to change the number of @import statements supported by each <style> element in IE from 32 to 31
                            43815: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 42694: Fix build (merge issues) + fixes for CLOUD-839: "Activities Are Not Posted For Ratings", CLOUD-860: "Content Created With CMIS Cannot be Rated" and CLOUD-397: "The JSON response of the networks request is incorrect"
                            43816: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 42737: CLOUD-463: Now checks if the current user has read permission for the shared node, before displaying "Document Details" button.
                                 42847: CLOUD-794: "Activities should be posted for CMIS (to enable both Public API + Mobile clients)"
                                 42868: Fix failing build tests + further/revised public api tests
                                 42875: CLOUD-869: "Remove cmiscustom types from the CMIS dictionary"   
                                 42884: ALF-1059 / CLOUD-469: Post activities for folder(s) add + delete
                                 42899: Fix build
                            43817: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 42950: CLOUD-726: Ensure that i18n messages fall back to properties defined by less specific locale files (updated Surf libs: 1174)
                            43818: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 43138: Fixed CLOUD-491 "'New Folder' form is not displayed on IE7, IE8"
                                 43234: CLOUD-313: Implment Transport pooling in email sender.
                                 43349: Fix CLOUD-918: Failed to delete folder via Folder Details page
                                 43351: Fix CLOUD-905 - activity for Share folder delete are not displayed (OK via WebDAV)
                                 43440: CLOUD-928: Cope with missing shredId attributes, due to the copying of QuickShare properties, prior to CLOUD-593 
                                 43451: Merged HEAD to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                      43449: ALF-16669: removing a site member may break the activity feed (CLOUD-931)   
                            43819: Fix merge error
                            43820: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 43465: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)"
                            43821: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 43477: Merged HEAD to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                      39205: Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD 
                                         39084: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.1-BUG-FIX 
                                         39081: Fix for ALF-6139 and ALF-13959 - Incomplete site creation issues - latest Surf libs and related changes to allow atomic creation of multiple Surf objects in a single REST call. Originally authored by Dave Ward for 3.2 - now migrated to SpringSurf. Implemented ADMRemoteStore changes for above change to apply to 4.0.
                                 43488: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)"
                            43822: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 43537: ALF-16706: CLONE - POI becoming irresponsive and causing jvm to freeze with XLS that includes fraction formats 
                                      43520: ALF-16694 POI becoming irresponsive and causing jvm to freeze for a while with certain XLS (fraction formats)
                                         - Patched POI to:
                                           - limit the length of fractions to four digits (more than that takes too long to process) e.g. "# #/#####" is too long and will be reduced to "# #/####" which still takes about a second!
                                           - handle the -ve fraction format part (i.e. n in p;n;z), so its length is not interpret as part of the fraction format of the +ve fraction part.
                                           - handle custom formats a bit better (strip them) rather than interpret the text length as part of the fraction format
                                           - handle -ve fractions (just did not work)
                                           - limitations:
                                             - custom text gets stripped (still better than before)
                                             - formats that have p (+ve) and n (-ve) parts must include a fraction format in each part. Otherwise +ve and -ve values are not formatted as a fraction (still better than before)
                                 43564: CLOUD-939: <Record Only>
                                      43558: ALF-16694 POI becoming irresponsive and causing jvm to freeze with XLS that includes fraction formats
                                         - Original jar did not get removed in previous commit
                                         << NO NEED TO MERGE TO CLOUD1-BUG-FIX as there was a tree conflict and the original jar was removed. >>
                            43823: Fix merge error
                            43824: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 43579: Public api test, fix intermittent test failures (hopefully)
                                 43721: CLOUD-935: Update thor override of remoteadm.post.desc.xml
                                 43726: PUBLICAPI-11: "Extract metadata needs to be called after uploading new content via CMIS"
                            43828: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 43728: Merged BRANCHES/DEV/AMILLER/CLOUD1 to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                      38211: CLOUD-115 - Remove Network Admins on downgrade to free/public
                            43829: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 43731: Resolve CLOUD-965: A known config which has been tested can be modified when deploying to production
                                 43733: PUBLICAPI-11: "Extract metadata needs to be called after uploading new content via CMIS"
                                 43762: Fix the build
                            43830: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 43788: CLOUD-942: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                      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
                                      40112: ALF-9254: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1)
                                           40111: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration
                                              - Patched jooconverter to handle non western characters in text files, by using the same properties that JOD uses.
                                           40073: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration
                                              - Refactored JodContentTransformer and OpenOfficeContentTransformerWorker. Moved common code into OOoContentTransformerHelper,
                                                including fixes that existed on only one or the other.
                                              - For text files, change file encoding from SHIT JIS (and others) to UFT-8, as OpenOffice/LibreOffice do not support this as
                                                an input. They do support it in other file types but not text. JOD now works, but OOo still has problems.
                                 43789: CLOUD-942: Add mergeinfo, missed by initial commit from Cornerstone. 
                            43831: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 43488: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)"
                            43832: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 43762: Fix the build
                            43833: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 42692: (RECORD ONLY) Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                      40859: public api:
                                      40862: CLOUD-555: "Updating comment fails because node not found"
                                      40961: CLOUD-566: "Site object shouldn't contain the "sitePreset" property"
                                      40979: Added tests for non-numeric params and non-european characters
                                      41030: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/THOR1_REST_API2:
                                           41027: ALF-15193: "Folder Is Not a Folder CmisInvalidArgumentException thrown when using cmis:objectId"
                                      41097: Added quickshare and cloudsync to cmis filter list
                                      41098: Renamed serializer/deserializer lists for RestJsonModule
                                      41099: Cleaned up consistent Rest responses - CLOUD-574
                                      41100: Meta info webscript is disabled because its not been reviewed / in the correct format
                                      41104: Meta info webscript is really disabled because its not been reviewed / in the correct format
                                      41105: Added key for trusted layer7 relationship
                                      41137: Public api:
                                      41146: Fix trusted authentication against OpenCMIS
                                      41168: Public apI;
                                      41169: CLOUD-565: "API / URL returns a "tenant required" error"
                                      41170: public api:
                                      41171: public api:
                                      41172: public api:
                                      41183: CLOUD-598: "API: "GET network" response has unnecessary JSON nesting"
                                      41186: Fix solrcore properties
                                      41191: Fix for OpenCMIS trusted authentication to allow local opencmis access as before
                                      41282: CLOUD-616: "CMIS API: Repository names should be more descriptive"
                                      41283: CLOUD-601: "API /networkId/public/cmis/versions/ returns a 400"
                                      41325: Public api:
                                      41367: CLOUD-636: "REST API: Nodes: Tags: Not allowed DELETE method proceeds with status 204"
                                      41369: Public api:
                                      41422: Sample OAuth call for the Resource Owner Password flow
                                      41427: Sample OAuth call for the Client Credentials flow
                                      41433: Public api: (1) parameterize site members/people sorting in service api
                                      41434: Public api: minor comment service fix
                                      41438: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                      41439: Public api: fix for default tenant id in CMIS requests
                                      41449: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                      41456: CLOUD-644: "Performing a Checkout in OpenCMIS Results in an Exception in the Share Doc Library"
                                      41457: Fix build
                                      41461: Public api: more tests
                                      41521: CLOUD-660: "GET favourite sites results in exception when skipCount is greater than number of items"
                                      41606: Fix for CLOUD-668 - POSTing to a relationship by id now returns an InvalidArgumentException
                                      41607: CLOUD-668 : changed ordering so errors fire in correct order.
                                      41628: Public api: more tests
                                      41672: CLOUD-672: "404 Error when browsing child files/folder "
                                      41673: Public api: more tests
                                      41675: CLOUD-674: "Root network calls need to return application/json content type"
                                      41790: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                      41791: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                      41793: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                      41823: Public api: more tests
                                      41825: Fix for CLOUD-684 - wraps the list, not sure if I like the paging
                                      41853: CLOUD-700: "The mobile SDK needs a way to map an accessToken to a user identifier"
                                      41867: CLOUD-711: "It should be possible to remove a favourite site"
                                      41957: Public api: - error handling improvements - more tests
                                      41970: Public api: - fix build  (add missing files)
                                      41972: Public api: - more tests (including OpenCMIS TCK)
                                      42046: Added some debug timings.  Enabled using log4j.logger.org.alfresco.rest.framework.webscripts=debug
                                      42058: Public api: changed logging package name
                                      42124: Public api: - more tests - minor fixes
                                      42125: CLOUD-734: "CMIS: Query Issues Discovered During Testing"
                                      42126: Public api: fix up OpenCMIS tests
                                      42171: Consistency fix for CLOUD-695.
                                      42180: Fix build
                                      42181: CLOUD-695 "Requests to un-implemented urls do not consistently return http status 405 (Method not allowed)": fix up public api tests
                                      42214: Public api tests (cmis)
                                      42251: Changed the serializer for embedded entities, (related to CLOUD-746)
                                      42253: Fix build
                                 42735: (RECORD ONLY) Fix build (fix merge error)
                            43834: Merged BRANCHES/DEV/FEATURES/CLOUD1_GOOGLEDOCS to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 43702: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder
                                 43703: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder
                                 43744: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder
                            43846: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 43840: [CLOUD-955] Add request header config to remove Origin Header in share proxy calls.
                            43855: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 41731: Fix for ALF-16002 - Dashlet - My Documents - I've recently modified - executes unlimited query. In SOLR unlimited (all sites query) is really unlimited, for Lucene it is not. Improved jscript Search debugging to correctly output limit value on query.
                            43881: Revert CLOUD-942: Reverse merge r43830 
                            43885: CLOUD-942: Reapply changes backed out in r43881 and Comment out faling unit tests.
                            43921: Resolve CLOUD-990: REGRESS: No items error is displayed on DocumentLibrary Page (for some files)
                            43924: Disable intermittent OpenCMIS tests
                            43925: Disable intermittent test
                            43952: CLOUD-993: Insure login button is shown when user isn't logged in.
                            43992: Resolve CLOUD-1001: REGRESS: New Application Theme and Logo are not applied after re-login
                       44203: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1
                             44200: Probable fix for     ALF-16895 SOLR: Cannot find files after restart and reindex solr 
                       44272: Resolve CLOUD-930: Registration with uppercase domain name / (email address) fails to activate user
                       44276: 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: 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.
                       44373: Follow-up on big merge r44059 for Maven build
                            - Upgrade POI to 3.9-beta1-20121109-alfresco-patched
                            - Upgrade JODConverter to 2.1.0-patched
                            - Added Chemistry client as a dependency in Solr tests
                       44571: Merged BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN to BRANCHES/DEV/CLOUD1:
                            44527: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
                                 38425: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      33822: Merged BRANCHES/DEV/V4.0-BUG-FIX to HEAD:
                                           33813: ALF-12736: Stack specific: 'Getting updates failed' notification appears when non-admin user creats DWS
                                           33821: ALF-12212 - SPP/Vti requires that all links include a protocol and are valid, while share does not. When building the Vti response, prefix URLs with http:// if they lack a protocol at the start, and ignore any that are malformed
                                 38431: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      33893: SharePoint refactoring - first part of removing the old Alfresco v2 code
                                 38432: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      33905: SharePoint Refactoring - Move to only a single class for the VersionServiceHandler
                                 38433: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      33906: SharePoint Refactoring - Move to only a single class for the User and Groups Handler
                                 38434: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      33907: SharePoint refactoring - fix deprecation warnings by switching to the new way of finding people, when searching for a user with a given email address
                                 38435: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      33923: SharePoint refactoring - Start on merging the old style and new style List support, mark the old style as deprecated, and add TODOs where needed for future changes
                                 38440: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      35486: ALF-13028: Sharepoint broken by changes to WebDAV
                                 38442: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      35530: ALF-13028, ALF-13696: broken sharepoint module
                                 38443: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      36148: Merged BRANCHES/DEV/BELARUS/HEAD-2012_04_25 to HEAD:
                                           35710: ALF-13028 : Sharepoint broken by changes to WebDAV
                                 38444: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      37648: Sharepoint: fixed typo in class name VtiDocumentHepler
                                 38447: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      37929: First try at incremental-spp-tomcat-exploded target
                                 38451: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      37943: Sharepoint: fix build for compile-spp dependency and for new incremental-spp-tomcat-exploded target.
                                 38453: Sharepoint: remove error causing property injection - probably came from a double-merge.
                                 38472: Sharepoint: fix missing singletonCache property for VtiPathHelper bean, probably lost in merges.
                                 38477: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      37926: Correct handling of GetMeetingsInfo - lcid may not always be set
                                 38478: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      37927: More parameters that are optional
                                 38481: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      37928: More parameters that are optional
                                 38483: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      37931: A site may not have a calendar container yet
                                 38485: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      37933: Set the response type to text/xml as required
                                 38486: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      37938: Stub out support for UpdateMeeting and SetWorkspaceTitle
                                 38487: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      37939: Fix title vs name confusion in meeting sites, support setWorkspaceTitle, and correct the error reporting on create site
                                 38488: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      37940: SPP Vti SOAP error codes must be zero padded to 8 characters
                                 38489: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      37941: Improve error handling in create/set title/delete, and match the required error codes
                                 38491: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      38005: Correct logic to fix test
                                 38493: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      38006: DTEND is optional in iCal, if not set it means the meeting ends at the start time
                                 38494: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      38007: Pull out commong workspace related code to a parent endpoint class
                                 38496: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      38009: Sharepoint [MS-VERSS]: GetVersions should state whether file has versioning enabled.
                                 38498: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      38011: More refactoring to use the new commong workspace parent endpoint
                                 38501: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      38012: Start to clean up how exceptions are done in the meeting handler layer
                                      38013: Start to refactor the common parts of meetings to a parent abstract class, and stub out the SetAttendeeResponse endpoint
                                      38014: Fix import warnings
                                      38015: More towards Add/Update/Restore meeting
                                      38016: Common building of the MeetingBean
                                      38017: Improve error reporting on add/update meeting, to match the spec requirements
                                      38018: Sharepoint [MS-DWSS]: CanCreateDwsUrl returns GUID if requested name is empty string.
                                      38019: ALF-14687 - ISO8601 dates from non-Alfresco sources may have more than 3 millisecond digits
                                      38020: Stub out the SetAttendeeResponse endpoint, but the handler does nothing with the details
                                      38021: More meeting exception improvements
                                 38503: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      38077: Refactor the Meeting related endpoints to use common superclasses, and fix some common problems / exception handling in the process
                                      38078: Further error handling checks
                                 38504: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      38080: Match the rather strange behaviour of getMeetingsWorkspaces and the recurring flag, as set down in the spec
                                 38505: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      38088: Sharepoint [MS-DWSS]: partial fix to XML fault message generation.
                                      38089: Sharepoint [MS-DWSS]: fuerther partial fix to error message generation for CreateDws.
                                 38506: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      38091: Sharepoint [MS-DWSS]: S1_TC08: returning error with AlreadyExists but should be ServerFailure.
                                 38507: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      38093: Support filtering by boolean properties, as well as String ones, in GetChildrenCannedQuery
                                      38094: Support for listing calendar entries by their outlook status (isOutlook / OutlookUID), via a Canned Query
                                      38095: De-Lucene the SharePoint / Vti Meeting Service handler, using the new CalendarService list method
                                      38096: Sharepoint [MS-DWSS]: S1_TC09 and others, hyphens in GUID were being translated to underscores.
                                      38097: Vti/SPP support for restoring a deleted meeting (assuming it is still available in the archive store)
                                 38508: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      38099: Make the error message a bit more helpful, in the case that the assoc qname is too long
                                      38100: Check for errors from the create site share call
                                      38101: Validate that the site Short Name isn't too long during creation, and throw a helpful exception if it is. (Site Short Names get used in Authority Names, which are limited by the DB model to 100 characters)
                                      38102: Update the site name max length check - need to account for the role group names too
                                      38103: There is a maximum size of a site short name, based on the limits of the authority names in the permissions service, so truncate the Vti/SPP site name before creation to fit within that
                                      38104: Specific error response needed for GetMeetingsInformation on a subsite
                                 38509: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      38134: Sharepoint [MS-VERSS]: S1_TC05 removed manual entity encoding of quotes, as dom4j was then escaping the ampersands.
                                 38510: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      38139: Sharepoint [MS-DWSS]: fixed error message generation for CreateFolder.
                                      38140: Sharepoint [MS-DWSS]: Result element should be standalone XML.
                                      38141: Start removing deprecated, old style lists in favour of the full list support
                                 38511: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      38143: Improve handling of abstract lists, and convert more classes to use that method
                                      38144: More convertions to AbstractListEndpoint, and improve logging by centralising it better
                                 38512: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      38146: Prepare to do more of the List details not via hard coded FTL
                                      38147: Convert to only having the fields hard coded in the ftl, and the rest dynamically generated
                                      38148: Remove deprecated old style ListBean (now all replaced with ListInfoBean), and tidy up around the removal
                                 38514: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      38156: Start on processing the request for UpdateListItems, and support GetList by UID as well as Name
                                      38157: Sharepoint [MS-WEBSS]: fixed GetWeb to respond with the "context site" if "." or "" requested in SOAP body.
                                 38515: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      38229: Improve the list definition model, and add more support for UpdateListItems
                                 38516: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      38231: Refactor the current (rather hard coded) GetListItems support into an abstract class, and then use that to stub out the other two GetListItems* endpoints
                                      38232: Sharepoint [MS-WDVMODUU]: implemented WebDAV PUT method.
                                      38233: Stub out Change Since support
                                 38517: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      38237: Improve error handling, and reduce some duplication
                                      38238: More details needed
                                      38239: Use the same rendering of a list details
                                 38518: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      38381: ALF-14835: Sharepoint/WebDAV: exclusive lock fails deemed to be owned by someone else.
                                      38382: Sharepoint [MS-WDVMODUU]: activity posting disabled upon DELETE.
                                 38785: Merged alfresco/HEAD to alfresco/BRANCHES/DEV/CLOUD1_SP:
                                      38752: WebDAV/Sharepoint: extracted WebDAVHelper to spring configuration.
                            44543: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
                                 38996: WebDAV: added getUrlPathPrefix tests for WebDAVHelper.
                                 38997: WebDAV: added setter for urlPathPrefix property (to aid in spring config), ensures path prefix terminated in slash.
                                 39001: WebDAV: getURLForPath(...) appends trailing slash to path prefix if missing.
                                 39002: WebDAV: removed redundant createDAVHelper() method.
                                 39016: WebDAV: added getRepositoryPath(request) method (replaces WebDAV's static method)
                                 39017: WebDAV: replaced use of static WebDAV.getRepositoryPath(req) with non-static version in WebDAVHelper.
                                 39019: Cloud/SPP: thor module must have dependency on SPP module.
                                 39020: Cloud WebDAV: CloudWebDAVServlet no longer uses static getRepositoryPath(req) method.
                                 39021: Cloud WebDAV: override getRepositoryPath(req) with version that gets path within tenant.
                                 39023: SPP core: added hook to VtiWebDavAction to allow overriding of execution behaviour.
                                 39025: SPP: minor logging improvement.
                                 39026: SPP: define SPP version of WebDAV helper and inject into VtiWebDavAction instances.
                                 39060: Cloud SPP: introduced cloud/spp webdav helper.
                                 39061: Cloud SPP: missing part of commit, moved methods out of CloudWebDAVHelper and into SPPCloudWebDAVHelper.
                                 39095: Cloud WebDAV: move doclib URL munging out of core WebDAV.
                                 39182: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      39167: WebDAV: remove static replace(str, repl, with) method.
                                 39185: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      39172: WebDAV: removed static WebDAV.getRepositoryPath() method. Only use the non-static version.
                                 39186: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      39173: WebDAV: fix broken code from moving inlining of getRepositoryPath(...) from WebDAV to WebDAVHelper.
                                 39187: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      39174: WebDAV: removed redundant DIR_SEPARATOR constant.
                                 39189: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      39178: WebDAV/SPP: remove static WebDAV.getURLForPath(...) methods.
                                 39323: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      39203: WebDAV: fix broken UnlockMethodTest.
                                 39324: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      39204: WebDAV: fix broken WebDAVMethodTest.
                                 39325: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      39309: Sharepoint: no longer uses sysAdminParams to determine incoming URL path prefix.
                                 39330: Sharepoint: fix code broken by merge -c 39325 (from HEAD).
                                 39346: Cloud/sharepoint: fix for merge from HEAD, -c 39309 (remove sysAdminParams as supplier of URL path prefix)
                                 39365: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      39364: Sharepoint: making PROPFIND more tolerant of null values in a node's properties.
                                 39474: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      39473: WebDAV: introduce getChildren() method for helper.
                            44544: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
                                 39541: Sharepoint: added test for decomposeDocumentURL functionality.
                                 39552: Sharepoint: added doDecomposeURLWork test for incorrect URI path prefix.
                                 39570: Sharepoint: refactoring for cloud overrides and testing improvements.
                                 39674: SPP core: use VtiPathHelper.getPathForURL() instead of using request directly.
                                 39676: SPP core: refactored action execution to provide hook for subclasses.
                                 39695: SPP: null GUID no longer results in an empty rid{}
                                 39696: SPP core: VtiWebDavAction - setting the method's details is delegated to the DAV executor.
                                 39698: SPP core: added hook for detecting whether a URI path does not specify a site.
                                 39701: SPP core: abstract parent for vtiRequestDispatcher makes it possible to override bean and inherit configuration.
                                 39702: SPP core: move support methods from test class into abstract base class.
                                 39705: SPP cloud: added cloud specific filter and path helpers.
                                 39707: SPP cloud: remove redundant code from CloudwebDavExecutorImpl
                                 39708: SPP cloud: introduce request handling logic in common for WebDAV and SPP.
                                 39709: Cloud SPP/webdav: WebDAV uses common request handling class.
                                 39710: SPP cloud: SPPCloudWebDAVHelper was incorrectly stripping off tenant domain for getRepositoryPath().
                                 39712: SPP cloud: introduce a cloud-specific VtiRequestDispatcher.
                                 39723: SPP core: servlet filter now registered for forwards as well as fresh requests.
                                 39724: SPP core: removed URL decoding of URL in XML response generation.
                                 39759: SPP core: use separate servlet mappings for /alfresco/* and /*
                                 39865: Cloud SPP: cleaned up runAsTenant usage.
                                 39868: SPP cloud: missing files from previous commit ("cleaned up runAsTenant usage")
                                 39916: CLOUD-28: cloud SPP raises activity posts for PUT, DELETE.
                                 39930: Cloud SPP: tenant domain is extract from RPC method request with "url" parameter, instead of through request URL path.
                                 39941: Cloud SPP: reintroduced separate instances of CommonRequestHandling that was lost by moving instantiation into spring.
                                 39971: CLOUD-137: 4.4 Add Mixpanel Analytics events to SharePoint Protocol
                                 39972: CLOUD-137: 4.4 Added an "spp" event source.
                            44545: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
                                 40006: Bamboo/CI: added dependency on spp module when building cloud.
                                 40007: WebDAV - cloud only: added missing WebDAVHelper constructor argument to spring definition.
                                 40015: Cloud SPP: bake SPP module into WAR file at build time.
                                 40027: Cloud SPP: Committing binaries that can be used by ops for testing/prototyping.
                                 40365: WebDAV/SPP: moved webDAVLockService bean definition into webdav-context.xml
                                 40366: WebDAV/SPP: moved webDAVLockService to remote-api-context.xml
                                 40368: SPP: removed circular task dependency.
                                 40373: Cloud SPP: added incremental-spp-tomcat-exploded as dependency of incremental-cloud-repo-exploded
                                 40376: Test to see if this fixes build failures, by adding SPP classes/config to unit testing classpath.
                                 40380: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      38861: WebDAV: fixed dependency problem; fixes test RepositoryStartStopTest.
                                 40384: Cloud SPP: ensure jetty libs on classpath during test.
                                 40392: Cloud SPP: remote-api-context.xml must be loaded before cloud and SPP modules.
                                 40400: Cloud SPP: fix classpath to use fileset instead of pathelement.
                                 40444: SPP build problems: attempt to ensure thor config comes after SPP config in unit testing classpath
                                 40447: Cloud SPP: ensure SPP module is loaded prior to cloud module.
                                 40450: SPP Cloud: backing out change 40444 (CI build changes)
                                 40451: SPP Cloud: another attempt to straighten out testing classpath problems.
                                 40456: Temporarily disabling explicit SPP module import.
                                 40483: Cloud SPP: fixed broken test and clarified behaviour in comments.
                                 40519: Cloud SPP: remove exclusion of module.properties when copying resources during deploy-spp-tomcat-exploded ant target.
                                 40523: CLOUD-25: 3.1 The protocol must be secured using the user's standard Cloud credentials
                            44546: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
                                 40551: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                      38401: Fix activities feed mail notifications.
                                      38614: Resolve CLOUD-157: Cloud1 does not deploy due to addDutchEmailTemplates patch failing
                                      38676: Exclude irrelevant tests even if minimal.testing? flag is not set
                                      38726: Resolve CLOUD-160: "Data too long for column 'report' at row 1" when deploying Cloud1-144 to Test
                                      38734: Fix CLOUD1 build to ensure test results from previous builds are cleaned
                                      38754: Fix test
                                      38765: Merged BRANCHES/V4.0 to BRANCHES/DEV/CLOUD1:
                                           37766: Fix for ALF-14529 Share Solr admin console page shows "Unavailable: 05120041...
                                           37800: ALF-14145 Flash preview quality is poor
                                                - Reverting change r30483 V3.4-BUG-FIX Sept 13 2011 for ALF-9417
                                                      swf.encoder.params=-s zoom=72 -s ppmsubpixels=1 -s poly2bitmap=1 -s bitmapfonts=1
                                                  being changed back to:
                                                      swf.encoder.params=-s poly2bitmap,subpixels=72
                                                  The original 001-Cover_Cover.pdf file from ALF-9417 does now preview in 4.0.2
                                      39058: CLOUD-190: Ensure that sub-folders of folders named "res" and "proxy" can accessed.
                                      39206: Fixed CLOUD-198 "WASA - XSS issue with quickshare"
                                      39210: Cloud1 build fix
                                      39236: Fixed and baked in Share Hazelcast Cloud specific configuration into thor-share module. Now only need to override hz:hazelcast bean with AWS key specifics for test/production.
                                      39314: Resolve CLOUD-203: WebDAV incorrectly handles file / directory names with spaces in them
                                      39341: Resolve CLOUD-181: Webdav Cluster Failiure in Cloud1 build 148 startup error: java.lang.ArrayIndexOutOfBoundsException: 72
                                      39357: CLOUD-164: Remove categories from document library
                                      39358: Resolve CLOUD-186 500 error displayed when trying to add 'Content I'm editing' dashlet
                                      39388: Resolve CLOUD-185: My / Site Activities displayed incorrectly
                                      39391: Resolve CLOUD-161 Patching is taking too long - specifically patch.fixBpmPackages
                                      39499: Resolve CLOUD-395 TEST server startup log - upgrading to cloud1
                                      39500: Resolve CLOUD-187 java.lang.IllegalArgumentException: Must provide existing lockToken
                                      39554: BDE-90: Setup build for deployment of Cloud artifacts to Maven repository
                                      39559: Merged THOR1 to CLOUD1
                                           38529: CLOUD-399 / ALF-14887: User sign-up issue
                                              - Workflow prior to mobile registration did not have the isPreRegistered property. Changed it so that if the property does not exist, it defaults to false.
                                              - Logged warning with email address in log for easier location of error.
                                           39553: CLOUD-400 / ALF-15149: Prevent an infinite loop in AlfrescoSolrEventListener.RemoveNullEntriesCacheMatch.updateCache()
                                      39563: Merge BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to DEV/CLOUD1 (r38673-39562)
                                      39567: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                                           39566: Allow the sync mode to be fetched by guest (it need not be hidden), then fetch from Share as guest, to avoid problems when fetching the sync mode if the current user's credentials have expired (otherwise it breaks the redirect back to the login)
                                      39568: Fix YUI options to match the version in use (-p is no longer supported)
                                      39569: Cloud is always build on top of enterprise, so remove the duplicated projects.xml taken from enterprise and use the enterprise projects.xml instead. (Fixes warnings during build)
                                      39575: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                                           39574: Cloud lacks a guest mode, so switch to unauthenticated for the sync mode fetch (user credentials may not be available)
                                      39579: Undoing some CloudSync-specific restrictions on what test cases are run.
                                      39584: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                                           39580: CloudSync: fix Unsync - to ensure we don't leave sync aspects (such as failed, which reappears if src file is re-synced)
                                      39586: Merged V4.1 to CLOUD1 (might fix the build)
                                           39207: ALF-15015 follow-up: make sure the first enterprise test that runs has no specific license, since we just reset the database
                                      39588: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                                           39587: ALF-15222: Cloud Folder picker: Newly created folder isn't selected
                                      39596: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                                           39589: ALF-15098: Folder Picker causes JS error in the document details page
                                           39561: Mark from Thor1 to V4.1 to Cloud1
                                      39602: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                                           39076: ALF-15013 ALF-15015: Reset database before running enterprise tests, otherwise SecurityTestSuite leaves it in a bad state
                                      39608: Removed incorrect com.sun import
                                      39610: Merged HEAD to BRANCHES/DEV/CLOUD1
                                           38834: Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD
                                              38607: Fix for ALF-14934 - Components YUI menus hit area is small. iPad specific CSS fix.
                                              38631: ALF-14820 - Document Library - Upload actions and File Browse buttons (doclib, user profile image, upload vers   ion etc) - not appropriate for iOS.
                                              38632: ALF-14934 - increased hit area for filter and tree/category nodes for ios.
                                              38667: Repository toolbar changes for ALF-14820
                                              38668: Patched YUI menus to support additional touch events (touchend specifically) and as custom menu events to fix   ALF-14809.
                                              38738: Correct fix for ALF-13650:
                                                     Double byte code white spaces in front and at the end of a file name should be removed as the same behavior of    Single byte code white space. Altered Alfresco.util.trim() in order to support double byte code white spaces.
                                                      - did not handle null/defined which are returned when creating content in Wiki, Blog and Discussions.
                                              38745: ALF-14807 - Fixes related to long file name display margins for iPad on Document Details page.
                                              38790: ALF-14927: Ensure that RSS feed URLs are maintained in RSS dashlet when the URL contains request parameters
                                              38792: ALF-13297 - removed install WebScript webscripts (updated Surf libs - r1094)
                                              38831: Fix for ALF-14992 - Share: display list of rules for a folder: unterminated string literal
                                                     - actually a wider spread issue of failing to handle multiple line field values (e.g. "description" fields) wh   en rendering json into a component page or template
                                           39067: Fixed drag n drop issues for m.share on ipad
                                                  - Added ootb support for touch events to drag n drop classes in yui-patch.js
                                                  - ALF-14816 Dashboard - Cannot customize dashboard layout
                                                  - ALF-14817 Customize Site - Can't add or change the order of page components
                                                  - ALF-14822 Rules - Cannot reorder rules when multiple rules are defined on a folder
                                                  - This also means all "dividers" on the documentlibrary, discussions etc pages now work
                                      39614: Reinstate repository tests (so far, only RepositoryStartupTest is run)
                                      39615: BDE-90: do not try to deploy to Maven repo artifacts which are not built
                                      39642: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                                           39597: CloudSync: tweak a couple of unit tests
                                           39598: CloudSync: ALF-14655 - update simple file sync (to test multiple sync'd files)
                                           39606: CloudSync: minor log level adjustments
                                           39607: CloudSync: ALF-14483 - SyncTracker - enable sync sets to be pushed in parallel
                                           39613: Refactor of test code. SyncTrackerComponentTest now uses JUnit Rules to manage temporary content and to undo mocking out of services.
                                           39616: CloudSync: CloudSync: ALF-14483 - SyncTracker - multiple syncs (to different tgt folders) with multiple files
                                           39633: CloudSync: ALF-14483 - SyncTracker - enable sync sets to be processed in parallel
                                           39639: ALF-15238: Bitrock Installer: Readme.txt should be updated - Alfresco version is 4.0
                                           39640: ALF-15231 Restore, with refactorings / making more general, the ability to lazy create the remote credentials container if bootstrap has not created it (eg on Cloud)
                                           39641: ALF-15230 Refactor the lazy container creation code, to use the new SystemNodeUtils helper
                                      39644: ALF-15230/ALF-15231 Disable two patches on cloud, which create new system containers, as the number of tenants means this is a large amount of work. Services will not lazy create if needed, but for on-premise we retain the up-front creation to avoid surprises and allow predictable permissions in advance if required
                                      39645: Disabling one test on CLOUD1, pending discussion with Mark, Jan.
                                      39661: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1
                                           39660: Fix for ALF-14244 - Sort options are not appropriate for some pre-canned Document Library queries and need disabling in the UI as they can confuse the user. Implemented by Valery Shikunets.
                                      39666: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                                           39665: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                39664: CloudSync: ALF-14483 - SyncTracker unit tests - simple file sync test
                                      39675: Resolve CLOUD-410: Disable multi-threaded SOLR
                                      39680: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                                           39643: ALF-15220: Indirect sync and sync failed indicators appeared together on nodes during the demo
                                           39653: ALF-15041: Cloud Sync doesn't work with IE7
                                           39670: Rework to cloud key license stuff - introduces a ValidLicenseEvent
                                           39673: New unit test for adding checked out nodes into a sync set.
                                           39677: ALF-14903 Move the Sync allowed/not-allowed check, based on Network/Tenant, to AbstractCloudSyncAbstractWebScript, and have this used by the webscripts based on this too. Then, allow UnSync to proceed no matter what the tenant status, and add unit tests
                                      39699: ALF-14454: get rid of hrtlib.jar
                                      39700: BDE-90: deploy cloud-specific artifacts
                                      39731: CLOUD-421: Merged PATCHES/V4.0.2 to CLOUD1
                                           39725: ALF-15176: Multi-threaded SOLR tracking suddenly stops leaving transactions unindexed
                                              - Debugged on environment provided by Antonio
                                              - If the last incomplete batch in a chunk consists entirely of empty transactions (or transactions consisting entirely of nodes updated in later transactions) it would loop forever
                                      39738: CloudSync: add default (info) Sync log level
                                      39744: Merged HEAD to BRANCHES/DEV/CLOUD1 (for BDE-73):
                                           39282: Get context from classpath rather than file system
                                           39409: fetch application context from classpath rather than file system
                                           39433: tune AVM tests to make them resilient to a change of working folder
                                           39743: Allow to override the location of test resources using a system property
                                      39745: BDE-73: Add experimental pom.xml files
                                      39755: BDE-73: Add experimental pom.xml files
                                      39830: Resolve CLOUD-423: Concurrent registration / account activations are not handled gracefully
                                      39855: BDE-73 Configure Sonar properly + filter a few failing tests
                                      39877: CLOUD-438: Merged V3.4-BUG-FIX to CLOUD1
                                           36446: Fix for ALF-13404 - Performance: 'Content I'm Editing' dashlet is slow to render when there is lots of data/sites
                                            - Effectively removed all PATH based queries using the pattern /companyhome/sites/*/container//* as they are a non-optimized case
                                            - Replaced the "all sites" doclist query using the above pattern with /companyhome/sites//* plus post query resultset processing based on documentLibrary container matching regex
                                            - Optimized favorite document query to remove need for a PATH
                                            - Optimized Content I'm Editing discussion PATH query to use /*/* instead of /*//*
                                            - Fixed issue where Content I'm Editing discussion results would not always show the root topics that a user has edited
                                            - Added some addition doclist.get.js query scriptlogger debugging output
                                           36449: ALF-13404 - Fix for issue where favoriates for all sites would be shown in each site document library in the My Favorites filter.
                                           37190: Merged PATCHES/V3.4.6 to V3.4-BUG-FIX
                                              37189: ALF-13404: Performance: 'Content I'm Editing' dashlet is slow to render when there is lots of data/sites
                                                 - Additional query improvement by Pavel
                                           37835: Fix for ALF-14429 - Recently Modified dashlet takes up to 30 seconds to load after upgrade to Alfresco 3.4.6.23
                                      39878: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1
                                           39775: ALF-15271: "Site Content" dashlet shows all documents from all the sites in Alfresco Share
                                      39919: Added additional configurable datasource that is used by activiti IdGenerator to fetch new block of ID's. Can be defined using JNDI-lookup, reverts to default datasource based on well-know alfresco-properties.
                                      39925: CLOUD-422: Reverted revision 39919, will be re-comitted after CLOUD1 released
                                      39954: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                                           39655: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                39490: Changing the icon for creating a new folder in the cloud
                                                39580: CloudSync: fix Unsync - to ensure we don't leave sync aspects (such as failed, which reappears if src file is re-synced)
                                                39587: ALF-15222: Cloud Folder picker: Newly created folder isn't selected
                                                39589: ALF-15098: Folder Picker causes JS error in the document details page
                                                39597: CloudSync: tweak a couple of unit tests
                                                39598: CloudSync: ALF-14655 - update simple file sync (to test multiple sync'd files)
                                                39606: CloudSync: minor log level adjustments
                                                39607: CloudSync: ALF-14483 - SyncTracker - enable sync sets to be pushed in parallel
                                                39613: Refactor of test code. SyncTrackerComponentTest now uses JUnit Rules to manage temporary content and to undo mocking out of services.
                                                39616: CloudSync: CloudSync: ALF-14483 - SyncTracker - multiple syncs (to different tgt folders) with multiple files
                                                39633: CloudSync: ALF-14483 - SyncTracker - enable sync sets to be processed in parallel
                                      39955: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                                           39656: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                39640: ALF-15231 Restore, with refactorings / making more general, the ability to lazy create the remote credentials container if bootstrap has not created it (eg on Cloud)
                                                39641: ALF-15230 Refactor the lazy container creation code, to use the new SystemNodeUtils helper
                                                39643: ALF-15220: Indirect sync and sync failed indicators appeared together on nodes during the demo
                                                39653: ALF-15041: Cloud Sync doesn't work with IE7
                                      39956: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                                           39736: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                39735: CloudSync: ALF-14483 - multi-threaded SyncTracker
                                           39866: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                39670: Rework to cloud key license stuff - introduces a ValidLicenseEvent
                                                39673: New unit test for adding checked out nodes into a sync set.
                                                39677: ALF-14903 Move the Sync allowed/not-allowed check, based on Network/Tenant, to AbstractCloudSyncAbstractWebScript, and have this used by the webscripts based on this too. Then, allow UnSync to proceed no matter what the tenant status, and add unit tests
                                                39683: ALF-15162 - Unclear error message when delta syncing and the target is gone
                                                39686: Replaced GPL license with enterprise licence.
                                                39687: Enterprise license for enterprise remote api project
                                           39867: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                39747: ALF-14377	Need to decide what to do when SSD creator user is no longer valid 
                                                     - part 1 nodes are marked.
                                                39748: CloudSync: fix compile error
                                                39767: CloudSync: fix ALF-15145 - Unsync of a folder (sync) that has a working copy file causes indirect icon to remain ...
                                                39775: ALF-15271: "Site Content" dashlet shows all documents from all the sites in Alfresco Share
                                                39810: ALF-15221: Cloud Sync Status: Failure message when getting location is misleading
                                                39812: UI Bug Fixes:
                                                     - ALF-15174: Uses already copied slingshot.properties file for message strings needed in both repo and Share
                                                     - Cloud delete file message shouldn't refer to the cloud
                                                39820: ALF-15267: Edit online is available for locked on-premise copy 
                                                39826: ALF-14377 - Need to decide what to do when SSD creator user is no longer valid
                                           39870: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                39847: ALF-15185: YUI Overlay Mozilla Scrollbar fix should be prevented in recent versions of Firefox too.
                                                39859: ALF-15249 Add a new method hasSyncSetDefintions, with unit test, and use this to skip the Sync Pull step on-premise if no SSDs have been defined on the local system
                                                39860: ALF-14908: Update Sync status dialogue to include the local root folder for indirectly synced nodes.
                                           39914: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                39863: ALF-15268: Cancel button disabled in the target selection window for new folder creation in Cloud
                                                39864: ALF-15003 Sync failed for the file (where write access on source removed for sync owner) but no matter this file appears in Cloud
                                                39876: ALF-15301: IE8 specific: It is impossible creating a new folder in a cloud target selection window/Cloud location
                                                39883: CloudSync: fix ALF-15270 - moving directly synced node (on source) causes target node to be deleted
                                                39902: ALF-15041: Cloud Sync doesn't work with IE7
                                                39903: ALF-15041: Cloud Sync doesn't work with IE7
                                                39904: ALF-15041: Cloud Sync doesn't work with IE7
                                           39920: Bug fixing for CSS issues
                                      39959: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                                           39951: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                39915: ALF-14908: Update Sync status dialogue to include the local root folder for indirectly synced nodes
                                                39924: CSS fixes for the sync panel
                                                39942: ALF-14911 - Path shown in the version comments does not match the path shown in the sync status dialogue
                                                     - first part share paths are now handled separatly
                                                39943: CloudSync: fix remainder of ALF-15130 - sync time for initial sync of working copy (+ unit test)
                                           39952: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                38871: (RECORD ONLY) Adds edition check before calling enterprise only webscript. Sets sync to OFF for non enterprise editions.
                                                38956: (RECORD ONLY) Chinese Translation for 4.1
                                                39011: (RECORD ONLY) ALF-14225: Refactor Welcome Dashlet to show 4 columns, the 4th one of which is always the cloud sign up text.
                                                39024: (RECORD ONLY) ALF-14225: Adds tracking to URL.
                                           39958: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                39957: CloudSync: minor - some info logging (applies to src + tgt)
                                      39967: CLOUD-165: Merged 4.1-BUG-FIX to CLOUD1
                                           39962: ALF-15158: Downloading Office 97 files with .doc extension result in file with .dot extension when using Google Chrome
                                             - Added more complete and intelligent content disposition header with the aim of supporting  RFC 5987
                                      39977: CLOUD-454 - merge asynchronous dashlet improvements and remove inappropriate sections.
                                      40048: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1
                                           40022: Fix for ALF-15144 - Slow Share doclib high-level folder browsing due to version history retrieval (CLOUD-467)
                                           40047: Fix from Mike Hatfield for ALF-15372 - Chrome is blocking google map display for geo tagged pictures (CLOUD-468)
                                      40078: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                                           note: "blending" cloud sync fixes into CLOUD1 (as requested by BR)
                                           39997: ALF-14377: Need to decide what to do when SSD creator user is no longer valid
                                           40013: "Cloud Sync" link should not be shown in "My Profile" in the Cloud
                                           40056: Merged the sync specific changes to the other presentation.css files
                                           40070: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC: (record-only: NB - already manually merged)
                                                 39566: Allow the sync mode to be fetched by guest (it need not be hidden) ...
                                                 39574: Cloud lacks a guest mode, so switch to unauthenticated for the sync mode fetch (user credentials may not be available)
                                           40071: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                39996: ALF-14377: Need to decide what to do when SSD creator user is no longer valid
                                                40010: Enhancement to TemporaryNodes JUnit @Rule so that it gracefully handles checked-out nodes during test code.
                                                40017: During work for ALF-15296, I've fixed up the error handling during sync set creation.
                                                40019: Having fixed the TemporaryNodes @Rule in rev 40010 so that it handles checked-out test files gracefully, I'm removing Jan's workaround for a checked-out test file.
                                                40036: Addressing the important question raised in ALF-14950.
                                                40054: CloudSync: add simple *folder* sync unit test !
                                                40065: Removal of potential NullPointerException (not observed).
                                                40067: CloudSync: ALF-15287 - folder sync to a clashing name hierarchy causes file to be indirectly synced to the wrong place
                                                40068: Java doc corrections.
                                                40069: ALF-15364: CloudSync: folder sync with lock on-premise - pulled new file is not auto-locked
                                      40104: Fix for CLOUD-476 - userStatusRelativeTime is still referenced in org/alfresco/components/dashlets/my-profile.get.js and causes exception on user profile page when user status has been set.
                                      40147: French: Cloud Translation update from Gloria (based on EN rev38372)
                                      40173: Merged V4.1-BUG-FIX to CLOUD1
                                           38178: ALF-14720: Get rid of big, unused class
                                      40174: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                                           40092: Changing the color of the "Synced Folder" link for each theme
                                           40094: Property translation problem fixed: If there is a replacement parameter (e.g. {0}) and an apostrophe in a property the apostrophe needs to be escaped by using a double apostrophe otherwise the property cannot be translated correctly.
                                           40172: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                40072: Error message string updates, based on feedback from Docs.
                                                40076: Fixes encoding error introduced in r40072.
                                                40169: CloudSync: fix ALF-15380 - source file is deleted (or unsync with delete) but an unpulled target update causes target to remain synced (and/or not deleted)
                                      40343: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                                           40333: Probable fix for ALF-15430. sys:hidden aspect needs to be handled consistently by Hybrid Sync.
                                      40363: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                                           40356: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                40176: CloudSync: add simple rename test (file + folder sync)
                                                40282: CloudSync: ALF-15468 - Can't create cloud sync connection from Enterprise 4.1 to Alfresco "in the cloud" !
                                                40328: CloudSync: minor - unit test updates (for simple move of directly synced nodes - file or folder)
                                                40333: Probable fix for ALF-15430. sys:hidden aspect needs to be handled consistently by Hybrid Sync.
                                                40334: Removing unused import - also want to trigger rebuild on this plan as I suspect it failed randomly.
                                                40349: CloudSync: fix move out (=> target delete) - add unit tests ( ALF-14655 / ALF-15011 )
                                      40402: Fix to CSS error in cloudsync merge - incorrectly overridden font-size in H3 dashlet contents (fix from Mr "I read CSS in my sleep" Hatfield).
                                      40421: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                                           40419: Fix for the MLText parts of ALF-15502.
                            44550: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
                                 40565: CLOUD-23: core changes to allow overriding of "edit online" button's URL generation.
                                 40566: CLOUD-23: override "edit online" button's URL generation to work with cloud format SPP URLs.
                                 40628: Cloud SPP: stop SOAP/RPC requests being rejected when URL is outside of doclib.
                                 40653: CLOUD-26: 4.1 All protocol features outside browsing the document library should be disabled
                                 40667: CLOUD-26: core change to support both Thor and standard URL schemes.
                                 40668: CLOUD-26: fix Document Management sidebar before disabling unwanted features.
                                 40670: CLOUD-26: fixing "add new members..." to work with cloud (before disabling feature!)
                                 40677: Cloud SPP: fix disallowing of unsafe methods outside of doclib, fixed to allow all methods to Sharpoint protocol methods and fixed tests.
                                 40683: CLOUD-26: core changes to allow easy overriding of dwsServiceHandler bean without having to respecify configuration settings.
                                 40686: CLOUD-26: disable Members tab in Document Management sidebar of Office 2007.
                                 40693: CLOUD-26: disable Links tab of the Document Management sidebar in Office 2007.
                                 40814: Cloud SPP: users were unable to list/edit files within their non-home tenant.
                                 40846: CLOUD-28: made activity "appTool" parameter a configurable value.
                            44551: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
                                 40861: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                      40854: ALF-15557: Sharepoint subsystem to create activity records
                                 40863: Cloud SPP: Removed activity posting code made redundant by commit 40861
                                 41037: CLOUD-23: SPP can be deployed to the root context, i.e. "/"
                                 41079: CLOUD-26: core SPP changes to allow overriding of behaviour.
                                 41080: CLOUD-26: disable "documents" tab in document management sidebar of Office 2007.
                            44552: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
                                 41102: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                      40553: Remove on-premise style MT store Id extraction code from syncmode config lookup.
                                 41103: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                      40783: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                                           40782: Fix ALF-15420: Move: child files/subfolders aren't synced after moving from parent folder and updating in Alfresco on-premise/Cloud
                                 41106: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                      40871: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                                           40342: Merged BRANCHES/DEV/THOR1_REST_API1 to BRANCHES/DEV/THOR1_REST_API2:
                                                35747: Merged BRANCHES/DEV/THOR1_REST_API to BRANCHES/DEV/THOR1_REST_API1:
                                                     34235: Upgraded Jackson to 1.9.4
                                                     34258: Removed invalid bean definitions (classes don't exist) for abstract="true" beans.
                                                     34463: Exported=true 
                                                     34464: Removed unused parent workflow
                                                     34465: Added a createComment method (Just cut and pasted Neils testcase code).
                                                     34466: Initial check-in of Rest Api code.  Still quite a bit to do.
                                                     34619: Added sources
                                                     34620: Going to start another Sprint so I need to check in everything up to date. WIP
                                                     34691: Renamed Action interfaces for better consistency, Fixed up POST methods with better Metadata about resources and fixed failing tests
                                                     34727: Reworked the Resource execution, added PUT webscript, improved the tests.
                                                     34853: Implemented HTTP Methods: GET, PUT, POST, DELETE with better test cases
                                                     34856: Initial cut of rest api implementations. Work in progress.
                                                     34935: Added EmbeddedEntityResource and uniqueid annotations. Recursively calls embedded entities, improved tests.
                                                     34956: Attempted simplification by removing the CollectionResource concept -> Just an EntityResource with 5 potential methods.
                                                     34986: 2nd cut of rest api implementations: still wip.
                                                     34987: Added a readById method for Resource GET using the relationship id
                                                     35007: Rest API (THOR-1150, THOR-1151, THOR-1152, THOR-1153, THOR-1220, ):
                                                         - explicitly set default timezone for date serialization/deserialization to UTC
                                                         - more rest api implementation tests
                                                         - rest api implementation re-factoring resulting from changes to the framework
                                                     35024: Automatically sets the id of passedIn object for a HTTP PUT for relationship resources.
                                                     35051: Further impl for public api: THOR-1150 -> THOR-1153 and THOR-1220
                                                     35059: Separated the GET executor so the embedded objects are called correctly.
                                                     35102: Added Paging, fixed up the Tests.
                                                     35117: wip, rest api implementations
                                                     35312: Made final
                                                     35313: Better exception handling with messages
                                                     35314: Improved paging/params and messages, started on embedded relations
                                                     35322: Added support for relations projections, to filter by properties use "properties" param, to add in relations use the "relations" param
                                                     35329: Handles null relationship keys
                                                     35377: Checks for simple property types which don't allow embedding
                                                     35496: WIP: rest implementations, test framework and tests
                                                     35529: Initial commit of scope and versioning support.
                                                     35539: Fixed the versioning for relationship resources
                                                     35560: Quick cleanup
                                                     35562: Embedded relationships is now working much better
                                                     35586: Safer serialization of Maps/Collections
                                                     35603: Added better version and filtering tests.
                                                     35611: Added Entity and Relationship not found exceptions
                                                     35612: Added Entity and Relationship not found exceptions
                                                     35674: Rest api implementations:
                                                          - node refs are represented solely by their uuid (workspace://SpacesStore is assumed)
                                                          - updates to model classes (hashcodes, equals, etc)
                                                          - more paging support
                                                          - tests
                                                35858: Merged BRANCHES/DEV/THOR1_REST_API to BRANCHES/DEV/THOR1_REST_API1:
                                                     35773: Added api versioning with @WebApiDeleted annotation.  Better inheritance handling and improved tests.
                                                     35774: Deleted, it wasn't supposed to be there.
                                                35988: WIP:
                                                    - sample requests
                                                    - more tests
                                                    - general fixes, including security fixes
                                                    - tag entity
                                                35990: Merged BRANCHES/DEV/THOR1_REST_API to BRANCHES/DEV/THOR1_REST_API1:
                                                     35938: Reworked filtering in a big way. Hopefully now it works.
                                                     35982: Clean up and bug fix the request
                                                     35983: Clean up and bug fix the request
                                                36002: Merged BRANCHES/DEV/THOR1_REST_API to BRANCHES/DEV/THOR1_REST_API1:
                                                     35992: Clean up after discussions with David/Steve. New Parameter called "parameters"! 
                                                36056: Clean up, not used
                                                36057: Changed the way responses are rendered, more consistent "entry" entries.
                                                36087: Changed the json structure for tests as well
                                                36134: Added paging parameter, cleaned up imports, more tests
                                                36146: WIP:
                                                     - fixed up create tag return type
                                                     - fixed up Person model entity so that it doesn't extend Node
                                                36151: Fix for Serialization of recursive related Collection of results
                                                36168: Better empty collection handling, initial sorting tests.
                                                36189: Fixes embedded resources by correct id.
                                                36210: WIP:
                                                     - updates to rest api request files
                                                     - changed Comment so that it doesn't extend Node. removed title
                                                     - more tests
                                                36211: WIP:
                                                     - service paging and other fixes and updates
                                                36298: Moved jetty files to fix the build (it's odd that cloud -r works and yet continuous.xml does not)
                                                36299: Update classpath as a result of jetty jars move
                                                36301: Fix to stop null values in hashmaps from being returned in results.
                                                36302: Added copyright notices
                                                36303: WIP:
                                                     - split site service into a base class (dealing with site permissions and membership) and a subclass (everything else) to aid the following
                                                     - moved site membership functionality into canned queries for person sites and site members relations
                                                     - changed totalItems to an Integer so that it can be null if total items is not known
                                                     - added siteId filtering for activities
                                                     - copyright notices
                                                     - creating a comment through the comment service raises a share-like activity
                                                36304: WIP:
                                                     - changed totalItems to an Integer so that it can be null if total items is not known
                                                     - copyright notices
                                                36309: Servlet API 2.5 needs to be included at the top for the embedded jetty to work - need to revisit this.
                                                36310: Temporary fix for dealing with nodeRefs embedded in activity summaries: regex match and convert to NodeRef.
                                                36312: Fix tests
                                                36325: Add jetty jars to ant test classpath
                                                36327: Site memberships fix, override search subsystem to force lucene, re-instate full site service implementation (Spring circular dependencies are ok)
                                                36335: Add missing file
                                                36367: Fixes to tests
                                                36368: CommentService fix - permissions.
                                                36438: WIP:
                                                    - Person filtering (for cloud)
                                                    - Disabled some tests that are preventing the test from running (will revisit)
                                                    - Person-avatar relation
                                                36522: WIP:
                                                    - fix sort ordering for site members
                                                    - fix site id filter for activity feed list (add tenant id)
                                                36523: WIP:
                                                    - more tests
                                                    - improved robustness of tests
                                                    - added status mappings for EntityNotFound and RelationResourceEntityNotFound
                                                    - for avatar, return base 64 encoded avatar data and avatar node id
                                                    - use more specific EntityNotFound and RelationResourceEntityNotFound exceptions.
                                                36646: Changes resulting from review
                                                     - make sure empty strings and null values are not output
                                                     - person entity tidy-up
                                                     - person visibility rules applied to person retrieval
                                                     - more tests
                                                     - return noderef of avatar node
                                                36668: Fix build, add missing file
                                                36694: Fix failing test
                                                36764: WIP:
                                                     - site containers canned query
                                                     - node ratings: return null average (rather than -1) if there are no ratings
                                                     - site membership canned query sorting - use an enum for sort fields
                                                36767: Add missing files
                                                36769: WIP:
                                                     - node ratings: remove user rating summary, added rating date and fixed up tests
                                                36770: WIP:
                                                     - some changes to property names for activity feed entries
                                                36823: WIP:
                                                    - re-instate -1 for average rating when there are no ratings
                                                36824: Changes resulting from review:
                                                    - merge activities into one relation
                                                    - quota model object to model network quotas
                                                    - Change HomeAccount -> HomeNetwork
                                                    - Changes to comment property names
                                                    - If average rating is -1 (from the rating service) convert to null
                                                    - remove readById from node entity resource
                                                    - Favourite sites url renaming
                                                36825: Removed debug logging for rest api
                                                36826: Commented out tag related tests until I figure out how to get the lucene search working
                                                36833: Added discoverablity for the documentation.  New @WebApiDescription, @WebApiParam annotations
                                                36871: Added tests for @WebApiDecrition, @WebApiParam
                                                37026: WIP:
                                                     - added discoverability annotations
                                                     - changes resulting from review:
                                                        o node ratings output restructure
                                                        o network quotas restructure (need to revisit this again)
                                                     - activity summary post processing framework
                                                     - added non-caching to rest api webscript (need to revisit)
                                                     - don't output empty strings (need to revisit)
                                                     - more tests
                                                37058: WIP:
                                                    - change tag service support
                                                37141: WIP:
                                                     - tag sorting
                                                     - fix JSON issue in PreferencesService
                                                37142: WIP:
                                                     - refactoring: split functional areas into separate REST API implementation classes
                                                     - added copyright notices
                                                     - network quotas represented as a list
                                                     - ensure empty (zero length) JSON strings coming into the REST api are treated as null
                                                37300: WIP:
                                                     - support for update comment
                                                     - activity summary processing
                                                     - web script set no caching and response content type
                                                37301: WIP:
                                                     - support for update comment
                                                37354: Build fix: try rebuilding indexes
                                                37369: Fix build: try again
                                                37498: More logging to determine build failure using lucene for search
                                                37608: Build fix?
                                                37609: Fix build
                                                37637: Fix build: try again
                                                37672: Build fix (try again)
                                                37860: Get networks: consolidate functionality so that it's easily callable from core Thor code and public api code
                                                37861: Get networks: consolidate functionality so that it's easily callable from core Thor code and public api code
                                                37862: Fix for THOR-1493: "OpenCMIS Change Object Id to be Node GUID"
                                                37864: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api"
                                                37866: Unit test fix
                                                37950: Build fix for ApiTest (another try - override repository-properties bean to force lucene)
                                                38051: Build/test fix (another try)
                                                38072: Removed file no longer required
                                                38114: Better representation of the Resource metadata.  Try calling: /alfresco/service/public/alfresco/versions/1
                                                38230: Fix PublicApiTest on the build machine
                                                38309: Public api test fixes
                                                38319: Public api webscript transaction configuration. Make get webscript r/o transaction.
                                                38320: Public rest api: make sure http response headers are written before the response content.
                                                38340: More build test fixes
                                                38349: Fix for THOR-1493: "OpenCMIS Change Object Id to be Node GUID"
                                                    - fix up CMIS query fallout
                                                38530: Fix tests
                                                38531: Fix for THOR-1493: "OpenCMIS Change Object Id to be Node GUID"
                                                     - fix up cmis queries
                                                38552: Further test fixes
                                                38574: Added some comments
                                                38730: Added OPTIONS webscript to get metadata on the current url
                                                38879: Refactored a little to make the code easier to extend / customise
                                                38880: Fixed incorrect config, I should try not to delete things.
                                                38986: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/THOR1_REST_API1:
                                                     38954: Fix for ALF-14475: "CMIS : Wrong cmisra:numItems in folder sites and below with /cmisatom binding url"
                                                39010: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/THOR1_REST_API1:
                                                     39006: Fix for ALF-14475 part 2: "CMIS : Wrong cmisra:numItems in folder sites and below with /cmisatom binding url"
                                                39090: Fixed broken webscript OPTIONS call
                                                39159: Fix broken INFO url mapping
                                                39326: Clean up, Added ResourceMetaDataWriter interface for different meta info presentation formats
                                                39331: The tests need their own context
                                                39609: Update to latest Chemistry libraries
                                                39657: Fix for CLOUD-417, part 1: "Delete a Comment"
                                                39741: Fix for CLOUD-409: "Change Endpoint for CMIS URLs in Staging"
                                                39742: Fix for CLOUD-409: "Change Endpoint for CMIS URLs in Staging"
                                                39750: Fix for CLOUD-417, part 2: "Delete a Comment"
                                                    - added delete comment method to comment service
                                                39754: Fix for CLOUD-417, part 3: "Delete a Comment"
                                                    - fixed up activity generation for update and delete comment
                                                39776: OpenCMIS TCK fix: getDescendants is using node service, which unlike the FileFolderService does not automatically remove hidden files.
                                                39780: Shifted public api opencmis webscript definitions to Thor
                                                39781: Shifted public api opencmis webscript definitions to Thor
                                                39782: Fix for CLOUD-409: "Change Endpoint for CMIS URLs in Staging"
                                                39783: Minor fixes, comments
                                                39785: Public api tests
                                                    - move jetty libraries to 3rd party
                                                    - remove JettyComponent as a Spring bean and change how it's constructed
                                                39786: Fix for THOR-1493: "OpenCMIS Change Object Id to be Node GUID"
                                                    - for unversioned documents, the revision number should not be appended
                                                39794: Added missing files for public api tests
                                                39795: Update to latest Chemistry libraries
                                                39834: Fix for THOR-1493: "OpenCMIS Change Object Id to be Node GUID"
                                                    - for unversioned documents (or documents with version "1.0"), the revision number should not be appended
                                                39835: Fix for CLOUD-362: "Discover Networks" API should be at "/tenants"
                                                39836: Fix for THOR-1493: "OpenCMIS Change Object Id to be Node GUID"
                                                39844: Public api tests
                                                    - move jetty libraries to 3rd party
                                                    - remove JettyComponent as a Spring bean and change how it's constructed
                                                39854: Fix for CLOUD-362: "Discover Networks" API should be at "/tenants"
                                                39856: Re-instate tests.
                                                39857: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api"
                                                     - removed cmisatom url binding (opencmis is now at .../public/cmis/versions/1/atom)
                                                39926: Fix for CLOUD-442: "Public API : Tagging + Paging"
                                                39927: Fix for CLOUD-442: "Public API : Tagging + Paging"
                                                     - updates to public api tests
                                                40185: Make sure LockService is injected into CommentService
                                                40186: Make sure LockService is injected into CommentService
                                                40187: Changes resulting from sprint demo:
                                                    - changes to network and network membership representation
                                                    - embed modifiedBy person object in comment
                                                40211: Changes resulting from sprint demo:
                                                    - changes to network and network membership representation
                                                40212: Fix intermittently failing test
                                                40223: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api"
                                                     - changes resulting from end of spring demo (get repositories located at .../cmis/versions/1.0/atom)
                                                     - removed browser binding for now
                                                40224: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api" (Thor-specific changes)
                                                     - changes resulting from end of spring demo (get repositories located at .../cmis/versions/1.0/atom)
                                                     - removed browser binding for now
                                                40225: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api"
                                                     - changes resulting from end of spring demo (get repositories located at .../cmis/versions/1.0/atom)
                                                     - removed browser binding for now
                                                40254: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api"
                                                     - changes resulting from end of spring demo (get repositories located at .../cmis/versions/1.0/atom)
                                                40255: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api"
                                                     - changes resulting from end of spring demo (get repositories located at .../cmis/versions/1.0/atom)
                                                40256: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api"
                                                     - changes resulting from end of spring demo (get repositories located at .../cmis/versions/1.0/atom)
                                                40270: Turned stacktrace into a String
                                                40339: CLOUD-488: "The activities feed in the public API is not returning all required summary data for comments"
                                           40548: Merged PATCHES/V4.0.2 to BRANCHES/DEV/THOR1_REST_API2:
                                                40526: Fixed ALF-15540: CMIS: Synchronized block in service interceptor
                                           40644: Public api:
                                           40645: Public Api:
                                           40646: Public Api:
                                           40649: Public api:
                                           40650: Public api:
                                           40657: Merged BRANCHES/DEV/THOR1_REST_API1 to BRANCHES/DEV/THOR1_REST_API2:
                                                40515: CLOUD-390: Content models to be filtered out of Cloud CMIS implementation
                                                40550: Public api:
                                                    - updates to datetime property names
                                                40552: Public api:
                                                     - sort sites by site title (by default)
                                                40596: Removed "system" from exclusions for CLOUD-495
                                                40610: CLOUD-495: F414: Add multiple tags to a folder or document
                                           40674: Public api:
                                           40675: THOR-1324: "F414: Add multiple tags to a folder or document"
                                           40676: Public api:
                                           40678: Public api:
                                           40715: Public api:
                                           40730: Merged /alfresco/BRANCHES/DEV/THOR1_REST_API1:r40724  Better meta-data handling for PUT requests
                                           40731: Merged /alfresco/BRANCHES/DEV/AMILLER/CLOUD-496:r40659: CLOUD-500: Add trusted auth with key validation.
                                           40732: Fixed failing test
                                           40739: Merged BRANCHES/DEV/V3.4-BUG-FIX:r40193: ALF-15307 / ALF-15190: FTS indexing can stick forever on purged nodes - May cut 50 minutes off the build time when merged
                                           40742: Public api
                                           40801: Public api:
                                           40802: Public api
                                           40803: Public api
                                           40804: Public api
                                           40807: Public api
                                           40811: Public api
                                           40815: Public api:
                                           40826: Public api
                                 41108: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                      40898: Fix build
                                 41110: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                      40903: Fixed solrcore properties (merge error)
                                 41111: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                      41007: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                                           40998: CLOUD-563: "View external member of the site if internal user is not a member of a site."
                                 41112: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                      41048: 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
                                 41245: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                      41128: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                                           41003: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                                           41026: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                                           41039: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                                           41086: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                                           41115: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                                           41126: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                40364: Testcase for ALF-15178, which is not reproduced.
                                                40419: Fix for the MLText parts of ALF-15502.
                                                40782: Fix ALF-15420: Move: child files/subfolders aren't synced after moving from parent folder and updating in Alfresco on-premise/Cloud
                                           41127: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                41121: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/V4.1:
                                                     41003: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                                                     41026: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                                                     41039: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                                                     41086: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                                                41123: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/V4.1:
                                                     41115: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                                 41247: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                      41149: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                                           41146: Fix trusted authentication against OpenCMIS
                                 41248: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                      41157: BDE-73: finish adding all the code into Sonar report. Tests are not there yet.
                                 41249: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                      41180: 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
                                 41250: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                      41185: BDE-73: Add back web-framework-commons to fix reporting
                                 41251: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                      41192: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                                           41191: Fix for OpenCMIS trusted authentication to allow local opencmis access as before
                                 41252: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                      41209: BDE-73: workaround MDEP-98 encountered with Sonar
                                 41253: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                      41212: CLOUD-610: "Public APIs causing problem with mobile app"
                            44553: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
                                 41293: Cloud SPP only: fix IDE project dependency and classpath for PublicApiTest (and others no doubt) to run.
                                 41294: Cloud SPP: ensure vti and thor module dependency is handled correctly.
                                 41312: Fix build problem: some unit tests had been split out and needed the sharepoint module on the classpath.
                                 41379: Cloud SPP: remove remote-api dependency from repository.
                            44554: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
                                 41695: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                      41114: Merged DEV\V4.1-BUG-FIX to DEV\CLOUD1
                                            40977: (Record only) Sync parser generation
                                 41696: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                      41302: CLOUD-622: "Mobile App connection to testmy build 227 issue"
                                 41698: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                      41375: BDE-73: remove never-ending test for reporting
                                 41699: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                      41377: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                                           40859: public api:
                                           40862: CLOUD-555: "Updating comment fails because node not found"
                                           40961: CLOUD-566: "Site object shouldn't contain the "sitePreset" property"
                                           40979: Added tests for non-numeric params and non-european characters
                                           41030: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/THOR1_REST_API2:
                                                41027: ALF-15193: "Folder Is Not a Folder CmisInvalidArgumentException thrown when using cmis:objectId"
                                           41097: Added quickshare and cloudsync to cmis filter list
                                           41098: Renamed serializer/deserializer lists for RestJsonModule
                                           41099: Cleaned up consistent Rest responses - CLOUD-574
                                           41100: Meta info webscript is disabled because its not been reviewed / in the correct format
                                           41104: Meta info webscript is really disabled because its not been reviewed / in the correct format
                                           41105: Added key for trusted layer7 relationship
                                           41137: Public api:
                                           41168: Public apI;
                                           41169: CLOUD-565: "API / URL returns a "tenant required" error"
                                           41170: public api:
                                           41171: public api:
                                           41172: public api:
                                           41183: CLOUD-598: "API: "GET network" response has unnecessary JSON nesting"
                                           41186: Fix solrcore properties
                                           41282: CLOUD-616: "CMIS API: Repository names should be more descriptive"
                                           41283: CLOUD-601: "API /networkId/public/cmis/versions/ returns a 400"
                                           41325: Public api:
                                           41367: CLOUD-636: "REST API: Nodes: Tags: Not allowed DELETE method proceeds with status 204"
                                           41369: Public api:
                                 41700: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                      41474: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                                           41422: Sample OAuth call for the Resource Owner Password flow
                                           41427: Sample OAuth call for the Client Credentials flow
                                           41433: Public api: (1) parameterize site members/people sorting in service api
                                           41434: Public api: minor comment service fix
                                           41438: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                           41439: Public api: fix for default tenant id in CMIS requests
                                           41449: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                           41456: CLOUD-644: "Performing a Checkout in OpenCMIS Results in an Exception in the Share Doc Library"
                                           41457: Fix build
                                           41461: Public api: more tests
                                 41701: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                      41560: CLOUD-657: "cmis root service document returning incorrect urls"
                                 41702: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                      41627: CLOUD-676: "OpenCMIS Returns Error 500 on GET: https://testp.alfresco.me/alfresco/a/cmis/versions/1.0/atom"
                                 41703: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCuHES/DEV/CLOUD1_SP:
                                      41670: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                                           41521: CLOUD-660: "GET favourite sites results in exception when skipCount is greater than number of items"
                                           41606: Fix for CLOUD-668 - POSTing to a relationship by id now returns an InvalidArgumentException
                                           41607: CLOUD-668 : changed ordering so errors fire in correct order.
                                           41628: Public api: more tests
                            44555: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
                                 41709: CLOUD-640: Notification is not displayed for consumer for updating/editing document added by other user
                                 42331: Cloud SPP: really fix import order.
                                 42364: Cloud SPP: fix Spring bean filename typo.
                                 43078: CLOUD-868: incorrect URL for Sharepoint protocol
                                 43153: CLOUD-747: SPP: Checking document out doesn't work
                                 43221: CLOUD-896: Unable to open specific version of document from MS Word
                                 43222: CLOUD-896: Unable to open specific version of document from MS Word
                                 43247: CLOUD-896: missing class CloudVersionsServiceHandler from previous commit.
                                 43256: CLOUD-896: fix broken test
                            44556: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
                                 43472: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                      41710: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                                           41672: CLOUD-672: "404 Error when browsing child files/folder "
                                           41673: Public api: more tests
                                           41675: CLOUD-674: "Root network calls need to return application/json content type"
                                      41754: Merged BRANCHES/DEV/FEATURES/CLOUD1_LAYER7 to BRANCHES/DEV/CLOUD1:
                                           41677: No-op skeletons of Public API gateway filter and URL rewrite filter
                                           41683: Url rewrite rules for new and old-style public api
                                           41705: First working version of gateway filter
                                           41732: Trim authenticator keys from config
                                           41734: Productising code - tests and bug fixing with layer7, code tidyup, configuration, error handling
                                           41753: SSL support for accepting self-signed certificates
                                      41794: Merged BRANCHES/DEV/FEATURES/CLOUD1_LAYER7 to BRANCHES/DEV/CLOUD1:
                                           41792: Fixes for Gateway authentication filter after end to end testing on staging.
                                      41798: Merged BRANCHES/DEV/FEATURES/CLOUD1_LAYER7 to BRANCHES/DEV/CLOUD1:
                                           41797: Ensure authentication filter provides enough info to gateway for full analytics
                                      41815: Merged BRANCHES/DEV/FEATURES/CLOUD1_LAYER7 to BRANCHES/DEV/CLOUD1:
                                           41814: Fix regression where old style apigee route failed
                                      41842: CLOUD-619: "CMIS query for objectId throws exception"
                                      41843: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                                           41790: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                           41791: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                           41793: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                           41823: Public api: more tests
                                           41825: Fix for CLOUD-684 - wraps the list, not sure if I like the paging
                                      41855: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                                           41853: CLOUD-700: "The mobile SDK needs a way to map an accessToken to a user identifier"
                                      42005: Merged BRANCHES/DEV/FEATURES/CLOUD1_DAM to BRANCHES/DEV/CLOUD1:
                                           37644: Resolve CLOUD-34: Incorporate Gallery View
                                           39105: Moved to AMP produced from modules/dam/BRANCHES/V1.0 with overrideSource=cloud build property
                                           39268: ALF-13984: High Resolution Mime-Aware Place Holder Icons
                                                - Implemented in DAM 1.0.2.0
                                           39651: Deployed DAM module version 1.0.3 to CLOUD1_DAM which fixes:
                                                - CLOUD-380: Document library displayed incorrectly in Gallery view in IE7
                                                - DAM-36: CLONE - Document library displayed incorrectly in Gallery view in IE7
                                                - DAM-37: Gallery View: No Border Around Selected Items in IE7
                                                - DAM-38: Gallery View: Two Items Must be Selected in IE7 for Multi-select Actions
                                                - DAM-39: Gallery View: Slider Behavior is Erratic in IE7
                                                - DAM-40: Gallery View: Upload Instructions Throws Error in IE7
                                           40083: CLOUD-378: Drag and drop within document library doesn't work in Gallery view
                                                - Deployed DAM 1.0.4.0
                                           40507: Changed name of DAM module to Media Management
                                           40534: Version 1.0.5.1 of MM module which includes:
                                                - DAM-61: Multi-Select Checkboxes Are No Longer Present in 1.0.5
                                           40723: Deployed version 1.0.5.3 of the Media Management module which includes fixes for:
                                                - CLOUD-544 / DAM-66: 'Share' Link Displayed Incorrectly on Info Panel
                                                - CLOUD-543 / DAM-65: Gallery View Content Display Should Support Dynamic Changing of Browser Width
                                           41174: Deployed Media Management module 1.0.5.4 which includes:
                                                - DAM-67: Gallery View Changes the Size of Dragging Thumbnails in Other Views
                                                - DAM-68: Gallery VIew Should Hide Its Container on destroyView
                                                - DAM-69: Gallery View Resizing Should Fire Only When Resizing has Stopped
                                                - DAM-71: Gallery View Thumbnail Generation Should Accept Thumbnail Definition Parameter
                                           41536: Merged HEAD to BRANCHES/DEV/FEATURES/CLOUD1_DAM:
                                                40870: m.share fixes
                                           41537: Merged HEAD to BRANCHES/DEV/FEATURES/CLOUD1_DAM:
                                                40919: m.share fixes
                                           41538: Merged HEAD to BRANCHES/DEV/FEATURES/CLOUD1_DAM:
                                                41432: Fixed CLOUD-587 "Drag and Drop Changes Conflict with Hover Events on Touch Devices"
                                           41614: Changed version of gallery view only MM module to 0.1
                                           42004: Upgraded to MM 0.1.5.5 which contains fix for DAM-74
                                      42047: Merged DEV/CLOUD_SIGN_UP into DEV/CLOUD1 (cloud priority 
                                      42049: 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
                                      42050: 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
                                      42121: Merged BRANCHES/DEV/AMILLER/CLOUD1 to BRANCHES/DEV/CLOUD1:
                                           39663: CLOUD-153 - Invite box doesn't parse email addresses properly
                                      42160: Merged BRANCHES/DEV/AMILLER/CLOUD1 to BRANCHES/DEV/CLOUD1:
                                           38864: CLOUD-41 - Resize logo banner on upload
                                           38878: CLLOUD-42 - Image previews should be larger
                                      42199: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/CLOUD1:
                                           41113: Creating new [bug fix] branch from BRANCHES/DEV/CLOUD1
                                           41211: QuickShare: CLOUD-593: prevent copying of QuickShare props on node copy [+ minor refactor]
                                           41612: QuickShare: Merged form THOR1_QUICK_SHARE to CLOUD1-BUG-FIX
                                              36363: QuickShare: Improvment for THOR-1268 "F378: As a user I can choose to share a document"
                                           41639: QuickShare: Fixed bug where the display of quickshare was based on the showComments property
                                      42200: Merged DEV/CLOUD1-BUG-FIX into DEV/CLOUD1: Record-only (r41650 and r41674)
                                      42201: Merged DEV/CLOUD1-BUG-FIX into DEV/CLOUD1: Record-only (r41650 and r41674)
                                      42203: CLOUD-71: Patch was there, but reference to it from "postUpgrade..." was lost in merge, preventing it from being executed
                                      42204: Merged BRANCHES/DEV/HEAD_QUICK_SHARE_TMP to BRANCHES/DEV/CLOUD1:
                                           41733: QuickShare: fix ShareContentGet NPE (fix for Document Details redirect if logged in)
                                      42206: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/CLOUD1:
                                           41213: CLOUD-452: reconfigure Activities DAOs to use common Alfresco datasource
                                           41214: CLOUD-452: reconfigure Activities DAOs to use common Alfresco datasource (DO NOT MERGE to Enterprise/HEAD)
                                           41270: CLOUD-452 / ALF-15823: reconfigure Activities DAOs to use common Alfresco datasource
                                      42209: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/CLOUD1:
                                           41292: CLOUD-520: Convert TicketCleanupJob to a StatfulJob
                                           41410: CLOUD-119: Change status code to 409 (Conflict), from 400 (Bad Request), when parent folder does not exist
                                      42211: Fix pesky solrcore.properties ... remove hardcoded amiller ;-)
                                      42231: CLOID-71: TEMP - comment-out previous r42203 (breaks build/tests)
                                      42241: Updated Media Management module to 0.1.5.6 which contains fixes for:
                                           - CLOUD-740/MM-76: Empty space in the page footer when switching to Gallery View
                                           - CLOUD-741/MM-75: IE7: Opacity of Folder Icon not Rendered Correctly in Gallery View
                                           - CLOUD-741/MM-77: Gallery View Continually Recalculates Height in IE
                                           - CLOUD-753/MM-78: Links for 'Create a folder' and 'Upload files' in the Empty Folder Instructions Don't Work in Gallery View
                                           - MM-79: Disable Fade Animation on Resize of Gallery View
                                      42252: 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
                                      42267: CLOUD-153: Update CloudInvitationServiceImpl to only use the address part of an email string and ignore the personal name. 
                                      42285: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                                           41867: CLOUD-711: "It should be possible to remove a favourite site"
                                           41957: Public api: - error handling improvements - more tests
                                           41970: Public api: - fix build  (add missing files)
                                           41972: Public api: - more tests (including OpenCMIS TCK)
                                           42046: Added some debug timings.  Enabled using log4j.logger.org.alfresco.rest.framework.webscripts=debug
                                           42058: Public api: changed logging package name
                                           42124: Public api: - more tests - minor fixes
                                           42125: CLOUD-734: "CMIS: Query Issues Discovered During Testing"
                                           42126: Public api: fix up OpenCMIS tests
                                           42171: Consistency fix for CLOUD-695.
                                           42180: Fix build
                                           42181: CLOUD-695 "Requests to un-implemented urls do not consistently return http status 405 (Method not allowed)": fix up public api tests
                                           42214: Public api tests (cmis)
                                           42251: Changed the serializer for embedded entities, (related to CLOUD-746)
                                           42253: Fix build
                                      42288: Fix build - fix merge problem
                                      42302: Updated Media Management module to 0.1.5.7 which contains fixes for:
                                           - CLOUD-788/MM-89: "Rename" Icon is not Displayed Correctly in Gallery View
                                      42320: Fix build (fix dodgy merge)
                                      42334: Fixed build of Media Management module for:
                                           - CLOUD-789/MM-91: MM AMPs Produced No Longer Contain module.properties
                                      42341: Fixed CLOUD-755 "Label needs to be renamed and icon should be present"
                                      42344: Fixed CLOUD-755 "Label needs to be renamed and icon should be present" part 2
                                      42365: CLOUD-153: Fix additional invite paths.
                                      42373: Updated Media Management module to 0.1.5.8 which contains:
                                           - MM-92: Change Default View for Cloud to Detailed Rather than Gallery
                                      42513: CLOUD-808: fixed issue with timers due when alfresco boots
                                      42577: CLOUD-808: Fix for timer deploying MT-process when shared is required caused test to fail
                                      42588: BDE-73: fix compilation + switch to MySQL to make cloud tests pass 
                                      42595: Add salesforce modules to privatemodules.  Contains only models.
                                      42596: Add salesforce module build properites and ant build tasks.
                                      42601: Updated salesforce amp with correct version number and updated module-context.xml
                                      42668: BDE-73 Fix Sonar reporting
                                      42709: FRENCH: Translation updates based on EN r42416
                                      42867: CLOUD-71: add explicit schema number for workflow timers redeploy patch
                                      42871: GERMAN: Cloud Translation, based on r 42416
                                      42879: SPANISH: Cloud Translation, based on r 42416
                                      42890: ITALIAN: Cloud Translation, based on r 42416
                                      43120: 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
                                      43243: BDE-73: Fork for each test, otherwise some fail because of previous test leftovers
                                      43323: Merged BRANCHES/DEV/FEATURES/CLOUD1_GRANULARPERMISSIONS1 to BRANCHES/DEV/CLOUD1:
                                           42257: CLOUD-649: Updates UI action for Granular Permissions
                                           42295: CLOUD-33: Updates labels
                                           42303: CLOUD-651: Limit user search to site members only.
                                           42352: CLOUD-780: Adds a rolesWhitelist to only display those roles that are allowed. Currently set to: ["Consumer", "Contributor", "Collaborator"]. This is only used in the site view. The Repository view behaviour has not changed.
                                           42427: Removes multi-select manage-permissions dialogue.
                                           42520: CLOUD-802: Change the way the user is returned to the previous page to work around suspected Chrome bug.
                                           42604: CLOUD-840: Automatically add SiteManger permisions when inheritAll is switched off. Pervent remaoval of siteManager authority.
                                           42606: Fixed CLOUD-840 "Granular Permissions: Site Manager should retain access when inherit permissions is turned off"
                                           42807: CLOUD-863: Reordered code to avoid AccessDeniedException
                                           43259: CLOUD-901: Revert showComments check so it handles undefined permission
                                           43266: CLOUD-900: Old Manage permissions form is opened via Permissions panel
                                           43307: CLOUD-900: Follow-up fix
                                      43353: Fix for remote transform server with new cloud environment
                                      43457: Merged BRANCHES/DEV/FEATURES/CLOUD1_GOOGLEDOCS to BRANCHES/DEV/CLOUD1:
                                           39869: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_GOOGLEDOCS:
                                                Merged /integrations/GoogleDocs/BRANCHES/THOR1_SPRINTS_GOOGLEDOCS to BRANCHES/V4.1   
                                                  36307 Fixed THOR-1402 "Need a callback option for Create Content menu"
                                                     - Will be revisited to add better comments
                                                  36350 Fixed THOR-1402 "Need a callback option for Create Content menu" part 2
                                                     - Changed callback obj to match action object better: { nodeRef, node, jsNode }
                                                     - Better code documentation
                                                     - Removed dev/test code
                                                     - Improved error config handling
                                                  36358 THOR-1402 "Need a callback option for Create Content menu" part 3
                                                     - Changed "link" parameter to "href" (instead of "page") to match actions.
                                                  39256 Consistency fix of doclib & repo toolbar templates after work on THOR-1402
                                                  39260 Bugfix for "destination" parameter not being resolved correctly THOR-1402
                                           39875: Configurtion changes to enable Google Docs V2 within the web tier.
                                           39881: It's extension ... not extention
                                           39938: Update CLOUD1_GOOGLEDOCS ant build to include installing googledocs amp files
                                           39944: CLOUD-437: Ensure that custom doclib action resources are requested after documentlist.js
                                           40468: Alfresco GoogleDocs AMPS.  Fixes for [GOOGLEDOCS-73], [GOOGLEDOCS-70], [GOOGLEDOCS-75], [GOOGLEDOCS-76]
                                           40624: Update Google Docs AMPs
                                           40635: Merge Google Docs Cloud AMPS to Feature Branchs
                                           40824: Update Google Docs AMPS, fixing [GOOGLEDOCS-79]
                                           40897: Google Docs AMP update 
                                           41165: Merge Updated AMPs for [GOOGLEDOCS-83]
                                           41179: Update AMPs for [GOOGLEDOCS-87]
                                           41262: Update AMPs for GOOGLEDOCS-89
                                           41493: Update AMPs for [GOOGLEDOCS-93]
                                           41635: AMP update for [GOOLGEDOCS-98] [GOOGLEDOCS-99] [GOOGLEDOCS-100]
                                           41805: Update AMPs for [GOOGLEDOCS-101]
                                           41840: Add AMPs with i18n strings
                                           43316: (RECORD ONLY) Rebase CLOUD1_GOOGLEDOCS with CLOUD1
                                           43317: (RECORD ONLY) Re-merge build.properties and projects.xml to include googledocs amps in build
                                           43320: Add googledocs repo declaration
                            44557: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
                                 43751: CLOUD-747: SPP: Checking document out doesn't work
                                 43765: CLOUD-747: fixes ${localname} substitution in vti.server.external.host value
                                 43780: CLOUD-747: Sharepoint version of PROPFIND handler must return 'href' containing the externally visible base URL
                                 43785: CLOUD-747: fix for proxied repository - more robust parsing of URLs.
                                 44001: Fix pesky solrcore properties
                                 44036: Resolve CLOUD-877: UI button for SharePoint Protocol needs to be updated
                                 44211: CLOUD-747: checkout/checkin works for spaces in document
                            44564: Fix construction of vti activity processor after merge
                            44565: Remove unnecessary build of war and amps for exploded target (NOTE: may fail in continuous build)
                       44573: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/CLOUD1:
                            44572: Clean up of unused files.
                       44575: Merged BRANCHES/DEV/CLOUD1_CORS to BRANCHES/DEV/CLOUD1:
                            43592: (RECORD ONLY) Rebase CORS Filter with the latest CLOUD1
                            43593: (RECORD ONLY) Add CloudTenantWebScriptServlet endpoint /a to CORS filter mapping
                            43718: (RECORD ONLY) [CLOUD-955] Add new web script tennant service to seperate public api from web script api
                            43749: (RECORD ONLY) Rebase CLOUD1_CORS with CLOUD1
                            44517: (RECORD ONLY) Rebase CLOUD1_CORS with CLOUD1
                       44576: Merged BRANCHES/DEV/CLOUD1_CORS to BRANCHES/DEV/CLOUD1:
                            44518: [CLOUD-955] Change CORS filter-mapping to use servelet instead of url
                       44691: 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.
                       44752: BDE-73: Fix Maven build now that thor module depend on sharepoint
                       44890: BDE-73: Fix Maven test execution of thor project now that it depends on sharepoint
                       45271: Merged BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2 to BRANCHES/DEV/CLOUD1:
                            44289: PUBLICAPI-43: "CMIS endpoints need to report incorrect methods as a 405 error"
                            44707: PUBLICAPI-56: "Creating comments can fail intermittently"
                                 - tests to follow
                            44742: CLOUD-1073: "Unable to upload documents intermittently"
                            45070: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: (PUBLICAPI-57)
                                 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.
                            45168: CLOUD-1140: Activities PostLookup : "Skipping activity post 1234567"and occasionally "Exception during update of posts" (due to InvalidNodeRefException)
                            45169: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                 45082: CLOUD-1139: Cloud feednotifier running on 2 boxes
                  45354: Fix fo CLOUD-422: Activiti causes server to block on all threads
                  45389: Re-instate CMIS TCK tests (hopefully these will now be ok after the fix for PUBLICAPI-57)
                  45510: Revert re-instated CMIS TCK tests (not sure why, but didn't seem to work)
                  45658: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       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"
                  45665: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       45622: Merged HEAD to BRANCHES/DEV/V4.1-BUG-FIX:
                            35614: ALF-13807: Add range header support to the webDAV servlet
                  45671: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       45651: Merged HEAD to BRANCHES/DEV/V4.1-BUG-FIX:
                            45222: ALF-17387: Support For HTTP Range Requests in Repository WebScripts
                                 - Added HttpRangeProcessor.processRange which takes a WebScriptResponse parameter instead of HttpServletResponse
                                 - Changed HttpRangeProcessor.processSingeRange and HttpRangeProcessor.processMultiRange to accept a generic Object parameter then cast to the appropriate WebScriptResponse or HttpServletResponse
                                 - Added Javadoc to HttpRangeProcessor.processRange
                                 - Changed StreamContent.streamContentImpl to add code from BaseDownloadContentServlet which does the work of processing the range header from the request
                                 - Changed StreamContent.streamContentImpl method signature to accept nodeRef and propertyQName parameters needed for multi-range requests
                                 - Modified methods which override or call StreamContent.streamContentImpl for new method signature, passing in nodeRef and propertyQName or nulls where appropriate
                  45674: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       45653: ALF-17578: Height of Video Player is Too Large on iPad
                            - Added max-height for videos
                  45701: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       45475: Fix for ALF-17510 - Upgrade of htmlparser from 1.6 to 2.1
                  45837: A fix for updated HtmlParser lib
                  45937: Revert inadvertent commit, r45933
                  45970: CLOUD-1077: File size limits for Transforms need increasing for Cloud
                  45980: CLOUD-216, CLOUD-256, CLOUD-878 - Pagination problems in Manage Users section of admin console
                  45988: CLOUD-1234: Incorrect mime type for thumbnail image-preview for document details page
                       - Updated to version 0.1.5.11 of MM module which changes the mimetype of imgpreview to jpeg
                  46012: CLOUD-216, CLOUD-256, CLOUD-878 - Pagination problems in Manage Users section of admin console
                  46080: Merged BRANCHES/DEV/FEATURES/CLOUD1_METRICS to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       44536: CLOUD-174: Initial web script based monitoring 
                             - Added authentication event listener mechanism to web script authenticatorn
                             - Created implementation of listener which exposes concurrent user metrics via jmx.
                       44560: CLOUD-174: Fix broken unit test
                       44615: CLOUD-174: Fix unit tests.
                       44659: CLOUD-174: Add WebDAV and SharePoint request tracking
                       44662: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_METRICS:
                            44373: Follow-up on big merge r44059 for Maven build
                                 - Upgrade POI to 3.9-beta1-20121109-alfresco-patched
                                 - Upgrade JODConverter to 2.1.0-patched
                                 - Added Chemistry client as a dependency in Solr tests
                            44571: Merged BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN to BRANCHES/DEV/CLOUD1:
                                 44527: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
                                      38425: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           33822: Merged BRANCHES/DEV/V4.0-BUG-FIX to HEAD:
                                                33813: ALF-12736: Stack specific: 'Getting updates failed' notification appears when non-admin user creats DWS
                                                33821: ALF-12212 - SPP/Vti requires that all links include a protocol and are valid, while share does not. When building the Vti response, prefix URLs with http:// if they lack a protocol at the start, and ignore any that are malformed
                                      38431: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           33893: SharePoint refactoring - first part of removing the old Alfresco v2 code
                                      38432: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           33905: SharePoint Refactoring - Move to only a single class for the VersionServiceHandler
                                      38433: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           33906: SharePoint Refactoring - Move to only a single class for the User and Groups Handler
                                      38434: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           33907: SharePoint refactoring - fix deprecation warnings by switching to the new way of finding people, when searching for a user with a given email address
                                      38435: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           33923: SharePoint refactoring - Start on merging the old style and new style List support, mark the old style as deprecated, and add TODOs where needed for future changes
                                      38440: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           35486: ALF-13028: Sharepoint broken by changes to WebDAV
                                      38442: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           35530: ALF-13028, ALF-13696: broken sharepoint module
                                      38443: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           36148: Merged BRANCHES/DEV/BELARUS/HEAD-2012_04_25 to HEAD:
                                                35710: ALF-13028 : Sharepoint broken by changes to WebDAV
                                      38444: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           37648: Sharepoint: fixed typo in class name VtiDocumentHepler
                                      38447: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           37929: First try at incremental-spp-tomcat-exploded target
                                      38451: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           37943: Sharepoint: fix build for compile-spp dependency and for new incremental-spp-tomcat-exploded target.
                                      38453: Sharepoint: remove error causing property injection - probably came from a double-merge.
                                      38472: Sharepoint: fix missing singletonCache property for VtiPathHelper bean, probably lost in merges.
                                      38477: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           37926: Correct handling of GetMeetingsInfo - lcid may not always be set
                                      38478: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           37927: More parameters that are optional
                                      38481: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           37928: More parameters that are optional
                                      38483: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           37931: A site may not have a calendar container yet
                                      38485: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           37933: Set the response type to text/xml as required
                                      38486: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           37938: Stub out support for UpdateMeeting and SetWorkspaceTitle
                                      38487: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           37939: Fix title vs name confusion in meeting sites, support setWorkspaceTitle, and correct the error reporting on create site
                                      38488: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           37940: SPP Vti SOAP error codes must be zero padded to 8 characters
                                      38489: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           37941: Improve error handling in create/set title/delete, and match the required error codes
                                      38491: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           38005: Correct logic to fix test
                                      38493: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           38006: DTEND is optional in iCal, if not set it means the meeting ends at the start time
                                      38494: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           38007: Pull out commong workspace related code to a parent endpoint class
                                      38496: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           38009: Sharepoint [MS-VERSS]: GetVersions should state whether file has versioning enabled.
                                      38498: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           38011: More refactoring to use the new commong workspace parent endpoint
                                      38501: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           38012: Start to clean up how exceptions are done in the meeting handler layer
                                           38013: Start to refactor the common parts of meetings to a parent abstract class, and stub out the SetAttendeeResponse endpoint
                                           38014: Fix import warnings
                                           38015: More towards Add/Update/Restore meeting
                                           38016: Common building of the MeetingBean
                                           38017: Improve error reporting on add/update meeting, to match the spec requirements
                                           38018: Sharepoint [MS-DWSS]: CanCreateDwsUrl returns GUID if requested name is empty string.
                                           38019: ALF-14687 - ISO8601 dates from non-Alfresco sources may have more than 3 millisecond digits
                                           38020: Stub out the SetAttendeeResponse endpoint, but the handler does nothing with the details
                                           38021: More meeting exception improvements
                                      38503: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           38077: Refactor the Meeting related endpoints to use common superclasses, and fix some common problems / exception handling in the process
                                           38078: Further error handling checks
                                      38504: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           38080: Match the rather strange behaviour of getMeetingsWorkspaces and the recurring flag, as set down in the spec
                                      38505: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           38088: Sharepoint [MS-DWSS]: partial fix to XML fault message generation.
                                           38089: Sharepoint [MS-DWSS]: fuerther partial fix to error message generation for CreateDws.
                                      38506: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           38091: Sharepoint [MS-DWSS]: S1_TC08: returning error with AlreadyExists but should be ServerFailure.
                                      38507: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           38093: Support filtering by boolean properties, as well as String ones, in GetChildrenCannedQuery
                                           38094: Support for listing calendar entries by their outlook status (isOutlook / OutlookUID), via a Canned Query
                                           38095: De-Lucene the SharePoint / Vti Meeting Service handler, using the new CalendarService list method
                                           38096: Sharepoint [MS-DWSS]: S1_TC09 and others, hyphens in GUID were being translated to underscores.
                                           38097: Vti/SPP support for restoring a deleted meeting (assuming it is still available in the archive store)
                                      38508: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           38099: Make the error message a bit more helpful, in the case that the assoc qname is too long
                                           38100: Check for errors from the create site share call
                                           38101: Validate that the site Short Name isn't too long during creation, and throw a helpful exception if it is. (Site Short Names get used in Authority Names, which are limited by the DB model to 100 characters)
                                           38102: Update the site name max length check - need to account for the role group names too
                                           38103: There is a maximum size of a site short name, based on the limits of the authority names in the permissions service, so truncate the Vti/SPP site name before creation to fit within that
                                           38104: Specific error response needed for GetMeetingsInformation on a subsite
                                      38509: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           38134: Sharepoint [MS-VERSS]: S1_TC05 removed manual entity encoding of quotes, as dom4j was then escaping the ampersands.
                                      38510: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           38139: Sharepoint [MS-DWSS]: fixed error message generation for CreateFolder.
                                           38140: Sharepoint [MS-DWSS]: Result element should be standalone XML.
                                           38141: Start removing deprecated, old style lists in favour of the full list support
                                      38511: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           38143: Improve handling of abstract lists, and convert more classes to use that method
                                           38144: More convertions to AbstractListEndpoint, and improve logging by centralising it better
                                      38512: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           38146: Prepare to do more of the List details not via hard coded FTL
                                           38147: Convert to only having the fields hard coded in the ftl, and the rest dynamically generated
                                           38148: Remove deprecated old style ListBean (now all replaced with ListInfoBean), and tidy up around the removal
                                      38514: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           38156: Start on processing the request for UpdateListItems, and support GetList by UID as well as Name
                                           38157: Sharepoint [MS-WEBSS]: fixed GetWeb to respond with the "context site" if "." or "" requested in SOAP body.
                                      38515: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           38229: Improve the list definition model, and add more support for UpdateListItems
                                      38516: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           38231: Refactor the current (rather hard coded) GetListItems support into an abstract class, and then use that to stub out the other two GetListItems* endpoints
                                           38232: Sharepoint [MS-WDVMODUU]: implemented WebDAV PUT method.
                                           38233: Stub out Change Since support
                                      38517: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           38237: Improve error handling, and reduce some duplication
                                           38238: More details needed
                                           38239: Use the same rendering of a list details
                                      38518: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           38381: ALF-14835: Sharepoint/WebDAV: exclusive lock fails deemed to be owned by someone else.
                                           38382: Sharepoint [MS-WDVMODUU]: activity posting disabled upon DELETE.
                                      38785: Merged alfresco/HEAD to alfresco/BRANCHES/DEV/CLOUD1_SP:
                                           38752: WebDAV/Sharepoint: extracted WebDAVHelper to spring configuration.
                                 44543: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
                                      38996: WebDAV: added getUrlPathPrefix tests for WebDAVHelper.
                                      38997: WebDAV: added setter for urlPathPrefix property (to aid in spring config), ensures path prefix terminated in slash.
                                      39001: WebDAV: getURLForPath(...) appends trailing slash to path prefix if missing.
                                      39002: WebDAV: removed redundant createDAVHelper() method.
                                      39016: WebDAV: added getRepositoryPath(request) method (replaces WebDAV's static method)
                                      39017: WebDAV: replaced use of static WebDAV.getRepositoryPath(req) with non-static version in WebDAVHelper.
                                      39019: Cloud/SPP: thor module must have dependency on SPP module.
                                      39020: Cloud WebDAV: CloudWebDAVServlet no longer uses static getRepositoryPath(req) method.
                                      39021: Cloud WebDAV: override getRepositoryPath(req) with version that gets path within tenant.
                                      39023: SPP core: added hook to VtiWebDavAction to allow overriding of execution behaviour.
                                      39025: SPP: minor logging improvement.
                                      39026: SPP: define SPP version of WebDAV helper and inject into VtiWebDavAction instances.
                                      39060: Cloud SPP: introduced cloud/spp webdav helper.
                                      39061: Cloud SPP: missing part of commit, moved methods out of CloudWebDAVHelper and into SPPCloudWebDAVHelper.
                                      39095: Cloud WebDAV: move doclib URL munging out of core WebDAV.
                                      39182: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           39167: WebDAV: remove static replace(str, repl, with) method.
                                      39185: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           39172: WebDAV: removed static WebDAV.getRepositoryPath() method. Only use the non-static version.
                                      39186: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           39173: WebDAV: fix broken code from moving inlining of getRepositoryPath(...) from WebDAV to WebDAVHelper.
                                      39187: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           39174: WebDAV: removed redundant DIR_SEPARATOR constant.
                                      39189: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           39178: WebDAV/SPP: remove static WebDAV.getURLForPath(...) methods.
                                      39323: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           39203: WebDAV: fix broken UnlockMethodTest.
                                      39324: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           39204: WebDAV: fix broken WebDAVMethodTest.
                                      39325: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           39309: Sharepoint: no longer uses sysAdminParams to determine incoming URL path prefix.
                                      39330: Sharepoint: fix code broken by merge -c 39325 (from HEAD).
                                      39346: Cloud/sharepoint: fix for merge from HEAD, -c 39309 (remove sysAdminParams as supplier of URL path prefix)
                                      39365: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           39364: Sharepoint: making PROPFIND more tolerant of null values in a node's properties.
                                      39474: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           39473: WebDAV: introduce getChildren() method for helper.
                                 44544: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
                                      39541: Sharepoint: added test for decomposeDocumentURL functionality.
                                      39552: Sharepoint: added doDecomposeURLWork test for incorrect URI path prefix.
                                      39570: Sharepoint: refactoring for cloud overrides and testing improvements.
                                      39674: SPP core: use VtiPathHelper.getPathForURL() instead of using request directly.
                                      39676: SPP core: refactored action execution to provide hook for subclasses.
                                      39695: SPP: null GUID no longer results in an empty rid{}
                                      39696: SPP core: VtiWebDavAction - setting the method's details is delegated to the DAV executor.
                                      39698: SPP core: added hook for detecting whether a URI path does not specify a site.
                                      39701: SPP core: abstract parent for vtiRequestDispatcher makes it possible to override bean and inherit configuration.
                                      39702: SPP core: move support methods from test class into abstract base class.
                                      39705: SPP cloud: added cloud specific filter and path helpers.
                                      39707: SPP cloud: remove redundant code from CloudwebDavExecutorImpl
                                      39708: SPP cloud: introduce request handling logic in common for WebDAV and SPP.
                                      39709: Cloud SPP/webdav: WebDAV uses common request handling class.
                                      39710: SPP cloud: SPPCloudWebDAVHelper was incorrectly stripping off tenant domain for getRepositoryPath().
                                      39712: SPP cloud: introduce a cloud-specific VtiRequestDispatcher.
                                      39723: SPP core: servlet filter now registered for forwards as well as fresh requests.
                                      39724: SPP core: removed URL decoding of URL in XML response generation.
                                      39759: SPP core: use separate servlet mappings for /alfresco/* and /*
                                      39865: Cloud SPP: cleaned up runAsTenant usage.
                                      39868: SPP cloud: missing files from previous commit ("cleaned up runAsTenant usage")
                                      39916: CLOUD-28: cloud SPP raises activity posts for PUT, DELETE.
                                      39930: Cloud SPP: tenant domain is extract from RPC method request with "url" parameter, instead of through request URL path.
                                      39941: Cloud SPP: reintroduced separate instances of CommonRequestHandling that was lost by moving instantiation into spring.
                                      39971: CLOUD-137: 4.4 Add Mixpanel Analytics events to SharePoint Protocol
                                      39972: CLOUD-137: 4.4 Added an "spp" event source.
                                 44545: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
                                      40006: Bamboo/CI: added dependency on spp module when building cloud.
                                      40007: WebDAV - cloud only: added missing WebDAVHelper constructor argument to spring definition.
                                      40015: Cloud SPP: bake SPP module into WAR file at build time.
                                      40027: Cloud SPP: Committing binaries that can be used by ops for testing/prototyping.
                                      40365: WebDAV/SPP: moved webDAVLockService bean definition into webdav-context.xml
                                      40366: WebDAV/SPP: moved webDAVLockService to remote-api-context.xml
                                      40368: SPP: removed circular task dependency.
                                      40373: Cloud SPP: added incremental-spp-tomcat-exploded as dependency of incremental-cloud-repo-exploded
                                      40376: Test to see if this fixes build failures, by adding SPP classes/config to unit testing classpath.
                                      40380: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           38861: WebDAV: fixed dependency problem; fixes test RepositoryStartStopTest.
                                      40384: Cloud SPP: ensure jetty libs on classpath during test.
                                      40392: Cloud SPP: remote-api-context.xml must be loaded before cloud and SPP modules.
                                      40400: Cloud SPP: fix classpath to use fileset instead of pathelement.
                                      40444: SPP build problems: attempt to ensure thor config comes after SPP config in unit testing classpath
                                      40447: Cloud SPP: ensure SPP module is loaded prior to cloud module.
                                      40450: SPP Cloud: backing out change 40444 (CI build changes)
                                      40451: SPP Cloud: another attempt to straighten out testing classpath problems.
                                      40456: Temporarily disabling explicit SPP module import.
                                      40483: Cloud SPP: fixed broken test and clarified behaviour in comments.
                                      40519: Cloud SPP: remove exclusion of module.properties when copying resources during deploy-spp-tomcat-exploded ant target.
                                      40523: CLOUD-25: 3.1 The protocol must be secured using the user's standard Cloud credentials
                                 44546: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
                                      40551: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                           38401: Fix activities feed mail notifications.
                                           38614: Resolve CLOUD-157: Cloud1 does not deploy due to addDutchEmailTemplates patch failing
                                           38676: Exclude irrelevant tests even if minimal.testing? flag is not set
                                           38726: Resolve CLOUD-160: "Data too long for column 'report' at row 1" when deploying Cloud1-144 to Test
                                           38734: Fix CLOUD1 build to ensure test results from previous builds are cleaned
                                           38754: Fix test
                                           38765: Merged BRANCHES/V4.0 to BRANCHES/DEV/CLOUD1:
                                                37766: Fix for ALF-14529 Share Solr admin console page shows "Unavailable: 05120041...
                                                37800: ALF-14145 Flash preview quality is poor
                                                     - Reverting change r30483 V3.4-BUG-FIX Sept 13 2011 for ALF-9417
                                                           swf.encoder.params=-s zoom=72 -s ppmsubpixels=1 -s poly2bitmap=1 -s bitmapfonts=1
                                                       being changed back to:
                                                           swf.encoder.params=-s poly2bitmap,subpixels=72
                                                       The original 001-Cover_Cover.pdf file from ALF-9417 does now preview in 4.0.2
                                           39058: CLOUD-190: Ensure that sub-folders of folders named "res" and "proxy" can accessed.
                                           39206: Fixed CLOUD-198 "WASA - XSS issue with quickshare"
                                           39210: Cloud1 build fix
                                           39236: Fixed and baked in Share Hazelcast Cloud specific configuration into thor-share module. Now only need to override hz:hazelcast bean with AWS key specifics for test/production.
                                           39314: Resolve CLOUD-203: WebDAV incorrectly handles file / directory names with spaces in them
                                           39341: Resolve CLOUD-181: Webdav Cluster Failiure in Cloud1 build 148 startup error: java.lang.ArrayIndexOutOfBoundsException: 72
                                           39357: CLOUD-164: Remove categories from document library
                                           39358: Resolve CLOUD-186 500 error displayed when trying to add 'Content I'm editing' dashlet
                                           39388: Resolve CLOUD-185: My / Site Activities displayed incorrectly
                                           39391: Resolve CLOUD-161 Patching is taking too long - specifically patch.fixBpmPackages
                                           39499: Resolve CLOUD-395 TEST server startup log - upgrading to cloud1
                                           39500: Resolve CLOUD-187 java.lang.IllegalArgumentException: Must provide existing lockToken
                                           39554: BDE-90: Setup build for deployment of Cloud artifacts to Maven repository
                                           39559: Merged THOR1 to CLOUD1
                                                38529: CLOUD-399 / ALF-14887: User sign-up issue
                                                   - Workflow prior to mobile registration did not have the isPreRegistered property. Changed it so that if the property does not exist, it defaults to false.
                                                   - Logged warning with email address in log for easier location of error.
                                                39553: CLOUD-400 / ALF-15149: Prevent an infinite loop in AlfrescoSolrEventListener.RemoveNullEntriesCacheMatch.updateCache()
                                           39563: Merge BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to DEV/CLOUD1 (r38673-39562)
                                           39567: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                                                39566: Allow the sync mode to be fetched by guest (it need not be hidden), then fetch from Share as guest, to avoid problems when fetching the sync mode if the current user's credentials have expired (otherwise it breaks the redirect back to the login)
                                           39568: Fix YUI options to match the version in use (-p is no longer supported)
                                           39569: Cloud is always build on top of enterprise, so remove the duplicated projects.xml taken from enterprise and use the enterprise projects.xml instead. (Fixes warnings during build)
                                           39575: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                                                39574: Cloud lacks a guest mode, so switch to unauthenticated for the sync mode fetch (user credentials may not be available)
                                           39579: Undoing some CloudSync-specific restrictions on what test cases are run.
                                           39584: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                                                39580: CloudSync: fix Unsync - to ensure we don't leave sync aspects (such as failed, which reappears if src file is re-synced)
                                           39586: Merged V4.1 to CLOUD1 (might fix the build)
                                                39207: ALF-15015 follow-up: make sure the first enterprise test that runs has no specific license, since we just reset the database
                                           39588: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                                                39587: ALF-15222: Cloud Folder picker: Newly created folder isn't selected
                                           39596: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                                                39589: ALF-15098: Folder Picker causes JS error in the document details page
                                                39561: Mark from Thor1 to V4.1 to Cloud1
                                           39602: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                                                39076: ALF-15013 ALF-15015: Reset database before running enterprise tests, otherwise SecurityTestSuite leaves it in a bad state
                                           39608: Removed incorrect com.sun import
                                           39610: Merged HEAD to BRANCHES/DEV/CLOUD1
                                                38834: Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD
                                                   38607: Fix for ALF-14934 - Components YUI menus hit area is small. iPad specific CSS fix.
                                                   38631: ALF-14820 - Document Library - Upload actions and File Browse buttons (doclib, user profile image, upload vers   ion etc) - not appropriate for iOS.
                                                   38632: ALF-14934 - increased hit area for filter and tree/category nodes for ios.
                                                   38667: Repository toolbar changes for ALF-14820
                                                   38668: Patched YUI menus to support additional touch events (touchend specifically) and as custom menu events to fix   ALF-14809.
                                                   38738: Correct fix for ALF-13650:
                                                          Double byte code white spaces in front and at the end of a file name should be removed as the same behavior of    Single byte code white space. Altered Alfresco.util.trim() in order to support double byte code white spaces.
                                                           - did not handle null/defined which are returned when creating content in Wiki, Blog and Discussions.
                                                   38745: ALF-14807 - Fixes related to long file name display margins for iPad on Document Details page.
                                                   38790: ALF-14927: Ensure that RSS feed URLs are maintained in RSS dashlet when the URL contains request parameters
                                                   38792: ALF-13297 - removed install WebScript webscripts (updated Surf libs - r1094)
                                                   38831: Fix for ALF-14992 - Share: display list of rules for a folder: unterminated string literal
                                                          - actually a wider spread issue of failing to handle multiple line field values (e.g. "description" fields) wh   en rendering json into a component page or template
                                                39067: Fixed drag n drop issues for m.share on ipad
                                                       - Added ootb support for touch events to drag n drop classes in yui-patch.js
                                                       - ALF-14816 Dashboard - Cannot customize dashboard layout
                                                       - ALF-14817 Customize Site - Can't add or change the order of page components
                                                       - ALF-14822 Rules - Cannot reorder rules when multiple rules are defined on a folder
                                                       - This also means all "dividers" on the documentlibrary, discussions etc pages now work
                                           39614: Reinstate repository tests (so far, only RepositoryStartupTest is run)
                                           39615: BDE-90: do not try to deploy to Maven repo artifacts which are not built
                                           39642: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                                                39597: CloudSync: tweak a couple of unit tests
                                                39598: CloudSync: ALF-14655 - update simple file sync (to test multiple sync'd files)
                                                39606: CloudSync: minor log level adjustments
                                                39607: CloudSync: ALF-14483 - SyncTracker - enable sync sets to be pushed in parallel
                                                39613: Refactor of test code. SyncTrackerComponentTest now uses JUnit Rules to manage temporary content and to undo mocking out of services.
                                                39616: CloudSync: CloudSync: ALF-14483 - SyncTracker - multiple syncs (to different tgt folders) with multiple files
                                                39633: CloudSync: ALF-14483 - SyncTracker - enable sync sets to be processed in parallel
                                                39639: ALF-15238: Bitrock Installer: Readme.txt should be updated - Alfresco version is 4.0
                                                39640: ALF-15231 Restore, with refactorings / making more general, the ability to lazy create the remote credentials container if bootstrap has not created it (eg on Cloud)
                                                39641: ALF-15230 Refactor the lazy container creation code, to use the new SystemNodeUtils helper
                                           39644: ALF-15230/ALF-15231 Disable two patches on cloud, which create new system containers, as the number of tenants means this is a large amount of work. Services will not lazy create if needed, but for on-premise we retain the up-front creation to avoid surprises and allow predictable permissions in advance if required
                                           39645: Disabling one test on CLOUD1, pending discussion with Mark, Jan.
                                           39661: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1
                                                39660: Fix for ALF-14244 - Sort options are not appropriate for some pre-canned Document Library queries and need disabling in the UI as they can confuse the user. Implemented by Valery Shikunets.
                                           39666: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                                                39665: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                     39664: CloudSync: ALF-14483 - SyncTracker unit tests - simple file sync test
                                           39675: Resolve CLOUD-410: Disable multi-threaded SOLR
                                           39680: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                                                39643: ALF-15220: Indirect sync and sync failed indicators appeared together on nodes during the demo
                                                39653: ALF-15041: Cloud Sync doesn't work with IE7
                                                39670: Rework to cloud key license stuff - introduces a ValidLicenseEvent
                                                39673: New unit test for adding checked out nodes into a sync set.
                                                39677: ALF-14903 Move the Sync allowed/not-allowed check, based on Network/Tenant, to AbstractCloudSyncAbstractWebScript, and have this used by the webscripts based on this too. Then, allow UnSync to proceed no matter what the tenant status, and add unit tests
                                           39699: ALF-14454: get rid of hrtlib.jar
                                           39700: BDE-90: deploy cloud-specific artifacts
                                           39731: CLOUD-421: Merged PATCHES/V4.0.2 to CLOUD1
                                                39725: ALF-15176: Multi-threaded SOLR tracking suddenly stops leaving transactions unindexed
                                                   - Debugged on environment provided by Antonio
                                                   - If the last incomplete batch in a chunk consists entirely of empty transactions (or transactions consisting entirely of nodes updated in later transactions) it would loop forever
                                           39738: CloudSync: add default (info) Sync log level
                                           39744: Merged HEAD to BRANCHES/DEV/CLOUD1 (for BDE-73):
                                                39282: Get context from classpath rather than file system
                                                39409: fetch application context from classpath rather than file system
                                                39433: tune AVM tests to make them resilient to a change of working folder
                                                39743: Allow to override the location of test resources using a system property
                                           39745: BDE-73: Add experimental pom.xml files
                                           39755: BDE-73: Add experimental pom.xml files
                                           39830: Resolve CLOUD-423: Concurrent registration / account activations are not handled gracefully
                                           39855: BDE-73 Configure Sonar properly + filter a few failing tests
                                           39877: CLOUD-438: Merged V3.4-BUG-FIX to CLOUD1
                                                36446: Fix for ALF-13404 - Performance: 'Content I'm Editing' dashlet is slow to render when there is lots of data/sites
                                                 - Effectively removed all PATH based queries using the pattern /companyhome/sites/*/container//* as they are a non-optimized case
                                                 - Replaced the "all sites" doclist query using the above pattern with /companyhome/sites//* plus post query resultset processing based on documentLibrary container matching regex
                                                 - Optimized favorite document query to remove need for a PATH
                                                 - Optimized Content I'm Editing discussion PATH query to use /*/* instead of /*//*
                                                 - Fixed issue where Content I'm Editing discussion results would not always show the root topics that a user has edited
                                                 - Added some addition doclist.get.js query scriptlogger debugging output
                                                36449: ALF-13404 - Fix for issue where favoriates for all sites would be shown in each site document library in the My Favorites filter.
                                                37190: Merged PATCHES/V3.4.6 to V3.4-BUG-FIX
                                                   37189: ALF-13404: Performance: 'Content I'm Editing' dashlet is slow to render when there is lots of data/sites
                                                      - Additional query improvement by Pavel
                                                37835: Fix for ALF-14429 - Recently Modified dashlet takes up to 30 seconds to load after upgrade to Alfresco 3.4.6.23
                                           39878: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1
                                                39775: ALF-15271: "Site Content" dashlet shows all documents from all the sites in Alfresco Share
                                           39919: Added additional configurable datasource that is used by activiti IdGenerator to fetch new block of ID's. Can be defined using JNDI-lookup, reverts to default datasource based on well-know alfresco-properties.
                                           39925: CLOUD-422: Reverted revision 39919, will be re-comitted after CLOUD1 released
                                           39954: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                                                39655: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                     39490: Changing the icon for creating a new folder in the cloud
                                                     39580: CloudSync: fix Unsync - to ensure we don't leave sync aspects (such as failed, which reappears if src file is re-synced)
                                                     39587: ALF-15222: Cloud Folder picker: Newly created folder isn't selected
                                                     39589: ALF-15098: Folder Picker causes JS error in the document details page
                                                     39597: CloudSync: tweak a couple of unit tests
                                                     39598: CloudSync: ALF-14655 - update simple file sync (to test multiple sync'd files)
                                                     39606: CloudSync: minor log level adjustments
                                                     39607: CloudSync: ALF-14483 - SyncTracker - enable sync sets to be pushed in parallel
                                                     39613: Refactor of test code. SyncTrackerComponentTest now uses JUnit Rules to manage temporary content and to undo mocking out of services.
                                                     39616: CloudSync: CloudSync: ALF-14483 - SyncTracker - multiple syncs (to different tgt folders) with multiple files
                                                     39633: CloudSync: ALF-14483 - SyncTracker - enable sync sets to be processed in parallel
                                           39955: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                                                39656: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                     39640: ALF-15231 Restore, with refactorings / making more general, the ability to lazy create the remote credentials container if bootstrap has not created it (eg on Cloud)
                                                     39641: ALF-15230 Refactor the lazy container creation code, to use the new SystemNodeUtils helper
                                                     39643: ALF-15220: Indirect sync and sync failed indicators appeared together on nodes during the demo
                                                     39653: ALF-15041: Cloud Sync doesn't work with IE7
                                           39956: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                                                39736: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                     39735: CloudSync: ALF-14483 - multi-threaded SyncTracker
                                                39866: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                     39670: Rework to cloud key license stuff - introduces a ValidLicenseEvent
                                                     39673: New unit test for adding checked out nodes into a sync set.
                                                     39677: ALF-14903 Move the Sync allowed/not-allowed check, based on Network/Tenant, to AbstractCloudSyncAbstractWebScript, and have this used by the webscripts based on this too. Then, allow UnSync to proceed no matter what the tenant status, and add unit tests
                                                     39683: ALF-15162 - Unclear error message when delta syncing and the target is gone
                                                     39686: Replaced GPL license with enterprise licence.
                                                     39687: Enterprise license for enterprise remote api project
                                                39867: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                     39747: ALF-14377	Need to decide what to do when SSD creator user is no longer valid 
                                                          - part 1 nodes are marked.
                                                     39748: CloudSync: fix compile error
                                                     39767: CloudSync: fix ALF-15145 - Unsync of a folder (sync) that has a working copy file causes indirect icon to remain ...
                                                     39775: ALF-15271: "Site Content" dashlet shows all documents from all the sites in Alfresco Share
                                                     39810: ALF-15221: Cloud Sync Status: Failure message when getting location is misleading
                                                     39812: UI Bug Fixes:
                                                          - ALF-15174: Uses already copied slingshot.properties file for message strings needed in both repo and Share
                                                          - Cloud delete file message shouldn't refer to the cloud
                                                     39820: ALF-15267: Edit online is available for locked on-premise copy 
                                                     39826: ALF-14377 - Need to decide what to do when SSD creator user is no longer valid
                                                39870: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                     39847: ALF-15185: YUI Overlay Mozilla Scrollbar fix should be prevented in recent versions of Firefox too.
                                                     39859: ALF-15249 Add a new method hasSyncSetDefintions, with unit test, and use this to skip the Sync Pull step on-premise if no SSDs have been defined on the local system
                                                     39860: ALF-14908: Update Sync status dialogue to include the local root folder for indirectly synced nodes.
                                                39914: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                     39863: ALF-15268: Cancel button disabled in the target selection window for new folder creation in Cloud
                                                     39864: ALF-15003 Sync failed for the file (where write access on source removed for sync owner) but no matter this file appears in Cloud
                                                     39876: ALF-15301: IE8 specific: It is impossible creating a new folder in a cloud target selection window/Cloud location
                                                     39883: CloudSync: fix ALF-15270 - moving directly synced node (on source) causes target node to be deleted
                                                     39902: ALF-15041: Cloud Sync doesn't work with IE7
                                                     39903: ALF-15041: Cloud Sync doesn't work with IE7
                                                     39904: ALF-15041: Cloud Sync doesn't work with IE7
                                                39920: Bug fixing for CSS issues
                                           39959: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                                                39951: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                     39915: ALF-14908: Update Sync status dialogue to include the local root folder for indirectly synced nodes
                                                     39924: CSS fixes for the sync panel
                                                     39942: ALF-14911 - Path shown in the version comments does not match the path shown in the sync status dialogue
                                                          - first part share paths are now handled separatly
                                                     39943: CloudSync: fix remainder of ALF-15130 - sync time for initial sync of working copy (+ unit test)
                                                39952: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                     38871: (RECORD ONLY) Adds edition check before calling enterprise only webscript. Sets sync to OFF for non enterprise editions.
                                                     38956: (RECORD ONLY) Chinese Translation for 4.1
                                                     39011: (RECORD ONLY) ALF-14225: Refactor Welcome Dashlet to show 4 columns, the 4th one of which is always the cloud sign up text.
                                                     39024: (RECORD ONLY) ALF-14225: Adds tracking to URL.
                                                39958: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                     39957: CloudSync: minor - some info logging (applies to src + tgt)
                                           39967: CLOUD-165: Merged 4.1-BUG-FIX to CLOUD1
                                                39962: ALF-15158: Downloading Office 97 files with .doc extension result in file with .dot extension when using Google Chrome
                                                  - Added more complete and intelligent content disposition header with the aim of supporting  RFC 5987
                                           39977: CLOUD-454 - merge asynchronous dashlet improvements and remove inappropriate sections.
                                           40048: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1
                                                40022: Fix for ALF-15144 - Slow Share doclib high-level folder browsing due to version history retrieval (CLOUD-467)
                                                40047: Fix from Mike Hatfield for ALF-15372 - Chrome is blocking google map display for geo tagged pictures (CLOUD-468)
                                           40078: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                                                note: "blending" cloud sync fixes into CLOUD1 (as requested by BR)
                                                39997: ALF-14377: Need to decide what to do when SSD creator user is no longer valid
                                                40013: "Cloud Sync" link should not be shown in "My Profile" in the Cloud
                                                40056: Merged the sync specific changes to the other presentation.css files
                                                40070: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC: (record-only: NB - already manually merged)
                                                      39566: Allow the sync mode to be fetched by guest (it need not be hidden) ...
                                                      39574: Cloud lacks a guest mode, so switch to unauthenticated for the sync mode fetch (user credentials may not be available)
                                                40071: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                     39996: ALF-14377: Need to decide what to do when SSD creator user is no longer valid
                                                     40010: Enhancement to TemporaryNodes JUnit @Rule so that it gracefully handles checked-out nodes during test code.
                                                     40017: During work for ALF-15296, I've fixed up the error handling during sync set creation.
                                                     40019: Having fixed the TemporaryNodes @Rule in rev 40010 so that it handles checked-out test files gracefully, I'm removing Jan's workaround for a checked-out test file.
                                                     40036: Addressing the important question raised in ALF-14950.
                                                     40054: CloudSync: add simple *folder* sync unit test !
                                                     40065: Removal of potential NullPointerException (not observed).
                                                     40067: CloudSync: ALF-15287 - folder sync to a clashing name hierarchy causes file to be indirectly synced to the wrong place
                                                     40068: Java doc corrections.
                                                     40069: ALF-15364: CloudSync: folder sync with lock on-premise - pulled new file is not auto-locked
                                           40104: Fix for CLOUD-476 - userStatusRelativeTime is still referenced in org/alfresco/components/dashlets/my-profile.get.js and causes exception on user profile page when user status has been set.
                                           40147: French: Cloud Translation update from Gloria (based on EN rev38372)
                                           40173: Merged V4.1-BUG-FIX to CLOUD1
                                                38178: ALF-14720: Get rid of big, unused class
                                           40174: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                                                40092: Changing the color of the "Synced Folder" link for each theme
                                                40094: Property translation problem fixed: If there is a replacement parameter (e.g. {0}) and an apostrophe in a property the apostrophe needs to be escaped by using a double apostrophe otherwise the property cannot be translated correctly.
                                                40172: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                     40072: Error message string updates, based on feedback from Docs.
                                                     40076: Fixes encoding error introduced in r40072.
                                                     40169: CloudSync: fix ALF-15380 - source file is deleted (or unsync with delete) but an unpulled target update causes target to remain synced (and/or not deleted)
                                           40343: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                                                40333: Probable fix for ALF-15430. sys:hidden aspect needs to be handled consistently by Hybrid Sync.
                                           40363: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                                                40356: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                     40176: CloudSync: add simple rename test (file + folder sync)
                                                     40282: CloudSync: ALF-15468 - Can't create cloud sync connection from Enterprise 4.1 to Alfresco "in the cloud" !
                                                     40328: CloudSync: minor - unit test updates (for simple move of directly synced nodes - file or folder)
                                                     40333: Probable fix for ALF-15430. sys:hidden aspect needs to be handled consistently by Hybrid Sync.
                                                     40334: Removing unused import - also want to trigger rebuild on this plan as I suspect it failed randomly.
                                                     40349: CloudSync: fix move out (=> target delete) - add unit tests ( ALF-14655 / ALF-15011 )
                                           40402: Fix to CSS error in cloudsync merge - incorrectly overridden font-size in H3 dashlet contents (fix from Mr "I read CSS in my sleep" Hatfield).
                                           40421: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                                                40419: Fix for the MLText parts of ALF-15502.
                                 44550: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
                                      40565: CLOUD-23: core changes to allow overriding of "edit online" button's URL generation.
                                      40566: CLOUD-23: override "edit online" button's URL generation to work with cloud format SPP URLs.
                                      40628: Cloud SPP: stop SOAP/RPC requests being rejected when URL is outside of doclib.
                                      40653: CLOUD-26: 4.1 All protocol features outside browsing the document library should be disabled
                                      40667: CLOUD-26: core change to support both Thor and standard URL schemes.
                                      40668: CLOUD-26: fix Document Management sidebar before disabling unwanted features.
                                      40670: CLOUD-26: fixing "add new members..." to work with cloud (before disabling feature!)
                                      40677: Cloud SPP: fix disallowing of unsafe methods outside of doclib, fixed to allow all methods to Sharpoint protocol methods and fixed tests.
                                      40683: CLOUD-26: core changes to allow easy overriding of dwsServiceHandler bean without having to respecify configuration settings.
                                      40686: CLOUD-26: disable Members tab in Document Management sidebar of Office 2007.
                                      40693: CLOUD-26: disable Links tab of the Document Management sidebar in Office 2007.
                                      40814: Cloud SPP: users were unable to list/edit files within their non-home tenant.
                                      40846: CLOUD-28: made activity "appTool" parameter a configurable value.
                                 44551: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
                                      40861: Merged HEAD to BRANCHES/DEV/CLOUD1_SP:
                                           40854: ALF-15557: Sharepoint subsystem to create activity records
                                      40863: Cloud SPP: Removed activity posting code made redundant by commit 40861
                                      41037: CLOUD-23: SPP can be deployed to the root context, i.e. "/"
                                      41079: CLOUD-26: core SPP changes to allow overriding of behaviour.
                                      41080: CLOUD-26: disable "documents" tab in document management sidebar of Office 2007.
                                 44552: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
                                      41102: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                           40553: Remove on-premise style MT store Id extraction code from syncmode config lookup.
                                      41103: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                           40783: Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1:
                                                40782: Fix ALF-15420: Move: child files/subfolders aren't synced after moving from parent folder and updating in Alfresco on-premise/Cloud
                                      41106: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                           40871: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                                                40342: Merged BRANCHES/DEV/THOR1_REST_API1 to BRANCHES/DEV/THOR1_REST_API2:
                                                     35747: Merged BRANCHES/DEV/THOR1_REST_API to BRANCHES/DEV/THOR1_REST_API1:
                                                          34235: Upgraded Jackson to 1.9.4
                                                          34258: Removed invalid bean definitions (classes don't exist) for abstract="true" beans.
                                                          34463: Exported=true 
                                                          34464: Removed unused parent workflow
                                                          34465: Added a createComment method (Just cut and pasted Neils testcase code).
                                                          34466: Initial check-in of Rest Api code.  Still quite a bit to do.
                                                          34619: Added sources
                                                          34620: Going to start another Sprint so I need to check in everything up to date. WIP
                                                          34691: Renamed Action interfaces for better consistency, Fixed up POST methods with better Metadata about resources and fixed failing tests
                                                          34727: Reworked the Resource execution, added PUT webscript, improved the tests.
                                                          34853: Implemented HTTP Methods: GET, PUT, POST, DELETE with better test cases
                                                          34856: Initial cut of rest api implementations. Work in progress.
                                                          34935: Added EmbeddedEntityResource and uniqueid annotations. Recursively calls embedded entities, improved tests.
                                                          34956: Attempted simplification by removing the CollectionResource concept -> Just an EntityResource with 5 potential methods.
                                                          34986: 2nd cut of rest api implementations: still wip.
                                                          34987: Added a readById method for Resource GET using the relationship id
                                                          35007: Rest API (THOR-1150, THOR-1151, THOR-1152, THOR-1153, THOR-1220, ):
                                                              - explicitly set default timezone for date serialization/deserialization to UTC
                                                              - more rest api implementation tests
                                                              - rest api implementation re-factoring resulting from changes to the framework
                                                          35024: Automatically sets the id of passedIn object for a HTTP PUT for relationship resources.
                                                          35051: Further impl for public api: THOR-1150 -> THOR-1153 and THOR-1220
                                                          35059: Separated the GET executor so the embedded objects are called correctly.
                                                          35102: Added Paging, fixed up the Tests.
                                                          35117: wip, rest api implementations
                                                          35312: Made final
                                                          35313: Better exception handling with messages
                                                          35314: Improved paging/params and messages, started on embedded relations
                                                          35322: Added support for relations projections, to filter by properties use "properties" param, to add in relations use the "relations" param
                                                          35329: Handles null relationship keys
                                                          35377: Checks for simple property types which don't allow embedding
                                                          35496: WIP: rest implementations, test framework and tests
                                                          35529: Initial commit of scope and versioning support.
                                                          35539: Fixed the versioning for relationship resources
                                                          35560: Quick cleanup
                                                          35562: Embedded relationships is now working much better
                                                          35586: Safer serialization of Maps/Collections
                                                          35603: Added better version and filtering tests.
                                                          35611: Added Entity and Relationship not found exceptions
                                                          35612: Added Entity and Relationship not found exceptions
                                                          35674: Rest api implementations:
                                                               - node refs are represented solely by their uuid (workspace://SpacesStore is assumed)
                                                               - updates to model classes (hashcodes, equals, etc)
                                                               - more paging support
                                                               - tests
                                                     35858: Merged BRANCHES/DEV/THOR1_REST_API to BRANCHES/DEV/THOR1_REST_API1:
                                                          35773: Added api versioning with @WebApiDeleted annotation.  Better inheritance handling and improved tests.
                                                          35774: Deleted, it wasn't supposed to be there.
                                                     35988: WIP:
                                                         - sample requests
                                                         - more tests
                                                         - general fixes, including security fixes
                                                         - tag entity
                                                     35990: Merged BRANCHES/DEV/THOR1_REST_API to BRANCHES/DEV/THOR1_REST_API1:
                                                          35938: Reworked filtering in a big way. Hopefully now it works.
                                                          35982: Clean up and bug fix the request
                                                          35983: Clean up and bug fix the request
                                                     36002: Merged BRANCHES/DEV/THOR1_REST_API to BRANCHES/DEV/THOR1_REST_API1:
                                                          35992: Clean up after discussions with David/Steve. New Parameter called "parameters"! 
                                                     36056: Clean up, not used
                                                     36057: Changed the way responses are rendered, more consistent "entry" entries.
                                                     36087: Changed the json structure for tests as well
                                                     36134: Added paging parameter, cleaned up imports, more tests
                                                     36146: WIP:
                                                          - fixed up create tag return type
                                                          - fixed up Person model entity so that it doesn't extend Node
                                                     36151: Fix for Serialization of recursive related Collection of results
                                                     36168: Better empty collection handling, initial sorting tests.
                                                     36189: Fixes embedded resources by correct id.
                                                     36210: WIP:
                                                          - updates to rest api request files
                                                          - changed Comment so that it doesn't extend Node. removed title
                                                          - more tests
                                                     36211: WIP:
                                                          - service paging and other fixes and updates
                                                     36298: Moved jetty files to fix the build (it's odd that cloud -r works and yet continuous.xml does not)
                                                     36299: Update classpath as a result of jetty jars move
                                                     36301: Fix to stop null values in hashmaps from being returned in results.
                                                     36302: Added copyright notices
                                                     36303: WIP:
                                                          - split site service into a base class (dealing with site permissions and membership) and a subclass (everything else) to aid the following
                                                          - moved site membership functionality into canned queries for person sites and site members relations
                                                          - changed totalItems to an Integer so that it can be null if total items is not known
                                                          - added siteId filtering for activities
                                                          - copyright notices
                                                          - creating a comment through the comment service raises a share-like activity
                                                     36304: WIP:
                                                          - changed totalItems to an Integer so that it can be null if total items is not known
                                                          - copyright notices
                                                     36309: Servlet API 2.5 needs to be included at the top for the embedded jetty to work - need to revisit this.
                                                     36310: Temporary fix for dealing with nodeRefs embedded in activity summaries: regex match and convert to NodeRef.
                                                     36312: Fix tests
                                                     36325: Add jetty jars to ant test classpath
                                                     36327: Site memberships fix, override search subsystem to force lucene, re-instate full site service implementation (Spring circular dependencies are ok)
                                                     36335: Add missing file
                                                     36367: Fixes to tests
                                                     36368: CommentService fix - permissions.
                                                     36438: WIP:
                                                         - Person filtering (for cloud)
                                                         - Disabled some tests that are preventing the test from running (will revisit)
                                                         - Person-avatar relation
                                                     36522: WIP:
                                                         - fix sort ordering for site members
                                                         - fix site id filter for activity feed list (add tenant id)
                                                     36523: WIP:
                                                         - more tests
                                                         - improved robustness of tests
                                                         - added status mappings for EntityNotFound and RelationResourceEntityNotFound
                                                         - for avatar, return base 64 encoded avatar data and avatar node id
                                                         - use more specific EntityNotFound and RelationResourceEntityNotFound exceptions.
                                                     36646: Changes resulting from review
                                                          - make sure empty strings and null values are not output
                                                          - person entity tidy-up
                                                          - person visibility rules applied to person retrieval
                                                          - more tests
                                                          - return noderef of avatar node
                                                     36668: Fix build, add missing file
                                                     36694: Fix failing test
                                                     36764: WIP:
                                                          - site containers canned query
                                                          - node ratings: return null average (rather than -1) if there are no ratings
                                                          - site membership canned query sorting - use an enum for sort fields
                                                     36767: Add missing files
                                                     36769: WIP:
                                                          - node ratings: remove user rating summary, added rating date and fixed up tests
                                                     36770: WIP:
                                                          - some changes to property names for activity feed entries
                                                     36823: WIP:
                                                         - re-instate -1 for average rating when there are no ratings
                                                     36824: Changes resulting from review:
                                                         - merge activities into one relation
                                                         - quota model object to model network quotas
                                                         - Change HomeAccount -> HomeNetwork
                                                         - Changes to comment property names
                                                         - If average rating is -1 (from the rating service) convert to null
                                                         - remove readById from node entity resource
                                                         - Favourite sites url renaming
                                                     36825: Removed debug logging for rest api
                                                     36826: Commented out tag related tests until I figure out how to get the lucene search working
                                                     36833: Added discoverablity for the documentation.  New @WebApiDescription, @WebApiParam annotations
                                                     36871: Added tests for @WebApiDecrition, @WebApiParam
                                                     37026: WIP:
                                                          - added discoverability annotations
                                                          - changes resulting from review:
                                                             o node ratings output restructure
                                                             o network quotas restructure (need to revisit this again)
                                                          - activity summary post processing framework
                                                          - added non-caching to rest api webscript (need to revisit)
                                                          - don't output empty strings (need to revisit)
                                                          - more tests
                                                     37058: WIP:
                                                         - change tag service support
                                                     37141: WIP:
                                                          - tag sorting
                                                          - fix JSON issue in PreferencesService
                                                     37142: WIP:
                                                          - refactoring: split functional areas into separate REST API implementation classes
                                                          - added copyright notices
                                                          - network quotas represented as a list
                                                          - ensure empty (zero length) JSON strings coming into the REST api are treated as null
                                                     37300: WIP:
                                                          - support for update comment
                                                          - activity summary processing
                                                          - web script set no caching and response content type
                                                     37301: WIP:
                                                          - support for update comment
                                                     37354: Build fix: try rebuilding indexes
                                                     37369: Fix build: try again
                                                     37498: More logging to determine build failure using lucene for search
                                                     37608: Build fix?
                                                     37609: Fix build
                                                     37637: Fix build: try again
                                                     37672: Build fix (try again)
                                                     37860: Get networks: consolidate functionality so that it's easily callable from core Thor code and public api code
                                                     37861: Get networks: consolidate functionality so that it's easily callable from core Thor code and public api code
                                                     37862: Fix for THOR-1493: "OpenCMIS Change Object Id to be Node GUID"
                                                     37864: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api"
                                                     37866: Unit test fix
                                                     37950: Build fix for ApiTest (another try - override repository-properties bean to force lucene)
                                                     38051: Build/test fix (another try)
                                                     38072: Removed file no longer required
                                                     38114: Better representation of the Resource metadata.  Try calling: /alfresco/service/public/alfresco/versions/1
                                                     38230: Fix PublicApiTest on the build machine
                                                     38309: Public api test fixes
                                                     38319: Public api webscript transaction configuration. Make get webscript r/o transaction.
                                                     38320: Public rest api: make sure http response headers are written before the response content.
                                                     38340: More build test fixes
                                                     38349: Fix for THOR-1493: "OpenCMIS Change Object Id to be Node GUID"
                                                         - fix up CMIS query fallout
                                                     38530: Fix tests
                                                     38531: Fix for THOR-1493: "OpenCMIS Change Object Id to be Node GUID"
                                                          - fix up cmis queries
                                                     38552: Further test fixes
                                                     38574: Added some comments
                                                     38730: Added OPTIONS webscript to get metadata on the current url
                                                     38879: Refactored a little to make the code easier to extend / customise
                                                     38880: Fixed incorrect config, I should try not to delete things.
                                                     38986: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/THOR1_REST_API1:
                                                          38954: Fix for ALF-14475: "CMIS : Wrong cmisra:numItems in folder sites and below with /cmisatom binding url"
                                                     39010: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/THOR1_REST_API1:
                                                          39006: Fix for ALF-14475 part 2: "CMIS : Wrong cmisra:numItems in folder sites and below with /cmisatom binding url"
                                                     39090: Fixed broken webscript OPTIONS call
                                                     39159: Fix broken INFO url mapping
                                                     39326: Clean up, Added ResourceMetaDataWriter interface for different meta info presentation formats
                                                     39331: The tests need their own context
                                                     39609: Update to latest Chemistry libraries
                                                     39657: Fix for CLOUD-417, part 1: "Delete a Comment"
                                                     39741: Fix for CLOUD-409: "Change Endpoint for CMIS URLs in Staging"
                                                     39742: Fix for CLOUD-409: "Change Endpoint for CMIS URLs in Staging"
                                                     39750: Fix for CLOUD-417, part 2: "Delete a Comment"
                                                         - added delete comment method to comment service
                                                     39754: Fix for CLOUD-417, part 3: "Delete a Comment"
                                                         - fixed up activity generation for update and delete comment
                                                     39776: OpenCMIS TCK fix: getDescendants is using node service, which unlike the FileFolderService does not automatically remove hidden files.
                                                     39780: Shifted public api opencmis webscript definitions to Thor
                                                     39781: Shifted public api opencmis webscript definitions to Thor
                                                     39782: Fix for CLOUD-409: "Change Endpoint for CMIS URLs in Staging"
                                                     39783: Minor fixes, comments
                                                     39785: Public api tests
                                                         - move jetty libraries to 3rd party
                                                         - remove JettyComponent as a Spring bean and change how it's constructed
                                                     39786: Fix for THOR-1493: "OpenCMIS Change Object Id to be Node GUID"
                                                         - for unversioned documents, the revision number should not be appended
                                                     39794: Added missing files for public api tests
                                                     39795: Update to latest Chemistry libraries
                                                     39834: Fix for THOR-1493: "OpenCMIS Change Object Id to be Node GUID"
                                                         - for unversioned documents (or documents with version "1.0"), the revision number should not be appended
                                                     39835: Fix for CLOUD-362: "Discover Networks" API should be at "/tenants"
                                                     39836: Fix for THOR-1493: "OpenCMIS Change Object Id to be Node GUID"
                                                     39844: Public api tests
                                                         - move jetty libraries to 3rd party
                                                         - remove JettyComponent as a Spring bean and change how it's constructed
                                                     39854: Fix for CLOUD-362: "Discover Networks" API should be at "/tenants"
                                                     39856: Re-instate tests.
                                                     39857: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api"
                                                          - removed cmisatom url binding (opencmis is now at .../public/cmis/versions/1/atom)
                                                     39926: Fix for CLOUD-442: "Public API : Tagging + Paging"
                                                     39927: Fix for CLOUD-442: "Public API : Tagging + Paging"
                                                          - updates to public api tests
                                                     40185: Make sure LockService is injected into CommentService
                                                     40186: Make sure LockService is injected into CommentService
                                                     40187: Changes resulting from sprint demo:
                                                         - changes to network and network membership representation
                                                         - embed modifiedBy person object in comment
                                                     40211: Changes resulting from sprint demo:
                                                         - changes to network and network membership representation
                                                     40212: Fix intermittently failing test
                                                     40223: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api"
                                                          - changes resulting from end of spring demo (get repositories located at .../cmis/versions/1.0/atom)
                                                          - removed browser binding for now
                                                     40224: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api" (Thor-specific changes)
                                                          - changes resulting from end of spring demo (get repositories located at .../cmis/versions/1.0/atom)
                                                          - removed browser binding for now
                                                     40225: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api"
                                                          - changes resulting from end of spring demo (get repositories located at .../cmis/versions/1.0/atom)
                                                          - removed browser binding for now
                                                     40254: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api"
                                                          - changes resulting from end of spring demo (get repositories located at .../cmis/versions/1.0/atom)
                                                     40255: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api"
                                                          - changes resulting from end of spring demo (get repositories located at .../cmis/versions/1.0/atom)
                                                     40256: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api"
                                                          - changes resulting from end of spring demo (get repositories located at .../cmis/versions/1.0/atom)
                                                     40270: Turned stacktrace into a String
                                                     40339: CLOUD-488: "The activities feed in the public API is not returning all required summary data for comments"
                                                40548: Merged PATCHES/V4.0.2 to BRANCHES/DEV/THOR1_REST_API2:
                                                     40526: Fixed ALF-15540: CMIS: Synchronized block in service interceptor
                                                40644: Public api:
                                                40645: Public Api:
                                                40646: Public Api:
                                                40649: Public api:
                                                40650: Public api:
                                                40657: Merged BRANCHES/DEV/THOR1_REST_API1 to BRANCHES/DEV/THOR1_REST_API2:
                                                     40515: CLOUD-390: Content models to be filtered out of Cloud CMIS implementation
                                                     40550: Public api:
                                                         - updates to datetime property names
                                                     40552: Public api:
                                                          - sort sites by site title (by default)
                                                     40596: Removed "system" from exclusions for CLOUD-495
                                                     40610: CLOUD-495: F414: Add multiple tags to a folder or document
                                                40674: Public api:
                                                40675: THOR-1324: "F414: Add multiple tags to a folder or document"
                                                40676: Public api:
                                                40678: Public api:
                                                40715: Public api:
                                                40730: Merged /alfresco/BRANCHES/DEV/THOR1_REST_API1:r40724  Better meta-data handling for PUT requests
                                                40731: Merged /alfresco/BRANCHES/DEV/AMILLER/CLOUD-496:r40659: CLOUD-500: Add trusted auth with key validation.
                                                40732: Fixed failing test
                                                40739: Merged BRANCHES/DEV/V3.4-BUG-FIX:r40193: ALF-15307 / ALF-15190: FTS indexing can stick forever on purged nodes - May cut 50 minutes off the build time when merged
                                                40742: Public api
                                                40801: Public api:
                                                40802: Public api
                                                40803: Public api
                                                40804: Public api
                                                40807: Public api
                                                40811: Public api
                                                40815: Public api:
                                                40826: Public api
                                      41108: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                           40898: Fix build
                                      41110: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                           40903: Fixed solrcore properties (merge error)
                                      41111: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                           41007: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                                                40998: CLOUD-563: "View external member of the site if internal user is not a member of a site."
                                      41112: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                           41048: 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
                                      41245: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                           41128: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                                                41003: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                                                41026: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                                                41039: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                                                41086: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                                                41115: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                                                41126: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                     40364: Testcase for ALF-15178, which is not reproduced.
                                                     40419: Fix for the MLText parts of ALF-15502.
                                                     40782: Fix ALF-15420: Move: child files/subfolders aren't synced after moving from parent folder and updating in Alfresco on-premise/Cloud
                                                41127: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                                                     41121: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/V4.1:
                                                          41003: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                                                          41026: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                                                          41039: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                                                          41086: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                                                     41123: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/V4.1:
                                                          41115: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                                      41247: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                           41149: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                                                41146: Fix trusted authentication against OpenCMIS
                                      41248: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                           41157: BDE-73: finish adding all the code into Sonar report. Tests are not there yet.
                                      41249: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                           41180: 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
                                      41250: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                           41185: BDE-73: Add back web-framework-commons to fix reporting
                                      41251: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                           41192: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                                                41191: Fix for OpenCMIS trusted authentication to allow local opencmis access as before
                                      41252: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                           41209: BDE-73: workaround MDEP-98 encountered with Sonar
                                      41253: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                           41212: CLOUD-610: "Public APIs causing problem with mobile app"
                                 44553: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
                                      41293: Cloud SPP only: fix IDE project dependency and classpath for PublicApiTest (and others no doubt) to run.
                                      41294: Cloud SPP: ensure vti and thor module dependency is handled correctly.
                                      41312: Fix build problem: some unit tests had been split out and needed the sharepoint module on the classpath.
                                      41379: Cloud SPP: remove remote-api dependency from repository.
                                 44554: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
                                      41695: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                           41114: Merged DEV\V4.1-BUG-FIX to DEV\CLOUD1
                                                 40977: (Record only) Sync parser generation
                                      41696: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                           41302: CLOUD-622: "Mobile App connection to testmy build 227 issue"
                                      41698: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                           41375: BDE-73: remove never-ending test for reporting
                                      41699: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                           41377: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                                                40859: public api:
                                                40862: CLOUD-555: "Updating comment fails because node not found"
                                                40961: CLOUD-566: "Site object shouldn't contain the "sitePreset" property"
                                                40979: Added tests for non-numeric params and non-european characters
                                                41030: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/THOR1_REST_API2:
                                                     41027: ALF-15193: "Folder Is Not a Folder CmisInvalidArgumentException thrown when using cmis:objectId"
                                                41097: Added quickshare and cloudsync to cmis filter list
                                                41098: Renamed serializer/deserializer lists for RestJsonModule
                                                41099: Cleaned up consistent Rest responses - CLOUD-574
                                                41100: Meta info webscript is disabled because its not been reviewed / in the correct format
                                                41104: Meta info webscript is really disabled because its not been reviewed / in the correct format
                                                41105: Added key for trusted layer7 relationship
                                                41137: Public api:
                                                41168: Public apI;
                                                41169: CLOUD-565: "API / URL returns a "tenant required" error"
                                                41170: public api:
                                                41171: public api:
                                                41172: public api:
                                                41183: CLOUD-598: "API: "GET network" response has unnecessary JSON nesting"
                                                41186: Fix solrcore properties
                                                41282: CLOUD-616: "CMIS API: Repository names should be more descriptive"
                                                41283: CLOUD-601: "API /networkId/public/cmis/versions/ returns a 400"
                                                41325: Public api:
                                                41367: CLOUD-636: "REST API: Nodes: Tags: Not allowed DELETE method proceeds with status 204"
                                                41369: Public api:
                                      41700: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                           41474: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                                                41422: Sample OAuth call for the Resource Owner Password flow
                                                41427: Sample OAuth call for the Client Credentials flow
                                                41433: Public api: (1) parameterize site members/people sorting in service api
                                                41434: Public api: minor comment service fix
                                                41438: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                                41439: Public api: fix for default tenant id in CMIS requests
                                                41449: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                                41456: CLOUD-644: "Performing a Checkout in OpenCMIS Results in an Exception in the Share Doc Library"
                                                41457: Fix build
                                                41461: Public api: more tests
                                      41701: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                           41560: CLOUD-657: "cmis root service document returning incorrect urls"
                                      41702: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                           41627: CLOUD-676: "OpenCMIS Returns Error 500 on GET: https://testp.alfresco.me/alfresco/a/cmis/versions/1.0/atom"
                                      41703: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                           41670: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                                                41521: CLOUD-660: "GET favourite sites results in exception when skipCount is greater than number of items"
                                                41606: Fix for CLOUD-668 - POSTing to a relationship by id now returns an InvalidArgumentException
                                                41607: CLOUD-668 : changed ordering so errors fire in correct order.
                                                41628: Public api: more tests
                                 44555: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
                                      41709: CLOUD-640: Notification is not displayed for consumer for updating/editing document added by other user
                                      42331: Cloud SPP: really fix import order.
                                      42364: Cloud SPP: fix Spring bean filename typo.
                                      43078: CLOUD-868: incorrect URL for Sharepoint protocol
                                      43153: CLOUD-747: SPP: Checking document out doesn't work
                                      43221: CLOUD-896: Unable to open specific version of document from MS Word
                                      43222: CLOUD-896: Unable to open specific version of document from MS Word
                                      43247: CLOUD-896: missing class CloudVersionsServiceHandler from previous commit.
                                      43256: CLOUD-896: fix broken test
                                 44556: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
                                      43472: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD1_SP:
                                           41710: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                                                41672: CLOUD-672: "404 Error when browsing child files/folder "
                                                41673: Public api: more tests
                                                41675: CLOUD-674: "Root network calls need to return application/json content type"
                                           41754: Merged BRANCHES/DEV/FEATURES/CLOUD1_LAYER7 to BRANCHES/DEV/CLOUD1:
                                                41677: No-op skeletons of Public API gateway filter and URL rewrite filter
                                                41683: Url rewrite rules for new and old-style public api
                                                41705: First working version of gateway filter
                                                41732: Trim authenticator keys from config
                                                41734: Productising code - tests and bug fixing with layer7, code tidyup, configuration, error handling
                                                41753: SSL support for accepting self-signed certificates
                                           41794: Merged BRANCHES/DEV/FEATURES/CLOUD1_LAYER7 to BRANCHES/DEV/CLOUD1:
                                                41792: Fixes for Gateway authentication filter after end to end testing on staging.
                                           41798: Merged BRANCHES/DEV/FEATURES/CLOUD1_LAYER7 to BRANCHES/DEV/CLOUD1:
                                                41797: Ensure authentication filter provides enough info to gateway for full analytics
                                           41815: Merged BRANCHES/DEV/FEATURES/CLOUD1_LAYER7 to BRANCHES/DEV/CLOUD1:
                                                41814: Fix regression where old style apigee route failed
                                           41842: CLOUD-619: "CMIS query for objectId throws exception"
                                           41843: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                                                41790: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                                41791: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                                41793: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                                41823: Public api: more tests
                                                41825: Fix for CLOUD-684 - wraps the list, not sure if I like the paging
                                           41855: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                                                41853: CLOUD-700: "The mobile SDK needs a way to map an accessToken to a user identifier"
                                           42005: Merged BRANCHES/DEV/FEATURES/CLOUD1_DAM to BRANCHES/DEV/CLOUD1:
                                                37644: Resolve CLOUD-34: Incorporate Gallery View
                                                39105: Moved to AMP produced from modules/dam/BRANCHES/V1.0 with overrideSource=cloud build property
                                                39268: ALF-13984: High Resolution Mime-Aware Place Holder Icons
                                                     - Implemented in DAM 1.0.2.0
                                                39651: Deployed DAM module version 1.0.3 to CLOUD1_DAM which fixes:
                                                     - CLOUD-380: Document library displayed incorrectly in Gallery view in IE7
                                                     - DAM-36: CLONE - Document library displayed incorrectly in Gallery view in IE7
                                                     - DAM-37: Gallery View: No Border Around Selected Items in IE7
                                                     - DAM-38: Gallery View: Two Items Must be Selected in IE7 for Multi-select Actions
                                                     - DAM-39: Gallery View: Slider Behavior is Erratic in IE7
                                                     - DAM-40: Gallery View: Upload Instructions Throws Error in IE7
                                                40083: CLOUD-378: Drag and drop within document library doesn't work in Gallery view
                                                     - Deployed DAM 1.0.4.0
                                                40507: Changed name of DAM module to Media Management
                                                40534: Version 1.0.5.1 of MM module which includes:
                                                     - DAM-61: Multi-Select Checkboxes Are No Longer Present in 1.0.5
                                                40723: Deployed version 1.0.5.3 of the Media Management module which includes fixes for:
                                                     - CLOUD-544 / DAM-66: 'Share' Link Displayed Incorrectly on Info Panel
                                                     - CLOUD-543 / DAM-65: Gallery View Content Display Should Support Dynamic Changing of Browser Width
                                                41174: Deployed Media Management module 1.0.5.4 which includes:
                                                     - DAM-67: Gallery View Changes the Size of Dragging Thumbnails in Other Views
                                                     - DAM-68: Gallery VIew Should Hide Its Container on destroyView
                                                     - DAM-69: Gallery View Resizing Should Fire Only When Resizing has Stopped
                                                     - DAM-71: Gallery View Thumbnail Generation Should Accept Thumbnail Definition Parameter
                                                41536: Merged HEAD to BRANCHES/DEV/FEATURES/CLOUD1_DAM:
                                                     40870: m.share fixes
                                                41537: Merged HEAD to BRANCHES/DEV/FEATURES/CLOUD1_DAM:
                                                     40919: m.share fixes
                                                41538: Merged HEAD to BRANCHES/DEV/FEATURES/CLOUD1_DAM:
                                                     41432: Fixed CLOUD-587 "Drag and Drop Changes Conflict with Hover Events on Touch Devices"
                                                41614: Changed version of gallery view only MM module to 0.1
                                                42004: Upgraded to MM 0.1.5.5 which contains fix for DAM-74
                                           42047: Merged DEV/CLOUD_SIGN_UP into DEV/CLOUD1 (cloud priority 
                                           42049: 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
                                           42050: 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
                                           42121: Merged BRANCHES/DEV/AMILLER/CLOUD1 to BRANCHES/DEV/CLOUD1:
                                                39663: CLOUD-153 - Invite box doesn't parse email addresses properly
                                           42160: Merged BRANCHES/DEV/AMILLER/CLOUD1 to BRANCHES/DEV/CLOUD1:
                                                38864: CLOUD-41 - Resize logo banner on upload
                                                38878: CLLOUD-42 - Image previews should be larger
                                           42199: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/CLOUD1:
                                                41113: Creating new [bug fix] branch from BRANCHES/DEV/CLOUD1
                                                41211: QuickShare: CLOUD-593: prevent copying of QuickShare props on node copy [+ minor refactor]
                                                41612: QuickShare: Merged form THOR1_QUICK_SHARE to CLOUD1-BUG-FIX
                                                   36363: QuickShare: Improvment for THOR-1268 "F378: As a user I can choose to share a document"
                                                41639: QuickShare: Fixed bug where the display of quickshare was based on the showComments property
                                           42200: Merged DEV/CLOUD1-BUG-FIX into DEV/CLOUD1: Record-only (r41650 and r41674)
                                           42201: Merged DEV/CLOUD1-BUG-FIX into DEV/CLOUD1: Record-only (r41650 and r41674)
                                           42203: CLOUD-71: Patch was there, but reference to it from "postUpgrade..." was lost in merge, preventing it from being executed
                                           42204: Merged BRANCHES/DEV/HEAD_QUICK_SHARE_TMP to BRANCHES/DEV/CLOUD1:
                                                41733: QuickShare: fix ShareContentGet NPE (fix for Document Details redirect if logged in)
                                           42206: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/CLOUD1:
                                                41213: CLOUD-452: reconfigure Activities DAOs to use common Alfresco datasource
                                                41214: CLOUD-452: reconfigure Activities DAOs to use common Alfresco datasource (DO NOT MERGE to Enterprise/HEAD)
                                                41270: CLOUD-452 / ALF-15823: reconfigure Activities DAOs to use common Alfresco datasource
                                           42209: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/CLOUD1:
                                                41292: CLOUD-520: Convert TicketCleanupJob to a StatfulJob
                                                41410: CLOUD-119: Change status code to 409 (Conflict), from 400 (Bad Request), when parent folder does not exist
                                           42211: Fix pesky solrcore.properties ... remove hardcoded amiller ;-)
                                           42231: CLOID-71: TEMP - comment-out previous r42203 (breaks build/tests)
                                           42241: Updated Media Management module to 0.1.5.6 which contains fixes for:
                                                - CLOUD-740/MM-76: Empty space in the page footer when switching to Gallery View
                                                - CLOUD-741/MM-75: IE7: Opacity of Folder Icon not Rendered Correctly in Gallery View
                                                - CLOUD-741/MM-77: Gallery View Continually Recalculates Height in IE
                                                - CLOUD-753/MM-78: Links for 'Create a folder' and 'Upload files' in the Empty Folder Instructions Don't Work in Gallery View
                                                - MM-79: Disable Fade Animation on Resize of Gallery View
                                           42252: 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
                                           42267: CLOUD-153: Update CloudInvitationServiceImpl to only use the address part of an email string and ignore the personal name. 
                                           42285: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                                                41867: CLOUD-711: "It should be possible to remove a favourite site"
                                                41957: Public api: - error handling improvements - more tests
                                                41970: Public api: - fix build  (add missing files)
                                                41972: Public api: - more tests (including OpenCMIS TCK)
                                                42046: Added some debug timings.  Enabled using log4j.logger.org.alfresco.rest.framework.webscripts=debug
                                                42058: Public api: changed logging package name
                                                42124: Public api: - more tests - minor fixes
                                                42125: CLOUD-734: "CMIS: Query Issues Discovered During Testing"
                                                42126: Public api: fix up OpenCMIS tests
                                                42171: Consistency fix for CLOUD-695.
                                                42180: Fix build
                                                42181: CLOUD-695 "Requests to un-implemented urls do not consistently return http status 405 (Method not allowed)": fix up public api tests
                                                42214: Public api tests (cmis)
                                                42251: Changed the serializer for embedded entities, (related to CLOUD-746)
                                                42253: Fix build
                                           42288: Fix build - fix merge problem
                                           42302: Updated Media Management module to 0.1.5.7 which contains fixes for:
                                                - CLOUD-788/MM-89: "Rename" Icon is not Displayed Correctly in Gallery View
                                           42320: Fix build (fix dodgy merge)
                                           42334: Fixed build of Media Management module for:
                                                - CLOUD-789/MM-91: MM AMPs Produced No Longer Contain module.properties
                                           42341: Fixed CLOUD-755 "Label needs to be renamed and icon should be present"
                                           42344: Fixed CLOUD-755 "Label needs to be renamed and icon should be present" part 2
                                           42365: CLOUD-153: Fix additional invite paths.
                                           42373: Updated Media Management module to 0.1.5.8 which contains:
                                                - MM-92: Change Default View for Cloud to Detailed Rather than Gallery
                                           42513: CLOUD-808: fixed issue with timers due when alfresco boots
                                           42577: CLOUD-808: Fix for timer deploying MT-process when shared is required caused test to fail
                                           42588: BDE-73: fix compilation + switch to MySQL to make cloud tests pass 
                                           42595: Add salesforce modules to privatemodules.  Contains only models.
                                           42596: Add salesforce module build properites and ant build tasks.
                                           42601: Updated salesforce amp with correct version number and updated module-context.xml
                                           42668: BDE-73 Fix Sonar reporting
                                           42709: FRENCH: Translation updates based on EN r42416
                                           42867: CLOUD-71: add explicit schema number for workflow timers redeploy patch
                                           42871: GERMAN: Cloud Translation, based on r 42416
                                           42879: SPANISH: Cloud Translation, based on r 42416
                                           42890: ITALIAN: Cloud Translation, based on r 42416
                                           43120: 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
                                           43243: BDE-73: Fork for each test, otherwise some fail because of previous test leftovers
                                           43323: Merged BRANCHES/DEV/FEATURES/CLOUD1_GRANULARPERMISSIONS1 to BRANCHES/DEV/CLOUD1:
                                                42257: CLOUD-649: Updates UI action for Granular Permissions
                                                42295: CLOUD-33: Updates labels
                                                42303: CLOUD-651: Limit user search to site members only.
                                                42352: CLOUD-780: Adds a rolesWhitelist to only display those roles that are allowed. Currently set to: ["Consumer", "Contributor", "Collaborator"]. This is only used in the site view. The Repository view behaviour has not changed.
                                                42427: Removes multi-select manage-permissions dialogue.
                                                42520: CLOUD-802: Change the way the user is returned to the previous page to work around suspected Chrome bug.
                                                42604: CLOUD-840: Automatically add SiteManger permisions when inheritAll is switched off. Pervent remaoval of siteManager authority.
                                                42606: Fixed CLOUD-840 "Granular Permissions: Site Manager should retain access when inherit permissions is turned off"
                                                42807: CLOUD-863: Reordered code to avoid AccessDeniedException
                                                43259: CLOUD-901: Revert showComments check so it handles undefined permission
                                                43266: CLOUD-900: Old Manage permissions form is opened via Permissions panel
                                                43307: CLOUD-900: Follow-up fix
                                           43353: Fix for remote transform server with new cloud environment
                                           43457: Merged BRANCHES/DEV/FEATURES/CLOUD1_GOOGLEDOCS to BRANCHES/DEV/CLOUD1:
                                                39869: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_GOOGLEDOCS:
                                                     Merged /integrations/GoogleDocs/BRANCHES/THOR1_SPRINTS_GOOGLEDOCS to BRANCHES/V4.1   
                                                       36307 Fixed THOR-1402 "Need a callback option for Create Content menu"
                                                          - Will be revisited to add better comments
                                                       36350 Fixed THOR-1402 "Need a callback option for Create Content menu" part 2
                                                          - Changed callback obj to match action object better: { nodeRef, node, jsNode }
                                                          - Better code documentation
                                                          - Removed dev/test code
                                                          - Improved error config handling
                                                       36358 THOR-1402 "Need a callback option for Create Content menu" part 3
                                                          - Changed "link" parameter to "href" (instead of "page") to match actions.
                                                       39256 Consistency fix of doclib & repo toolbar templates after work on THOR-1402
                                                       39260 Bugfix for "destination" parameter not being resolved correctly THOR-1402
                                                39875: Configurtion changes to enable Google Docs V2 within the web tier.
                                                39881: It's extension ... not extention
                                                39938: Update CLOUD1_GOOGLEDOCS ant build to include installing googledocs amp files
                                                39944: CLOUD-437: Ensure that custom doclib action resources are requested after documentlist.js
                                                40468: Alfresco GoogleDocs AMPS.  Fixes for [GOOGLEDOCS-73], [GOOGLEDOCS-70], [GOOGLEDOCS-75], [GOOGLEDOCS-76]
                                                40624: Update Google Docs AMPs
                                                40635: Merge Google Docs Cloud AMPS to Feature Branchs
                                                40824: Update Google Docs AMPS, fixing [GOOGLEDOCS-79]
                                                40897: Google Docs AMP update 
                                                41165: Merge Updated AMPs for [GOOGLEDOCS-83]
                                                41179: Update AMPs for [GOOGLEDOCS-87]
                                                41262: Update AMPs for GOOGLEDOCS-89
                                                41493: Update AMPs for [GOOGLEDOCS-93]
                                                41635: AMP update for [GOOLGEDOCS-98] [GOOGLEDOCS-99] [GOOGLEDOCS-100]
                                                41805: Update AMPs for [GOOGLEDOCS-101]
                                                41840: Add AMPs with i18n strings
                                                43316: (RECORD ONLY) Rebase CLOUD1_GOOGLEDOCS with CLOUD1
                                                43317: (RECORD ONLY) Re-merge build.properties and projects.xml to include googledocs amps in build
                                                43320: Add googledocs repo declaration
                                 44557: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/FEATURES/CLOUD1_SP_CLEAN:
                                      43751: CLOUD-747: SPP: Checking document out doesn't work
                                      43765: CLOUD-747: fixes ${localname} substitution in vti.server.external.host value
                                      43780: CLOUD-747: Sharepoint version of PROPFIND handler must return 'href' containing the externally visible base URL
                                      43785: CLOUD-747: fix for proxied repository - more robust parsing of URLs.
                                      44001: Fix pesky solrcore properties
                                      44036: Resolve CLOUD-877: UI button for SharePoint Protocol needs to be updated
                                      44211: CLOUD-747: checkout/checkin works for spaces in document
                                 44564: Fix construction of vti activity processor after merge
                                 44565: Remove unnecessary build of war and amps for exploded target (NOTE: may fail in continuous build)
                            44573: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/CLOUD1:
                                 44572: Clean up of unused files.
                            44575: Merged BRANCHES/DEV/CLOUD1_CORS to BRANCHES/DEV/CLOUD1:
                                 43592: (RECORD ONLY) Rebase CORS Filter with the latest CLOUD1
                                 43593: (RECORD ONLY) Add CloudTenantWebScriptServlet endpoint /a to CORS filter mapping
                                 43718: (RECORD ONLY) [CLOUD-955] Add new web script tennant service to seperate public api from web script api
                                 43749: (RECORD ONLY) Rebase CLOUD1_CORS with CLOUD1
                                 44517: (RECORD ONLY) Rebase CLOUD1_CORS with CLOUD1
                            44576: Merged BRANCHES/DEV/CLOUD1_CORS to BRANCHES/DEV/CLOUD1:
                                 44518: [CLOUD-955] Change CORS filter-mapping to use servelet instead of url
                       44696: CLOUD-174: Fix typo in sharepoint configuration.
                       44697: CLOUD-174: Fix spring configuration, missed in initial refactoring. 
                       44716: CLOUD-174: Fix test failures
                       44737: CLOUD-174: Remove duplicate property definition
                       44758: CLOUD-174: Add Sync monitros
                       44771: CLOUD-174: Add local node metrics   
                  46143: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       45329: FRENCH: Cloud translation updates based on EN r45266
                       45330: GERMAN: Cloud translation updates based on EN r45266
                       45332: SPANISH: Cloud translation updates based on EN r45266
                       45333: JAPANESE: Cloud translation updates based on EN r45266
                       45427: SPANISH: Cloud 1 translation updates based on EN r45266
                       45718: ITALIAN: Translation updates based on EN r45266 (missed from previous bundle import)
                       45838: FRENCH: Cloud Translation update based on EN r45266
                       45853: Merged BRANCHES/DEV/FEATURES/CLOUD1-EMAIL-REFRESH to BRANCHES/DEV/CLOUD1:
                            44041: Merged BRANCHES/DEV/CLOUD1_SPRINT1 to BRANCHES/DEV/FEATURES/CLOUD1-EMAIL-REFRESH:
                                 40496: Merged from BRANCHES/DEV/AMILLER/CLOUD1_SPRINT_1 to BRANCHED/DEV/CLOUD1_SPRINT1
                                      CLOUD-189: Created e-mail template macros and css lib files
                                      CLOUD-189: E-mail template image assets
                                      CLOUD-189: Updated macros and CSS lib plus finished site invitation template
                                      CLOUD-189: Reset password e-mails
                                      CLOUD-189: More e-mail templates
                                      CLOUD-189: Workflow template
                                      CLOUD-144: Refactor AbstractUserNotifier to allow custom models to be passed to template.
                                      CLOUD-144: Custom activity feed model builder, for cloud.
                                      CLOUD-144: Activities e-mail template
                                 40958: CLOUD-580: Added alt text for images
                                 40960: CLOUD-585: Added missing quotes to invitation e-mail
                                 40967: CLOUD-144: Add joins aggregation to activites feed model and fix missed merge.
                                 40970: CLOUD-144: Added joins to activities e-mail
                                 40982: CLOUD-582: Fix subject
                                 41028: CLOUD-582: Fix unit test assertion on email subject
                                 41231: CLOUD-612: Add generation time to model.
                                 41276: CLOUD-612: Added date to activity e-mail template
                                 41279: CLOUD-614: Added missing footer text to activities e-mail
                                 41502: CLOUD-611: Remove corner images
                                 41728: CLOUD-681: Add others category to activities e-mail
                                 42138: CLOUD-613: Remove exclusions from site activities, sort grouping by site name and improve logic for determining network.
                                 42196: CLOUD-613: Group activities by site
                                 42914: Translated e-mail templates
                            44174: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1-EMAIL-REFRESH:
                                 43983: GERMAN: Translation updates based on EN r43703
                                 43984: SPANISH: Translation updates based on EN r43703
                                 43985: FRENCH: Translation updates based on EN r43703, includes file missing from previous commit.
                                 43986: ITALIAN: Translation updates based on EN r43703.
                                 43987: JAPANESE: Translation updates based on EN r43703.
                                 43990: BDE-108: add workaround of http://jira.codehaus.org/browse/MNG-4979 in Maven Surefire configuration to be able to use JaCoCo easily
                                 44024: JAPANESE: Translation updates based on EN r43703. Corrects files missing from previous commit.
                                 44031: JAPANESE: Translation updates based on EN r43703. Corrects file missed from previous commit.
                                 44032: GERMAN: Translation updates based on EN r43703. Corrects missing line break.
                                 44059: Merged BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2 to BRANCHES/DEV/CLOUD1:
                                      43797: Merged BRANCHES/DEV/FEATURES/CLOUD1_SOLR to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                           42526: Merged BRANCHES/DEV/V4.0-BUG-FIX, BRANCHES/V4.1, BRANCHES/DEV/4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_SOLR for CLOUD-798
                                                 V4.0-BUG_FIX
                                                     36393: Final part of ALF-13723 SOLR does not include the same query unit tests as lucene
                                                     36434: Test fix for ALF-13723 SOLR does not include the same query unit tests as lucene
                                                     36608: First part of ALF-14209 SOLR - does not support query for all stores
                                                     36676: Fix for ALF-14216 Solr Exception when you try to sort folders or files by size.
                                                     36954: ALF-14209 SOLR - does not support query for all stores
                                                     37075: Fix for ALF-14267 SOLR index check - First transaction time used instead of first ACL time - indexCheck, checkInitialState
                                                     37135: Fix for ALF-13993 It fails to find documents whose tag is longer than 255 characters
                                                     37253: Fix for ALF-13634 Re-created category won't show up again on a node in Document Library.
                                                     37384: Fix for ALF-14219 SolrQueryHTTPClient unable to handle long queries (4096 bytes)
                                                     37628: Build Fix
                                                     37749: Fix for ALF-14582 SOLR tracking allows incompatible model changed to the current index to be made
                                                     37863: Fix for ALF-14631 Extraneous Backslash in Solr Configuration File
                                                     37896: Fix for ALF-14582 SOLR tracking allows incompatible model changed to the current index to be made
                                                     38008: Fix for ALF-14042 Customisable Alfresco contextPath in Alfresco AbstractHttpClient (used e.g. by Solr CoreTracker)
                                                     38010: Fix for ALF-14686 https://localhost:8443/solr/admin/cores?action=CHECK - checks the index - it should check the cache
                                                 V4.1
                                                     38179: Fix for ALF-14620 SOLR searches run by system user in archive store return fewer results than for admin user
                                                 V4.1-BUG-FIX
                                                     40401: Part for for ALF-15406 Index Tracker seems not to gracefully stop upon shutdown keeping all other threads in waiting
                                                     41201: Fix for ALF-15767 Group query using cm:authorityName
                                                     41202: Additional unit tests related to ALF-15731  TYPE:"..." queries no longer work for Lucene on 4.X
                                                     41203: Part 1 for ALF-15811 SOLR query increases DocBitSet inefficiently
                                                     41210: Part 2:  ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                                     41303: Fix for ALF-15799 Under high concurrency load balanced Solr throws an Antlr related NPE
                                                     41322: Fix for ALF-15858 SOLR ACL tracking can stall or miss acls during tracking
                                                     41323: Chemistry client java to create test data for ALF-15858, ALF-15782, CLOUD-596, ALF-15753 etc
                                                     41487: Fix for ALF-15910 SOLR - Add index warming and filter pointless entries from the filter cache
                                                            Fix for ALF-15851 Too many live instances of SolrIndexSearcher at one time resulting in OOM - Alfresco 4.1.1 - build 151
                                                     41730: Fix for ALF-15995 NodeRef is missing in log on "Problem converting to Freemarker" error
                                                     41747: Fix for ALF-15811 SOLR query increases DocBitSet inefficiently
                                                            Part of ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                                     41748: Fix for ALF-15950 Solr: throws NPE: org.alfresco.solr.SolrLuceneAnalyser.loadAnalyzer
                                                     41752: Fix for ALF-13634 Re-created category won't show up again on a node in Document Library.
                                                     41940: Fix for ALF-16086 SOLR tracking does not include transformation status etc (error in header name)
                                                     42136: Last SOLR side update for ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                                     42143: In-memory bridge table for ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                                     42183: Build fix - unit test runs in 64M - for all the washing machines out there ....
                                           42547: Fix the model used for embedded tests.
                                           42659: Add missing test model
                                           42663: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_SOLR
                                                 42612: Further fix for ALF-16164 Cloud monitoring of SOLR is CPU intensive due to its repeated use of the SOLR stats page 
                                                 42657: Fix for     ALF-16359 Fix SOLR logging in production and other environments 
                                           42660: (RECORD ONLY) Merged DEV/CLOUD1 to DEV/FEATURES/CLOUD_SOLR
                                                 working copy sync r42514 through r42659
                                      43799: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                           42377: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                                42363: ALF-16213: renaming versioned file results in file being deleted.
                                           42411: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                                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
                                           42428: ALF-16217: Remove unnecessary restriction on content type
                                           42432: CLOUD-795: Optimise activities feed: rollup multiple (WebDAV) document adds/deletes into a single activity
                                      43802: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                           42559: Merged BRANCHES/DEV/CLOUD1_SPRINT1/ to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                                42548: CLOUD-712: Ensure that all CSS files are loaded in IE (latest Spring Surf libs r1170)
                                           42565: CLOUD-837: TenantContentUsageImpl does not handle failed lock
                                      43811: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                           42570: CLOUD-810: ""emailFeedDisabled" in person JSON needs to be called "emailNotificationsEnabled""
                                      43813: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                           42572: CLOUD-794: "Activities should be posted for CMIS (to enable both Public API + Mobile clients)"
                                           42576: CLOUD-842: Activities Feed: post lookup - job lock + max items per cycle
                                           42579: CLOUD-846: Minor optimisation for Site lookup (for a nodeRef)
                                      43814: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                           42609: CLOUD-712: Updated Surf libs (r1171) to change the number of @import statements supported by each <style> element in IE from 32 to 31
                                      43815: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                           42694: Fix build (merge issues) + fixes for CLOUD-839: "Activities Are Not Posted For Ratings", CLOUD-860: "Content Created With CMIS Cannot be Rated" and CLOUD-397: "The JSON response of the networks request is incorrect"
                                      43816: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                           42737: CLOUD-463: Now checks if the current user has read permission for the shared node, before displaying "Document Details" button.
                                           42847: CLOUD-794: "Activities should be posted for CMIS (to enable both Public API + Mobile clients)"
                                           42868: Fix failing build tests + further/revised public api tests
                                           42875: CLOUD-869: "Remove cmiscustom types from the CMIS dictionary"   
                                           42884: ALF-1059 / CLOUD-469: Post activities for folder(s) add + delete
                                           42899: Fix build
                                      43817: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                           42950: CLOUD-726: Ensure that i18n messages fall back to properties defined by less specific locale files (updated Surf libs: 1174)
                                      43818: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                           43138: Fixed CLOUD-491 "'New Folder' form is not displayed on IE7, IE8"
                                           43234: CLOUD-313: Implment Transport pooling in email sender.
                                           43349: Fix CLOUD-918: Failed to delete folder via Folder Details page
                                           43351: Fix CLOUD-905 - activity for Share folder delete are not displayed (OK via WebDAV)
                                           43440: CLOUD-928: Cope with missing shredId attributes, due to the copying of QuickShare properties, prior to CLOUD-593 
                                           43451: Merged HEAD to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                                43449: ALF-16669: removing a site member may break the activity feed (CLOUD-931)   
                                      43819: Fix merge error
                                      43820: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                           43465: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)"
                                      43821: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                           43477: Merged HEAD to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                                39205: Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD 
                                                   39084: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.1-BUG-FIX 
                                                   39081: Fix for ALF-6139 and ALF-13959 - Incomplete site creation issues - latest Surf libs and related changes to allow atomic creation of multiple Surf objects in a single REST call. Originally authored by Dave Ward for 3.2 - now migrated to SpringSurf. Implemented ADMRemoteStore changes for above change to apply to 4.0.
                                           43488: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)"
                                      43822: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                           43537: ALF-16706: CLONE - POI becoming irresponsive and causing jvm to freeze with XLS that includes fraction formats 
                                                43520: ALF-16694 POI becoming irresponsive and causing jvm to freeze for a while with certain XLS (fraction formats)
                                                   - Patched POI to:
                                                     - limit the length of fractions to four digits (more than that takes too long to process) e.g. "# #/#####" is too long and will be reduced to "# #/####" which still takes about a second!
                                                     - handle the -ve fraction format part (i.e. n in p;n;z), so its length is not interpret as part of the fraction format of the +ve fraction part.
                                                     - handle custom formats a bit better (strip them) rather than interpret the text length as part of the fraction format
                                                     - handle -ve fractions (just did not work)
                                                     - limitations:
                                                       - custom text gets stripped (still better than before)
                                                       - formats that have p (+ve) and n (-ve) parts must include a fraction format in each part. Otherwise +ve and -ve values are not formatted as a fraction (still better than before)
                                           43564: CLOUD-939: <Record Only>
                                                43558: ALF-16694 POI becoming irresponsive and causing jvm to freeze with XLS that includes fraction formats
                                                   - Original jar did not get removed in previous commit
                                                   << NO NEED TO MERGE TO CLOUD1-BUG-FIX as there was a tree conflict and the original jar was removed. >>
                                      43823: Fix merge error
                                      43824: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                           43579: Public api test, fix intermittent test failures (hopefully)
                                           43721: CLOUD-935: Update thor override of remoteadm.post.desc.xml
                                           43726: PUBLICAPI-11: "Extract metadata needs to be called after uploading new content via CMIS"
                                      43828: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                           43728: Merged BRANCHES/DEV/AMILLER/CLOUD1 to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                                38211: CLOUD-115 - Remove Network Admins on downgrade to free/public
                                      43829: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                           43731: Resolve CLOUD-965: A known config which has been tested can be modified when deploying to production
                                           43733: PUBLICAPI-11: "Extract metadata needs to be called after uploading new content via CMIS"
                                           43762: Fix the build
                                      43830: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                           43788: CLOUD-942: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                                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
                                                40112: ALF-9254: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1)
                                                     40111: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration
                                                        - Patched jooconverter to handle non western characters in text files, by using the same properties that JOD uses.
                                                     40073: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration
                                                        - Refactored JodContentTransformer and OpenOfficeContentTransformerWorker. Moved common code into OOoContentTransformerHelper,
                                                          including fixes that existed on only one or the other.
                                                        - For text files, change file encoding from SHIT JIS (and others) to UFT-8, as OpenOffice/LibreOffice do not support this as
                                                          an input. They do support it in other file types but not text. JOD now works, but OOo still has problems.
                                           43789: CLOUD-942: Add mergeinfo, missed by initial commit from Cornerstone. 
                                      43831: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                           43488: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)"
                                      43832: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                           43762: Fix the build
                                      43833: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                           42692: (RECORD ONLY) Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                                40859: public api:
                                                40862: CLOUD-555: "Updating comment fails because node not found"
                                                40961: CLOUD-566: "Site object shouldn't contain the "sitePreset" property"
                                                40979: Added tests for non-numeric params and non-european characters
                                                41030: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/THOR1_REST_API2:
                                                     41027: ALF-15193: "Folder Is Not a Folder CmisInvalidArgumentException thrown when using cmis:objectId"
                                                41097: Added quickshare and cloudsync to cmis filter list
                                                41098: Renamed serializer/deserializer lists for RestJsonModule
                                                41099: Cleaned up consistent Rest responses - CLOUD-574
                                                41100: Meta info webscript is disabled because its not been reviewed / in the correct format
                                                41104: Meta info webscript is really disabled because its not been reviewed / in the correct format
                                                41105: Added key for trusted layer7 relationship
                                                41137: Public api:
                                                41146: Fix trusted authentication against OpenCMIS
                                                41168: Public apI;
                                                41169: CLOUD-565: "API / URL returns a "tenant required" error"
                                                41170: public api:
                                                41171: public api:
                                                41172: public api:
                                                41183: CLOUD-598: "API: "GET network" response has unnecessary JSON nesting"
                                                41186: Fix solrcore properties
                                                41191: Fix for OpenCMIS trusted authentication to allow local opencmis access as before
                                                41282: CLOUD-616: "CMIS API: Repository names should be more descriptive"
                                                41283: CLOUD-601: "API /networkId/public/cmis/versions/ returns a 400"
                                                41325: Public api:
                                                41367: CLOUD-636: "REST API: Nodes: Tags: Not allowed DELETE method proceeds with status 204"
                                                41369: Public api:
                                                41422: Sample OAuth call for the Resource Owner Password flow
                                                41427: Sample OAuth call for the Client Credentials flow
                                                41433: Public api: (1) parameterize site members/people sorting in service api
                                                41434: Public api: minor comment service fix
                                                41438: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                                41439: Public api: fix for default tenant id in CMIS requests
                                                41449: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                                41456: CLOUD-644: "Performing a Checkout in OpenCMIS Results in an Exception in the Share Doc Library"
                                                41457: Fix build
                                                41461: Public api: more tests
                                                41521: CLOUD-660: "GET favourite sites results in exception when skipCount is greater than number of items"
                                                41606: Fix for CLOUD-668 - POSTing to a relationship by id now returns an InvalidArgumentException
                                                41607: CLOUD-668 : changed ordering so errors fire in correct order.
                                                41628: Public api: more tests
                                                41672: CLOUD-672: "404 Error when browsing child files/folder "
                                                41673: Public api: more tests
                                                41675: CLOUD-674: "Root network calls need to return application/json content type"
                                                41790: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                                41791: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                                41793: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                                41823: Public api: more tests
                                                41825: Fix for CLOUD-684 - wraps the list, not sure if I like the paging
                                                41853: CLOUD-700: "The mobile SDK needs a way to map an accessToken to a user identifier"
                                                41867: CLOUD-711: "It should be possible to remove a favourite site"
                                                41957: Public api: - error handling improvements - more tests
                                                41970: Public api: - fix build  (add missing files)
                                                41972: Public api: - more tests (including OpenCMIS TCK)
                                                42046: Added some debug timings.  Enabled using log4j.logger.org.alfresco.rest.framework.webscripts=debug
                                                42058: Public api: changed logging package name
                                                42124: Public api: - more tests - minor fixes
                                                42125: CLOUD-734: "CMIS: Query Issues Discovered During Testing"
                                                42126: Public api: fix up OpenCMIS tests
                                                42171: Consistency fix for CLOUD-695.
                                                42180: Fix build
                                                42181: CLOUD-695 "Requests to un-implemented urls do not consistently return http status 405 (Method not allowed)": fix up public api tests
                                                42214: Public api tests (cmis)
                                                42251: Changed the serializer for embedded entities, (related to CLOUD-746)
                                                42253: Fix build
                                           42735: (RECORD ONLY) Fix build (fix merge error)
                                      43834: Merged BRANCHES/DEV/FEATURES/CLOUD1_GOOGLEDOCS to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                           43702: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder
                                           43703: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder
                                           43744: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder
                                      43846: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                           43840: [CLOUD-955] Add request header config to remove Origin Header in share proxy calls.
                                      43855: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                           41731: Fix for ALF-16002 - Dashlet - My Documents - I've recently modified - executes unlimited query. In SOLR unlimited (all sites query) is really unlimited, for Lucene it is not. Improved jscript Search debugging to correctly output limit value on query.
                                      43881: Revert CLOUD-942: Reverse merge r43830 
                                      43885: CLOUD-942: Reapply changes backed out in r43881 and Comment out faling unit tests.
                                      43921: Resolve CLOUD-990: REGRESS: No items error is displayed on DocumentLibrary Page (for some files)
                                      43924: Disable intermittent OpenCMIS tests
                                      43925: Disable intermittent test
                                      43952: CLOUD-993: Insure login button is shown when user isn't logged in.
                                      43992: Resolve CLOUD-1001: REGRESS: New Application Theme and Logo are not applied after re-login
                            44185: Merged BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE to BRANCHES/DEV/FEATURES/CLOUD1-EMAIL-REFRESH:
                                 43021: CLOUD-803, CLOUD-487: Send localised e-mails
                                 43024: CLOUD-486 - Choose UI language.
                                 43085: CLOUD-803, CLOUD-487: Revert changes to pre-existing process(String, Object, Writer) method.
                                 43086: CLOUD-803, CLOUD-487: Fix broken unit tests
                                 43106: CLOUD-486 - Choose UI language.
                                 43159: CLOUD-486 - Choose UI language.
                                 43160: CLOUD-803, CLOUD-487: Fix broken unit tests
                                 43182: CLOUD-803, CLOUD-487: Fix broken unit tests.
                                 43230: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE:
                                      42950: CLOUD-726: Ensure that i18n messages fall back to properties defined by less specific locale files (updated Surf libs: 1174)
                                 43246: Bug fix for CLOUD-899.  Added if to catch null values.
                                 43267: CLOUD-486 - Choose UI language.
                                 43329: CLOUD-911 - Localization change is not working in the preference page from CLOUD-486 - Fixed by setting cookie path to /
                                 43626: CLOUD-909 - Keep Email address when language changes
                                 43631: CLOUD-909 - Keep Email address when language changes - Updated Spring Surf version
                                 43704: Enables all currently cloud supported languages in Cloud specific config file
                                 43723: CLOUD-486 - Fix right border of select options and add extra languages
                                 43880: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE:
                                      43879: FRENCH: Translation updates based on EN r43703
                                 43965: CLOUD-486 - Add French, German, Spanish, Italian and Japanese for new fields and pages.
                                 43988: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE:
                                      43983: GERMAN: Translation updates based on EN r43703
                                      43984: SPANISH: Translation updates based on EN r43703
                                      43985: FRENCH: Translation updates based on EN r43703, includes file missing from previous commit.
                                      43986: ITALIAN: Translation updates based on EN r43703.
                                      43987: JAPANESE: Translation updates based on EN r43703.
                                 44021: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE:
                                      42871: GERMAN: Cloud Translation, based on r 42416
                                      42879: SPANISH: Cloud Translation, based on r 42416
                                      42890: ITALIAN: Cloud Translation, based on r 42416
                                 44026: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE:
                                      44024: JAPANESE: Translation updates based on EN r43703. Corrects files missing from previous commit.
                                 44033: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE:
                                      44031: JAPANESE: Translation updates based on EN r43703. Corrects file missed from previous commit.
                                      44032: GERMAN: Translation updates based on EN r43703. Corrects missing line break.
                                 44077: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE:
                                      43721: CLOUD-935: Update thor override of remoteadm.post.desc.xml
                                 44093: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE:
                                      42867: CLOUD-71: add explicit schema number for workflow timers redeploy patch
                                      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
                                      43120: 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
                                      43243: BDE-73: Fork for each test, otherwise some fail because of previous test leftovers
                                      43323: Merged BRANCHES/DEV/FEATURES/CLOUD1_GRANULARPERMISSIONS1 to BRANCHES/DEV/CLOUD1:
                                           42257: CLOUD-649: Updates UI action for Granular Permissions
                                           42295: CLOUD-33: Updates labels
                                           42303: CLOUD-651: Limit user search to site members only.
                                           42352: CLOUD-780: Adds a rolesWhitelist to only display those roles that are allowed. Currently set to: ["Consumer", "Contributor", "Collaborator"]. This is only used in the site view. The Repository view behaviour has not changed.
                                           42427: Removes multi-select manage-permissions dialogue.
                                           42520: CLOUD-802: Change the way the user is returned to the previous page to work around suspected Chrome bug.
                                           42604: CLOUD-840: Automatically add SiteManger permisions when inheritAll is switched off. Pervent remaoval of siteManager authority.
                                           42606: Fixed CLOUD-840 "Granular Permissions: Site Manager should retain access when inherit permissions is turned off"
                                           42807: CLOUD-863: Reordered code to avoid AccessDeniedException
                                           43259: CLOUD-901: Revert showComments check so it handles undefined permission
                                           43266: CLOUD-900: Old Manage permissions form is opened via Permissions panel
                                           43307: CLOUD-900: Follow-up fix
                                      43353: Fix for remote transform server with new cloud environment
                                      43457: Merged BRANCHES/DEV/FEATURES/CLOUD1_GOOGLEDOCS to BRANCHES/DEV/CLOUD1:
                                           39869: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_GOOGLEDOCS:
                                                Merged /integrations/GoogleDocs/BRANCHES/THOR1_SPRINTS_GOOGLEDOCS to BRANCHES/V4.1   
                                                  36307 Fixed THOR-1402 "Need a callback option for Create Content menu"
                                                     - Will be revisited to add better comments
                                                  36350 Fixed THOR-1402 "Need a callback option for Create Content menu" part 2
                                                     - Changed callback obj to match action object better: { nodeRef, node, jsNode }
                                                     - Better code documentation
                                                     - Removed dev/test code
                                                     - Improved error config handling
                                                  36358 THOR-1402 "Need a callback option for Create Content menu" part 3
                                                     - Changed "link" parameter to "href" (instead of "page") to match actions.
                                                  39256 Consistency fix of doclib & repo toolbar templates after work on THOR-1402
                                                  39260 Bugfix for "destination" parameter not being resolved correctly THOR-1402
                                           39875: Configurtion changes to enable Google Docs V2 within the web tier.
                                           39881: It's extension ... not extention
                                           39938: Update CLOUD1_GOOGLEDOCS ant build to include installing googledocs amp files
                                           39944: CLOUD-437: Ensure that custom doclib action resources are requested after documentlist.js
                                           40468: Alfresco GoogleDocs AMPS.  Fixes for [GOOGLEDOCS-73], [GOOGLEDOCS-70], [GOOGLEDOCS-75], [GOOGLEDOCS-76]
                                           40624: Update Google Docs AMPs
                                           40635: Merge Google Docs Cloud AMPS to Feature Branchs
                                           40824: Update Google Docs AMPS, fixing [GOOGLEDOCS-79]
                                           40897: Google Docs AMP update 
                                           41165: Merge Updated AMPs for [GOOGLEDOCS-83]
                                           41179: Update AMPs for [GOOGLEDOCS-87]
                                           41262: Update AMPs for GOOGLEDOCS-89
                                           41493: Update AMPs for [GOOGLEDOCS-93]
                                           41635: AMP update for [GOOLGEDOCS-98] [GOOGLEDOCS-99] [GOOGLEDOCS-100]
                                           41805: Update AMPs for [GOOGLEDOCS-101]
                                           41840: Add AMPs with i18n strings
                                           43316: (RECORD ONLY) Rebase CLOUD1_GOOGLEDOCS with CLOUD1
                                           43317: (RECORD ONLY) Re-merge build.properties and projects.xml to include googledocs amps in build
                                           43320: Add googledocs repo declaration
                                      43538: Fix pesky solrcore.properties ... remove hardcoded amiller ;-)
                                      43605: Merged BRANCHES/DEV/FEATURES/CLOUD1_TRIAL_NETWORK to BRANCHES/DEV/CLOUD1:
                                           43033: Merged BRANCHES/DEV/AMILLER/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_TRIAL_NETWORK:
                                                39313: CLOUD-194: Add new trial network account type.
                                                39332: CLOUD-194: Add translation for new network account type.
                                           43218: CLOUD-194: Change Trail Network subscription level to Enterprise
                                      43658: Merged HEAD to BRANCHES/DEV/CLOUD1:
                                           43655: BDE-73: exclude more failing tests which are never run
                                           43653: BDE-73: tune surefire config to make it pass with Sonar 3.3
                                      43752: Merged HEAD to CLOUD1
                                           BDE-73: Repair coverage report, broken since Sonar upgrade   
                                      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.
                                      43990: BDE-108: add workaround of http://jira.codehaus.org/browse/MNG-4979 in Maven Surefire configuration to be able to use JaCoCo easily
                                      44059: Merged BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2 to BRANCHES/DEV/CLOUD1:
                                           43797: Merged BRANCHES/DEV/FEATURES/CLOUD1_SOLR to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                                42526: Merged BRANCHES/DEV/V4.0-BUG-FIX, BRANCHES/V4.1, BRANCHES/DEV/4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_SOLR for CLOUD-798
                                                      V4.0-BUG_FIX
                                                          36393: Final part of ALF-13723 SOLR does not include the same query unit tests as lucene
                                                          36434: Test fix for ALF-13723 SOLR does not include the same query unit tests as lucene
                                                          36608: First part of ALF-14209 SOLR - does not support query for all stores
                                                          36676: Fix for ALF-14216 Solr Exception when you try to sort folders or files by size.
                                                          36954: ALF-14209 SOLR - does not support query for all stores
                                                          37075: Fix for ALF-14267 SOLR index check - First transaction time used instead of first ACL time - indexCheck, checkInitialState
                                                          37135: Fix for ALF-13993 It fails to find documents whose tag is longer than 255 characters
                                                          37253: Fix for ALF-13634 Re-created category won't show up again on a node in Document Library.
                                                          37384: Fix for ALF-14219 SolrQueryHTTPClient unable to handle long queries (4096 bytes)
                                                          37628: Build Fix
                                                          37749: Fix for ALF-14582 SOLR tracking allows incompatible model changed to the current index to be made
                                                          37863: Fix for ALF-14631 Extraneous Backslash in Solr Configuration File
                                                          37896: Fix for ALF-14582 SOLR tracking allows incompatible model changed to the current index to be made
                                                          38008: Fix for ALF-14042 Customisable Alfresco contextPath in Alfresco AbstractHttpClient (used e.g. by Solr CoreTracker)
                                                          38010: Fix for ALF-14686 https://localhost:8443/solr/admin/cores?action=CHECK - checks the index - it should check the cache
                                                      V4.1
                                                          38179: Fix for ALF-14620 SOLR searches run by system user in archive store return fewer results than for admin user
                                                      V4.1-BUG-FIX
                                                          40401: Part for for ALF-15406 Index Tracker seems not to gracefully stop upon shutdown keeping all other threads in waiting
                                                          41201: Fix for ALF-15767 Group query using cm:authorityName
                                                          41202: Additional unit tests related to ALF-15731  TYPE:"..." queries no longer work for Lucene on 4.X
                                                          41203: Part 1 for ALF-15811 SOLR query increases DocBitSet inefficiently
                                                          41210: Part 2:  ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                                          41303: Fix for ALF-15799 Under high concurrency load balanced Solr throws an Antlr related NPE
                                                          41322: Fix for ALF-15858 SOLR ACL tracking can stall or miss acls during tracking
                                                          41323: Chemistry client java to create test data for ALF-15858, ALF-15782, CLOUD-596, ALF-15753 etc
                                                          41487: Fix for ALF-15910 SOLR - Add index warming and filter pointless entries from the filter cache
                                                                 Fix for ALF-15851 Too many live instances of SolrIndexSearcher at one time resulting in OOM - Alfresco 4.1.1 - build 151
                                                          41730: Fix for ALF-15995 NodeRef is missing in log on "Problem converting to Freemarker" error
                                                          41747: Fix for ALF-15811 SOLR query increases DocBitSet inefficiently
                                                                 Part of ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                                          41748: Fix for ALF-15950 Solr: throws NPE: org.alfresco.solr.SolrLuceneAnalyser.loadAnalyzer
                                                          41752: Fix for ALF-13634 Re-created category won't show up again on a node in Document Library.
                                                          41940: Fix for ALF-16086 SOLR tracking does not include transformation status etc (error in header name)
                                                          42136: Last SOLR side update for ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                                          42143: In-memory bridge table for ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                                          42183: Build fix - unit test runs in 64M - for all the washing machines out there ....
                                                42547: Fix the model used for embedded tests.
                                                42659: Add missing test model
                                                42663: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_SOLR
                                                      42612: Further fix for ALF-16164 Cloud monitoring of SOLR is CPU intensive due to its repeated use of the SOLR stats page 
                                                      42657: Fix for     ALF-16359 Fix SOLR logging in production and other environments 
                                                42660: (RECORD ONLY) Merged DEV/CLOUD1 to DEV/FEATURES/CLOUD_SOLR
                                                      working copy sync r42514 through r42659
                                           43799: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                                42377: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                                     42363: ALF-16213: renaming versioned file results in file being deleted.
                                                42411: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                                     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
                                                42428: ALF-16217: Remove unnecessary restriction on content type
                                                42432: CLOUD-795: Optimise activities feed: rollup multiple (WebDAV) document adds/deletes into a single activity
                                           43802: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                                42559: Merged BRANCHES/DEV/CLOUD1_SPRINT1/ to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                                     42548: CLOUD-712: Ensure that all CSS files are loaded in IE (latest Spring Surf libs r1170)
                                                42565: CLOUD-837: TenantContentUsageImpl does not handle failed lock
                                           43811: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                                42570: CLOUD-810: ""emailFeedDisabled" in person JSON needs to be called "emailNotificationsEnabled""
                                           43813: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                                42572: CLOUD-794: "Activities should be posted for CMIS (to enable both Public API + Mobile clients)"
                                                42576: CLOUD-842: Activities Feed: post lookup - job lock + max items per cycle
                                                42579: CLOUD-846: Minor optimisation for Site lookup (for a nodeRef)
                                           43814: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                                42609: CLOUD-712: Updated Surf libs (r1171) to change the number of @import statements supported by each <style> element in IE from 32 to 31
                                           43815: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                                42694: Fix build (merge issues) + fixes for CLOUD-839: "Activities Are Not Posted For Ratings", CLOUD-860: "Content Created With CMIS Cannot be Rated" and CLOUD-397: "The JSON response of the networks request is incorrect"
                                           43816: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                                42737: CLOUD-463: Now checks if the current user has read permission for the shared node, before displaying "Document Details" button.
                                                42847: CLOUD-794: "Activities should be posted for CMIS (to enable both Public API + Mobile clients)"
                                                42868: Fix failing build tests + further/revised public api tests
                                                42875: CLOUD-869: "Remove cmiscustom types from the CMIS dictionary"   
                                                42884: ALF-1059 / CLOUD-469: Post activities for folder(s) add + delete
                                                42899: Fix build
                                           43817: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                                42950: CLOUD-726: Ensure that i18n messages fall back to properties defined by less specific locale files (updated Surf libs: 1174)
                                           43818: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                                43138: Fixed CLOUD-491 "'New Folder' form is not displayed on IE7, IE8"
                                                43234: CLOUD-313: Implment Transport pooling in email sender.
                                                43349: Fix CLOUD-918: Failed to delete folder via Folder Details page
                                                43351: Fix CLOUD-905 - activity for Share folder delete are not displayed (OK via WebDAV)
                                                43440: CLOUD-928: Cope with missing shredId attributes, due to the copying of QuickShare properties, prior to CLOUD-593 
                                                43451: Merged HEAD to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                                     43449: ALF-16669: removing a site member may break the activity feed (CLOUD-931)   
                                           43819: Fix merge error
                                           43820: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                                43465: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)"
                                           43821: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                                43477: Merged HEAD to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                                     39205: Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD 
                                                        39084: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.1-BUG-FIX 
                                                        39081: Fix for ALF-6139 and ALF-13959 - Incomplete site creation issues - latest Surf libs and related changes to allow atomic creation of multiple Surf objects in a single REST call. Originally authored by Dave Ward for 3.2 - now migrated to SpringSurf. Implemented ADMRemoteStore changes for above change to apply to 4.0.
                                                43488: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)"
                                           43822: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                                43537: ALF-16706: CLONE - POI becoming irresponsive and causing jvm to freeze with XLS that includes fraction formats 
                                                     43520: ALF-16694 POI becoming irresponsive and causing jvm to freeze for a while with certain XLS (fraction formats)
                                                        - Patched POI to:
                                                          - limit the length of fractions to four digits (more than that takes too long to process) e.g. "# #/#####" is too long and will be reduced to "# #/####" which still takes about a second!
                                                          - handle the -ve fraction format part (i.e. n in p;n;z), so its length is not interpret as part of the fraction format of the +ve fraction part.
                                                          - handle custom formats a bit better (strip them) rather than interpret the text length as part of the fraction format
                                                          - handle -ve fractions (just did not work)
                                                          - limitations:
                                                            - custom text gets stripped (still better than before)
                                                            - formats that have p (+ve) and n (-ve) parts must include a fraction format in each part. Otherwise +ve and -ve values are not formatted as a fraction (still better than before)
                                                43564: CLOUD-939: <Record Only>
                                                     43558: ALF-16694 POI becoming irresponsive and causing jvm to freeze with XLS that includes fraction formats
                                                        - Original jar did not get removed in previous commit
                                                        << NO NEED TO MERGE TO CLOUD1-BUG-FIX as there was a tree conflict and the original jar was removed. >>
                                           43823: Fix merge error
                                           43824: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                                43579: Public api test, fix intermittent test failures (hopefully)
                                                43721: CLOUD-935: Update thor override of remoteadm.post.desc.xml
                                                43726: PUBLICAPI-11: "Extract metadata needs to be called after uploading new content via CMIS"
                                           43828: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                                43728: Merged BRANCHES/DEV/AMILLER/CLOUD1 to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                                     38211: CLOUD-115 - Remove Network Admins on downgrade to free/public
                                           43829: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                                43731: Resolve CLOUD-965: A known config which has been tested can be modified when deploying to production
                                                43733: PUBLICAPI-11: "Extract metadata needs to be called after uploading new content via CMIS"
                                                43762: Fix the build
                                           43830: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                                43788: CLOUD-942: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                                     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
                                                     40112: ALF-9254: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1)
                                                          40111: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration
                                                             - Patched jooconverter to handle non western characters in text files, by using the same properties that JOD uses.
                                                          40073: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration
                                                             - Refactored JodContentTransformer and OpenOfficeContentTransformerWorker. Moved common code into OOoContentTransformerHelper,
                                                               including fixes that existed on only one or the other.
                                                             - For text files, change file encoding from SHIT JIS (and others) to UFT-8, as OpenOffice/LibreOffice do not support this as
                                                               an input. They do support it in other file types but not text. JOD now works, but OOo still has problems.
                                                43789: CLOUD-942: Add mergeinfo, missed by initial commit from Cornerstone. 
                                           43831: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                                43488: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)"
                                           43832: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                                43762: Fix the build
                                           43833: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                                42692: (RECORD ONLY) Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                                     40859: public api:
                                                     40862: CLOUD-555: "Updating comment fails because node not found"
                                                     40961: CLOUD-566: "Site object shouldn't contain the "sitePreset" property"
                                                     40979: Added tests for non-numeric params and non-european characters
                                                     41030: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/THOR1_REST_API2:
                                                          41027: ALF-15193: "Folder Is Not a Folder CmisInvalidArgumentException thrown when using cmis:objectId"
                                                     41097: Added quickshare and cloudsync to cmis filter list
                                                     41098: Renamed serializer/deserializer lists for RestJsonModule
                                                     41099: Cleaned up consistent Rest responses - CLOUD-574
                                                     41100: Meta info webscript is disabled because its not been reviewed / in the correct format
                                                     41104: Meta info webscript is really disabled because its not been reviewed / in the correct format
                                                     41105: Added key for trusted layer7 relationship
                                                     41137: Public api:
                                                     41146: Fix trusted authentication against OpenCMIS
                                                     41168: Public apI;
                                                     41169: CLOUD-565: "API / URL returns a "tenant required" error"
                                                     41170: public api:
                                                     41171: public api:
                                                     41172: public api:
                                                     41183: CLOUD-598: "API: "GET network" response has unnecessary JSON nesting"
                                                     41186: Fix solrcore properties
                                                     41191: Fix for OpenCMIS trusted authentication to allow local opencmis access as before
                                                     41282: CLOUD-616: "CMIS API: Repository names should be more descriptive"
                                                     41283: CLOUD-601: "API /networkId/public/cmis/versions/ returns a 400"
                                                     41325: Public api:
                                                     41367: CLOUD-636: "REST API: Nodes: Tags: Not allowed DELETE method proceeds with status 204"
                                                     41369: Public api:
                                                     41422: Sample OAuth call for the Resource Owner Password flow
                                                     41427: Sample OAuth call for the Client Credentials flow
                                                     41433: Public api: (1) parameterize site members/people sorting in service api
                                                     41434: Public api: minor comment service fix
                                                     41438: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                                     41439: Public api: fix for default tenant id in CMIS requests
                                                     41449: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                                     41456: CLOUD-644: "Performing a Checkout in OpenCMIS Results in an Exception in the Share Doc Library"
                                                     41457: Fix build
                                                     41461: Public api: more tests
                                                     41521: CLOUD-660: "GET favourite sites results in exception when skipCount is greater than number of items"
                                                     41606: Fix for CLOUD-668 - POSTing to a relationship by id now returns an InvalidArgumentException
                                                     41607: CLOUD-668 : changed ordering so errors fire in correct order.
                                                     41628: Public api: more tests
                                                     41672: CLOUD-672: "404 Error when browsing child files/folder "
                                                     41673: Public api: more tests
                                                     41675: CLOUD-674: "Root network calls need to return application/json content type"
                                                     41790: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                                     41791: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                                     41793: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                                     41823: Public api: more tests
                                                     41825: Fix for CLOUD-684 - wraps the list, not sure if I like the paging
                                                     41853: CLOUD-700: "The mobile SDK needs a way to map an accessToken to a user identifier"
                                                     41867: CLOUD-711: "It should be possible to remove a favourite site"
                                                     41957: Public api: - error handling improvements - more tests
                                                     41970: Public api: - fix build  (add missing files)
                                                     41972: Public api: - more tests (including OpenCMIS TCK)
                                                     42046: Added some debug timings.  Enabled using log4j.logger.org.alfresco.rest.framework.webscripts=debug
                                                     42058: Public api: changed logging package name
                                                     42124: Public api: - more tests - minor fixes
                                                     42125: CLOUD-734: "CMIS: Query Issues Discovered During Testing"
                                                     42126: Public api: fix up OpenCMIS tests
                                                     42171: Consistency fix for CLOUD-695.
                                                     42180: Fix build
                                                     42181: CLOUD-695 "Requests to un-implemented urls do not consistently return http status 405 (Method not allowed)": fix up public api tests
                                                     42214: Public api tests (cmis)
                                                     42251: Changed the serializer for embedded entities, (related to CLOUD-746)
                                                     42253: Fix build
                                                42735: (RECORD ONLY) Fix build (fix merge error)
                                           43834: Merged BRANCHES/DEV/FEATURES/CLOUD1_GOOGLEDOCS to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                                43702: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder
                                                43703: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder
                                                43744: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder
                                           43846: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                                43840: [CLOUD-955] Add request header config to remove Origin Header in share proxy calls.
                                           43855: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                                41731: Fix for ALF-16002 - Dashlet - My Documents - I've recently modified - executes unlimited query. In SOLR unlimited (all sites query) is really unlimited, for Lucene it is not. Improved jscript Search debugging to correctly output limit value on query.
                                           43881: Revert CLOUD-942: Reverse merge r43830 
                                           43885: CLOUD-942: Reapply changes backed out in r43881 and Comment out faling unit tests.
                                           43921: Resolve CLOUD-990: REGRESS: No items error is displayed on DocumentLibrary Page (for some files)
                                           43924: Disable intermittent OpenCMIS tests
                                           43925: Disable intermittent test
                                           43952: CLOUD-993: Insure login button is shown when user isn't logged in.
                                           43992: Resolve CLOUD-1001: REGRESS: New Application Theme and Logo are not applied after re-login
                            44196: CLOUD-678 - Incorrect link for 'To change your notifications settings, go here.' message
                            44201: CLOUD-486 - Choose UI language
                            44202: CLOUD-487: Fix emails after merge of template refresh and localised mail features
                               44414: JAPANESE: Cloud email template translation
                            44622: Fixes: CLOUD-1037 - removes unnecessary elements from inside the a tag.
                            44623: Cloud-189 - Corrects text and layout for already created email templates.
                            44624: Fixes: CLOUD-1044: Updates Email template
                            44625: Fixes: CLOUD-1042: Updates Email template
                            44626: Fixes: CLOUD-1043: Updates Email template
                            44627: Fixes: CLOUD-1041: Updates Email template
                            44764: CLOUD-1080: Fixes encoding error.
                            44767: CLOUD-1086: Text update to email template
                            44888: Email template updates - fixes CLOUD-1099 and CLOUD-1102.
                            44892: Fixes error with Activities email - the template fails to process if the only activities are based on follow events. It now processes and gets sent, but with some confusion, see CLOUD-1123
                            44914: Fixes CLOUD-1097 - Alt text not displaying due to unspecified image dimensions and colour. Also minor code clean up.
                            45145: CLOUD-1123 - Filter out "Following" activities from activity feed email.
                            45251: Email template text updates following review.
                            45289: Fix issue where email was not sent for 'Invite People'
                            45306: Externalises strings for cloud emails
                            45316: Adds some defensive code to prevent unused variables being a problem for templates.
                            45328: Email translation updates
                            45334: Resolve CLOUD-1162: Ability to change sign-up, reminder and reset password timer durations via properties
                            45369: Fixes Following Email template
                            45376: Resolve CLOUD-1172: Following email does not show domain correctly
                            45401: Corrects layout bug in email template
                            45407: Removes unnecessary full stop.
                            45408: Adds missing email template translations
                            45430: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1-EMAIL-REFRESH:
                                 45329: FRENCH: Cloud translation updates based on EN r45266
                                 45330: GERMAN: Cloud translation updates based on EN r45266
                                 45332: SPANISH: Cloud translation updates based on EN r45266
                                 45333: JAPANESE: Cloud translation updates based on EN r45266
                                 45427: SPANISH: Cloud 1 translation updates based on EN r45266
                            45453: Fix for CLOUD-1164 - Failed login is not handled correctly (on email refresh branch)
                            45474: Fixes: CLOUD-1189: Incorrect variable used in translated property files.
                            45484: Fixes: CLOUD-1190 incorrect quote marks in JA file
                            45487: CLOUD-1186: Fixes issue with reminder emails not being localised.
                            45501: Potential fix for: CLOUD-678
                            45503: Resolve CLOUD-1188: Emails are not rendered as HTML, even though they are HTML
                            45539: Resolve CLOUD-1195: Invite people email not rendering as HTML, even though it is HTML
                            45559: CLOUD-1197: Fixes issue with reset password template not recognising all the variables in all cases.
                            45579: Resolve CLOUD-1186: Email not localized, CLOUD-1202: Invite people / Invite site email sometimes comes in English and is not localized
                            45609: Resolve test failures introduced fixing CLOUD-1186
                            45613: Resolve CLOUD-1210: Locale is not replicated across tenants if a user has been invited to one or more secondary tenants
                            45616: Resolve CLOUD-1205: activities email template the feed are not localized
                            45642: Fixes: CLOUD-1211 and CLOUD-1212 - externalises two hard coded strings. Translations to follow.
                            45645: CLOUD-1205: activities email template the feed are not localized
                            45646: CLOUD-1203: Invite to Site and site reminder the role should be localized
                            45654: ALL LANG: Translation updates to email templates, following fixes made for CLOUD-1212, CLOUD-1211.
                            45678: Removes hidden chars at start of the file.
                            45680: Fixes more hidden chars that the start of UTF8 files.
                            45683: Fixes: CLOUD-1216: Typo in Italian properties file.
                            45693: Resolve CLOUD-1204: Task type in the workflow emails are not localized
                            45702: Minor translation updates following linguistic review.
                            45717: GERMAN: Translation updates based on linguistic review
                            45719: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1/ to BRANCHES/DEV/FEATURES/CLOUD1-EMAIL-REFRESH:
                                 45718: ITALIAN: Translation updates based on EN r45266 (missed from previous bundle import)
                            45797: Resolve CLOUD-1226: The task details are not showing in localized details in task list
                            45798: Fix single quote encoding in language property file (related to CLOUD-1230, but does not resolve it across the board).
                       45966: Translation update to fix CLOUD-1270 in FR and ES
                       46011: Fix NPE while sending emails (in non-test mode)
                  46148: Resolve CLOUD-1247: When the cookies are not set in browser and the user is trying login in share without the browser cookies getting a null pointer exception
                  46151: Merge BRANCHES/FEATURES/CLOUD1_GOOGLEDOCS to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                  46204: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                       46014: Fix for ALF-17732 - SWF files are considered insecure content and should not be displayed directly in the browser.
                  46232: Resolve CLOUD-1291: Activity Email: "Liked" category should be "Likes"        
                  46307: ALL LANG: Email translations updated based on fix for CLOUD-1291
   48351: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47556: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             46712: (RECORD ONLY) Create branch for Cloud Convergence from the latest state of CLOUD1 (Build 360, Revision 46379)
        47570: Bring POM dependencies in sync with latest upgrade in 3rd-party: opencmis to 0.8.0 and Jackson to 1.9.4
        47572: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             47571: CONV: Fix CLOUD2 compile error (TenantFileContentStore.java) (minor reformat)
        47580: CONV: Fix CLOUD2 compile error (CloudSiteServiceImpl.listMembersImpl)
        47593: CONV: Fix CLOUD2 compile error (CloudAuthenticationPassword2Dao.loadUserByUsername)
        47594: CONV: Fix CLOUD2 compile error (CloudTenantCMISStrictDictionaryService.getRegistry)
        47609: Fix OpenCMIS dependencies again
   48356: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47613: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             47610: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD2:
                  47157: Merged BRANCHES/DEV/FEATURES/CLOUD1_SAML1 to BRANCHES/DEV/CLOUD1:
                       44058: Creating DEV/FEATURES/CLOUD1_SAML1 branch from revision 44032 of CLOUD1 b316
                       44095: Cloud SAML: Repo SAML Auth API - webscript placeholders (for SSO/SLO request/response)
                       44177: Cloud SAML: Repo SAML Auth API - webscript placeholders (for SSO request/response)
                       44227: SAML - Share implementation - Note WIP!
                       44249: Cloud SAML: Repo SAML Auth API - skeleton SAMLConfigAdminService (enable/disable)
                       44273: CLOUD-1000, CLOUD-1002: added SAML SSO services to Thor.
                       44274: Added opensaml libs to the build file.
                       44284: Added opensaml dependency, to fix the failed build.
                       44298: Cloud SAML: Repo SAML SSO (Auth) API -  check whether network/tenant is SAML-enabled or not (CLOUD-1018)
                       44315: added jks keystore.
                       44323: added correct version of saml.keystore.jks
                       44350: Changed the issuer.name in the sp-config, and the alias in the key store to reflect the issuer name.
                       44351: Changed the key store type to JKS.
                       44440: Cloud SAML: Share SAML - follow-on to r44227 to fix/add missing SAML authnRequest fields (CLOUD-1039)
                       44448: Cloud SAML: Repo SAML SSO Authn Request (CLOUD-998)
                       44477: Cloud SAML: Repo SAML SSO Authn Response (CLOUD-999)
                       44524: Made SAMLAuthnResponseController to redirect Idps Response to repo. Also added idps.properties file in order to test multiple IdPs.
                       44588: Cloud SAML: Repo SAML - minor: change REST urls from ".../cloud/saml/..." to just ".../saml/..."
                       44609: CLOUD-1002: Modified SAMLResponse processing implementation to get the SAMLResponse from share via json rather than directly through HttpServletRequest that OpenSAML requires.
                       44611: Added a few modifications to improve SAMLHttpPostSimpleSignDecoder implementation.
                       44633: CLOUD-1070: SAML sprint 4: Repo REST - Get SP (Alfresco) Public Certificate
                       44634: Modified ACS post json data, to endued null for non-existent user.
                       44635: CLOUD-1040 "SAML sprint 4: Share UI (SAML-based login) - handle SAML auth response (IdP -> Repo)" checkpoint/wip
                       44645: Cloud SAML: Repo REST API - Get SP (Alfresco) metadata (specific to Network)
                       44684: Cloud SAML: CLOUD-1053 - Email links (signup/invite)
                       44703: Cloud SAML: CLOUD-1058 - Repo REST API to Get SP (Alfresco) metadata (specific to Network)
                       44717: Cloud SAML: CLOUD-1079 - additional login validation when Registering/Creating a new user for a IdP/SAML-enabled Network
                       44721: Modified SAML admin config to include the required attributes to set SSO. The most important attributes are ssoEnabled and IdP’s SSO URL. For setting the attributes, see the wiki page. Note: IdP's certificate uploading/storing hasn't been implemented yet.
                       44739: Cloud SAML: CLOUD-1079 - additional login validation when Registering/Creating a new user for a IdP/SAML-enabled Network
                       44774: Cloud SAML: CLOUD-1053 - UI/Email flows when user exists in IdP but not Alfresco => signup/invite + IdP login form + enter profile & activate
                       44793: Cloud SAML: CLOUD-1049 - override "normal" login to redirect for SAML-enabled network/tenant (if implied by username)
                       44794: Cloud SAML: CLOUD-1049 - override "normal" login to redirect for SAML-enabled network/tenant (if implied by username)
                       44799: Cloud SAML: CLOUD-1049 - override "normal" login to redirect for SAML-enabled Network/Tenant (if implied by username and not a Network/Admin)
                       44809: Cloud SAML: CLOUD-1039 - SAML login entrypoint (localhost:8081/share/{network}/saml) 
                       44810: Cloud SAML: minor - comment only
                       44833: Cloud SAML: CLOUD-1053 - UI/Email flows when user exists in IdP but not Alfresco => signup/invite + IdP login form + enter profile & activate
                       44837: Added OpenSAML dependencies into projects.xml.
                       44840: Added a valid certificate to the saml.keystore.jks, as the certificate was expired.
                       
                       44856: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_SAML1: (CLOUD-1103)
                       44857: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_SAML1: (CLOUD-1103)
                       44858: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_SAML1: (CLOUD-1103)
                       44859: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_SAML1: (CLOUD-1103)
                       44860: (RECORD ONLY) Fix pesky solrcore.properties
                       
                       44896: Cloud SAML: minor comments/descriptor updates for SAML config admin (CLOUD-1051 & CLOUD-1052)
                       44915: Fixed CLOUD-1111 "SAML: Share UI - allow /share/{network} as a SAML entry point (if network is SAML-enabled)"
                       44919: Removed unecessary url encoding of sso & slo urls in json response
                       44926: WIP commit for CLOUD-1085 "SAML: Share UI - new page/form for SAML config settings (accessible by Network Admin)"
                       44934: Cloud SAML: CLOUD-1088 - SLO (SingleLogOut) - Repo REST/Service (WIP)
                       44948: Cloud SAML: CLOUD-1088 - SLO (SingleLogOut) - Repo REST/Service (WIP)
                       45027: Fixed CLOUD-1111 "SAML: Share UI - allow /share/{network} as a SAML entry point (if network is SAML-enabled)" part 2
                            - Is now triggered for urls w a trailing slash after the network name, i.e. /share/alfresco.com/
                       45036: Cloud SAML: CLOUD-1088 - SLO (SingleLogOut) - Repo REST/Service
                       45058: CLOUD-1051, CLOUD-1052: Added functionalities to store java certificate as content in order to make OpenSAML to validate IdP's signature dynamically.
                       45067: First cut of CLOUD-1051, CLOUD-1052, check-in, included the wrong classes. Added the correct files now.
                       45087: CLOUD-1085 "SAML: Share UI - new page/form for SAML config settings (accessible by Network Admin)" - WIP
                       45143: CLOUD-1052: added functionalities to SAMLConfigAdmin to return the certificate status and expiration date. Also fixed SAMLConfigAdmin update bug.
                       45151: Fixed saml-config-admin-get template.
                       45173: Cloud SAML:  lowercase userId/emailAddress (for SAML requests/responses)
                       45206: Cloud SAML: CLOUD-1088 - SLO (SingleLogOut) - Repo REST/Service
                       45229: CLOUD-1090 "SAML: SLO (SingleLogOut) - Share UI - Logout (SP-initiated)" - WIP
                       45240: CLOUD-1051: Added functionalities to handle multipart form-data submitted by SAML Config Admin screen.
                       45262: Cloud SAML: CLOUD-1129 - SLO - use "session index" (from original SSO) in logout request
                       45269: Added edit-cancel-16.png icon
                       45270: CLOUD-1085 "SAML: Share UI - new page/form for SAML config settings (accessible by Network Admin)"
                       45276: CLOUD-1090 "SAML: SLO (SingleLogOut) - Share UI - Logout (SP-initiated)"
                       45279: Adding common download file icon
                       45280: CLOUD-1085 "SAML: Share UI - new page/form for SAML config settings (accessible by Network Admin)"
                       45281: Cloud SAML: CLOUD-1088 - Repo REST/Services for SLO - fix to invalidate user's current ticket ...
                       45284: CLOUD-1146: Upgraded commons-codec from 1.4 to 1.5
                       45285: Fix pesky solrcore.properties
                       45288: CLOUD-1146: Upgraded commons-codec from 1.4 to 1.5
                       45305: Cloud SAML: CLOUD-1088 - Repo REST/Services for SLO - check SAML logout response (status code) and throw exception
                       45311: CLOUD-1051: Added functionalities to support DER-formatted certificate upload.
                       45314: Prepared config admin screen download links to use the attached header, so they become proper download links (rather than "view in browser" links)
                       45320: Updating certificate input field label after request form Jamal to "Upload to IdP certificate"
                       45321: Fine tuning the certificate label for Jamal, hopefully he's happy with this version :-)
                       45322: CLOUD-1112 "SAML: Share UI: updated profile page - to explain to user's that they're entering an Alfresco password"
                       45327: CLOUD-1113 "SAML: Share UI - updated Change Password page"
                       45341: Cloud SAML: CLOUD-770 / CLOUD-1159 - Repo Services - new user login direct to profile page (not using email link)
                       45353: CLOUD-1085 "SAML: Share UI - new page/form for SAML config settings (accessible by Network Admin)"
                            - Added additional field for IDP initiated logout request
                            - Refactored field name for SP initiated logout request
                       45365: Cloud SAML: CLOUD-770 / CLOUD-1159 - Repo Services - new user login direct to profile page (not using email link)
                       45372: CLOUD-1109 "SAML: Share UI - New user - login + profile page (without requiring a signup/invite email link)"
                       45374: Cloud SAML: CLOUD-770 / CLOUD-1159 - Repo Services - new user login direct to profile page (not using email link)
                       45377: CLOUD-1052: Fixed enable/disable SAML SSO config page for an existing SAML setup.
                       45390: CLOUD-1051, CLOUD-1052: Added support for IdP SLO response URL. Also, renamed idpSloURL to be idpSloRequestURL.
                       45391: Cloud SAML: CLOUD-1158 - Repo-side to allow SP cert/metadata links to be downloaded rather than just viewed (in Share)
                       45403: Refactored urls before implementing idp initiated logouts to avoid name clashes
                       45429: CLOUD-1128 "SAML: SLO (SingleLogOut) - Share UI - handle SAML logout request (IdP-initated)"
                            - Note! Share SAML SP Service urls have been changed and needs to be (re)configured in the IDP:
                               * Assertion Consumer Service URL 
                                 - Endpoint URL: /share/alfresco.com/saml/authnresponse (POST)
                               * SLO Service URLs 
                                 - Endpoint URL: /share/alfresco.com/saml/logoutrequest (POST) 
                                 - Response URL: /share/alfresco.com/saml/logoutresponse (POST)
                       45433: CLOUD-1069 "SAML: draft text for Network Admin screen - field names / "i"nfo pop-up"
                       45464: Improved error test for saml settings screen.
                       45465: CLOUD-1135 "SAML: SLO (SingleLogOut) - Share UI - error/warning page if SLO fails unexpectedly" part 1 of 2
                       45490: CLOUD-1181: Fixed IdP initiated SLO, by adding RelayState.
                       45492: Message component improvements and a generic guest message page
                       45493: CLOUD-1135 "SAML: SLO (SingleLogOut) - Share UI - error/warning page if SLO fails unexpectedly" part 2 of 2
                       45524: Cloud SAML: CLOUD-1191 - initial fix for SLO error (affects PingFederate, not OpenAM) due to multiple sessionIndexes
                       45552: Making callback pattern consistent with the pattern that should be used in all other multipart webscripts
                       45639: Cloud SAML: CLOUD-1192 - Improve Repo INFO logging - eg. also show Assertion ID (as requested by customer/partner)
                       45647: CLOUD-1091: Changed SAML keystore loading functionalities, to use existing alf keystore.
                       45684: CLOUD-1213: Added support for Network-Specific SP entityID. 
                       45704: Cloud SAML: CLOUD-1209 - SLO failure after directly activating a new user (ie. login + complete profile)
                  47164: Fix SVN merge
                  47168: Fix merge/test
                  47250: Fix merge issue (remove unwanted files)
                  47444: Fixes: CLOUD-1397: Incorrectly encoded copyright messages.
                  47462: Merged BRANCHES/DEV/FEATURES/CLOUD1_SAML1 to BRANCHES/DEV/CLOUD1:
                       47461: Share fix for: CLOUD-1399: Check tenant is SAML enabled before getting IDP details
                  47467: Repo fix for: CLOUD-1399: Reduce ERROR/stacktrace to one line WARN if non-SAML enabled network tries to access repo saml web script
                  47502: Fixes CLOUD-1397: corrects copyright encoding in Share footer.
        47614: Fix merge fail - remove dupe commons-codec-1.5 from Eclipse 3rd-party .classpath
        47628: Fix 3rd-party eclipse classpath (put back commons-codec-1.5.jar)
   48359: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47647: Fix merge - build/test - SOLRTrackingComponentTest.testFilters & SOLRTrackingComponentTest testGetNodeMetaData 
   48361: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47743: Remove outdated sharepoint context file, as had been done on CLOUD1 in r44571
        47752: CONV: Fix CLOUD2 test error (MultiTAdminServiceImpl.initTenant)
        47757: CONV: Fix CLOUD2 test error (MultiTAdminServiceImpl - startTenants/initTenant)
        47830: CloudConv: Fix on CONV_V413 - follow-on fix to ALF-15687 (PreferenceServiceImpl) done for V4.1.2+ to check admin authority (should not hardwire check to default "admin")
        47831: CLOUD-1421 Upgrade wss4j from 1.5.4-patched to 1.6.9
        47844: CLOUD-1421 Upgrade wss4j from 1.5.4-patched to 1.5.12
   48362: CONV: Fix SAML cache config
   48363: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47863: CONV: CLOUD-1407 - Implement people filtering based on aspects in people CQ
        47875: CONV: CLOUD-1407 - Implement people filtering based on aspects in people CQ
        48050: CONV: CLOUD-1407 - Implement people filtering based on aspects in people CQ
   48365: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        48179: CONV: Fix test(s) - SubscriptionServiceActivitiesTest testFollowingActivity (& SiteServiceTest testGetSites)
        48205: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             47562: (RECORD ONLY) Rename POM file for convenience
             47564: (RECORD ONLY) Fix relative path to parent pom
             47573: (RECORD ONLY) CONV: Fix CLOUD2 compile error (TenantFileContentStore.java)
             47589: (RECORD ONLY) CONV: Fix CLOUD2 compile error (CloudPersonServiceImpl.getPeople)
             47603: (RECORD ONLY) CONV: Fix CLOUD2 compile error (CloudPersonServiceImpl.getPeople)
             47615: (RECORD ONLY) Add dependency to OpenSAML 2.5.3
             47630: (RECORD ONLY) Remove outdated Eclipse project files - use Maven to generate new ones if needed
             47635: (RECORD ONLY) Separate test sources from main sources
             47644: (RECORD ONLY) Remove dependency to netcdf - will get it from Alfresco Repository, and hopefully one that doesn't embed commons-codec
             47653: (RECORD ONLY) Re-enable opensaml Maven repo, which is alive again
             47663: (RECORD ONLY) Add config jars in the test classpath
             47687: (RECORD ONLY) Switch test database to MySQL
             47691: (RECORD ONLY) CONV: Fix CLOUD2 merge/test - missing class AuthorityBridgeLink
             47692: (RECORD ONLY) Move the recreation of the database to a Maven profile
             47744: (RECORD ONLY) Add a little more config dependencies
             47749: (RECORD ONLY) Add enterprise-remote-api config as well
             47759: (RECORD ONLY) Configure Tomcat Maven plugin
             47763: (RECORD ONLY) Move test_analyticsService.js to test resources, where it belongs
             47764: (RECORD ONLY) CONV: Fix CLOUD2 merge/test - NPE in RepositoryAuthenticationDao.getUserEntryOrNull
             47777: (RECORD ONLY) CONV: CLOUD2 - fix NPE (HomeSiteContentImportActionExecuter.executeImpl) seen in unit test logs
             47800: (RECORD ONLY) Package Sharepoint module in the war
             47812: (RECORD ONLY) CONV: Add missing cloud module tests to AllCloudModuleTests (for running locally in Eclipse)
             47813: (RECORD ONLY) Add application of 4 amp files: googledocs, salesforce, mediamanagement, sharepoint
             47814: (RECORD ONLY) Add pluginRepository, to be able to reference the alfresco-maven-plugin
             47820: (RECORD ONLY) Apply googoedocs + mediamanagement to thor-share + add missing htmlparser
             47849: (RECORD ONLY) Add cors-filter + alfresco-spp config files
             47916: (RECORD ONLY) Remove use of systemProperties when running tests: they override the ones defined in dev environment. Now rely on the presence of a property file passed through DB_PROPERTIES in Continuous Integration environment.
        48209: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             48204: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/CLOUD2:
                  47848: Merged BRANCHES/DEV/FEATURES/CLOUD-1374 to BRANCHES/DEV/CLOUD1:
                       47598: Merge DEV/CLOUD1 to DEV/FEATURES/CLOUD-1374
                           47122 : CLOUD-1374 
                           47127:
                           47247:
                           47344:
                           47415:
                           47449:
                           47457:
                       47637: Merge DEV/CLOUD1 to DEV/FEATURES/CLOUD-1374 
                            47131: CLOUD-1374
   48366: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: (already up-to-date - effectively a record-only)
        48164: Merged BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2 to BRANCHES/DEV/CONV_V413:
              47501: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2: 
                  45475: Fix for ALF-17510 - Upgrade of htmlparser from 1.6 to 2.1 
   48377: CONV: Fix build/test (FeedNotifierTest.testFailedNotifications)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@48403 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2013-03-20 11:11:55 +00:00
Jan Vonka
8f365b6a74 Merged BRANCHES/DEV/CONV_HEAD to HEAD: 
48194: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47179: (RECORD ONLY) Rename Spring Surf libs back to 1.2.0-SNAPSHOT (reverting commit 47176)
        47182: (RECORD ONLY) Fix misnamed Surf lib
   48195: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: (no changes - alreasdy on HEAD and superceded later)
        47210: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts
             36760: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  36758: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                       36735: THOR-1430: QuickShare link breaks after uploading a new version of a shared file
             36768: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  36766: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                       36712: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS
                            36692: Fix ALF-12966 - Comments doesn't work on iOS Safari. Anywhere TinyMCE is present does not work correctly e.g. comments, blogs, wiki, HTML content creation.
   48197: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47214: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts
             36791: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  36790: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                       36776: Merged HEAD to THOR1_SPRINTS
                            36771: Fixed ALF-14239 "Share rules config misread by rules rule conditions ("When")"
             36862: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  36860: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                       36857: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS:
                            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'
                       36858: Resolve THOR-1431: Create Rule: Fields Name and Description can contain more than 1024 and can contain wildcards
             36939: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  36656: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                       36655: THOR-1427: failures while uploading documents
                  36927: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                       36925: Resolve THOR-1433: Updated rule works just after upload (no update needed)
                  36933: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                       36932: Resolve THOR-1442: Check in rule prevents working copy editing
                  36934: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                       36882: THOR-1424: WebDAV via HTML/browser view: "Up a level" link does not work if at the network level 
                  36936: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                       36935: Resolve THOR-1445: Preview generation for pdf and office files with size larger than ~1.2Mb fails
                  36938: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                       36701: Merged from V4.0-BUG-FIX to THOR1_SPRINTS
                            36698 Fixed bug where WebPreviewer sometimes isn't aligned with the rest of the document details page
                       36789: Resolve THOR-1438: Incorrect list of mimetypes in the rules
             37003: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  37002: Resolve THOR-1436: Remove Beta Logo / Label
   48199: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47274: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             37681: Fix build issue - merge error
        47275: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             38401: Fix activities feed mail notifications.
        47276: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             38726: Resolve CLOUD-160: "Data too long for column 'report' at row 1" when deploying Cloud1-144 to Test
                 patches run against tenants no longer concatenate the patch report from each tenant
             38754: Fix test
   48200: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47303: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             39830: Resolve CLOUD-423: Concurrent registration / account activations are not handled gracefully
   48203: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47358: Fix merge/test error (PatchTest.testSimplePatchSuccess)
   48244: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD (RECORD ONLY)
        47172: Merged DEV/CLOUD2 to DEV/CONV_V413
           36067: Fix merge issue
           36068: Fix document actions page when no repository view
           36084: Fix date rendering merge issues
           36086: Fix client resources merge issue
   48245: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD
        47225: Merged DEV/CLOUD2 to DEV/CONV_V413
           36117: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              35994: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                   34517: Prevent 304 revalidations for unchanged thumbnails in document library, web preview and search
                   34607: Ensure folders created containing "#" don't send document library into infinite loop.
                   34615: Performance improvement: prevent unecessary 304 revalidation for user avatar thumbnails in header WebScript
                   34638: Performance improvement: prevent unnecessary 304 revalidation for avatars in activity feeds
                   34639: Performance improvement: prevent unnecessary 304 revalidation for avatars on following/follwers pages
                   34658: Performance improvement: prevent unnecessary 304 revalidation for avatars on site colleagues dashlet
                   34661: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS
                        34636: Fix for ALF-13365 SOLR: Recently modified docs dashlet sorts incorrectly
                               - respect short property names on sort requests @cm:created and not require the full @{uri...}created
                   34662: Refactored revalidation code to remove previously added WebScripts that are now surplus to requirements
                   34668: Fix build break
                   34680: Fixed bean config problem (caused by r34662)
                   34684: Performance improvement: prevent unnecessary 304 revalidation requests for thumbnails in detailed view of My-Documents and Recently Modified Documents dashlets
                   34701: Further refactoring of 304 revalidation code to ensure backwards compatibility
                   34723: Fix build break
              36003: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                   34895: Resolve THOR-1251: Text for Site URL field on Create Site Form Wrong
                   34897: Resolve THOR-1250: Text on Accept Invite Page Wrong
                   35036: Changed Upload REST API to no longer immediately request thumbnail for an uploaded document. Performance improvement as requested. (re ALF-1015)
                   35142: Merged BRANCHES/V4.0 to BRANCHES/DEV/THOR1_SPRINTS:
                        35013: ALF-13561: Not found error after uploading new version (THOR-1304)
                   35320: Fix to issue where 'Avatar' alt text was shown rather than user avatar in the Site Members (colleagues) dashlet.
                   35546: Improve upload.post.js to use the "filename" argument if it is passed to set the name of the file on upload.
              36019: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
              36020: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
              36021: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
              36022: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
              36023: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
              36024: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
              36025: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                   34819: THOR-1255 - Define a GhostScript powered transformer for generating PNGs from PDF files, then override the regular PDF to Image transformer definitions from content-services-context.xml with ones that call GhostScript instead of the com.sun in-JVM one
              36026: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
              36027: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
              36028: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
              36029: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
              36030: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                   34921: THOR-1176: GoSquared analytics script
                   34922: THOR-1176: Removed accidentally committed file
                   34923: Merged BRANCHES/V4.0 to BRANCHES/DEV/THOR1_SPRINTS
                        34914: Merged DEV to V4.0 
                           34889: ALF-12678: Errors in log on startup (ts.alfresco.com 4.0)
                                  BasicHttpAuthenticatorFactory.BasicHttpAuthenticator.authenticate(RequiredAuthentication, boolean) handles AuthenticationExceptions from authenticateAsGuest() calls. The result is a 401 Unauthorized response.
                        34920: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V4.0
                                 34892: Fix for ALF-12930
                                 34917: Fix for ALF-12930 - pushed down to 3.4.X
                               Also related tweak for ALF-10823 to EditionInterceptor now that the repository returns 401 for guest auth unsupported.
              36032: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
              36033: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
              36034: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                   35071: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS:
                        31745: ALF-11268 adding logging.properties and suppressing activiti-logging (which is not log4j but plain JUL)
                        32336: ALF-11607: "DB2/LINUXX8664" now recognized as DB2 database-type in activiti
                        32944: ALF-12066 issue with the db2 create-script for activiti
                        (note: pre-reqs for cleaner merge of r34747)
              36035: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                   35072: THOR-1245: initial fix for doclib test case
              36036: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
              36037: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
              36038: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                   35211: THOR-1182 "MOBREG-07: A page exists confirming the users registration and invites them to enter the password they registered with"
                   35294: THOR-1309 - F405: Account Types aligned to sales and marketing requirements
                   35311: Merged BRANCHES/DEV/THOR1_MOBREG to BRANCHES/DEV/THOR1_SPRINTS:
                        34958: Fix for THOR-1185 and change password hashing to use SHA-2
                        35026: THOR-1185: "MOBREG-16: New sample ACP for users home site is loaded"
                             - hook into documentLibrary node creation to do the sample acp import
                        35302: THOR-1185: "MOBREG-16: New sample ACP for users home site is loaded"
                             - use SHA for password hashing
                             - ensure that sample content is added only to home sites
                        35309: THOR-1185 "MOBREG-16: New sample ACP for users home site is loaded"
                            - minor update to sample content acp
                        35310: THOR-1185: "MOBREG-16: New sample ACP for users home site is loaded"
                             - removed un-needed properties from repository.properties
                   35326: Merged BRANCHES/DEV/THOR1_MOBREG to BRANCHES/DEV/THOR1_SPRINTS:
                        35324: Fix build
                   35327: Fix build
                   35337: THOR-1309 - F405: Account Types aligned to sales and marketing requirements
                   35533: THOR-1309: F405: Account Types aligned to sales and marketing requirements:
                   35672: THOR-1313 - F410: List accounts filtered by account type
                   35673: Minor: Update account type ids (as used by tests) to be consistent with the latest config (as per THOR-1309)
                   35695: THOR-1313 - F410: List accounts filtered by account type
                   35704: Fix Get Account Types REST API (to also include network admin quota) - related to THOR-1309 / THOR-335
                   35770: Minor: add additional logging only (THOR-1323)
        
   48247: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD (RECORD ONLY)
        47263: Merged DEV/CLOUD2 to DEV/CONV_V413
           36119: 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
           36617: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              36564: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                    35780: THOR-1312 - F409: List accounts optionally sorted by (numeric) account type id (ascending or descending)
                    35807: THOR-1335 - support bulk email address domain validation
                    35903: THOR-1312 / THOR-1313 -List accounts optionally filtered or sorted
                    35904: THOR-1310 / THOR-1311 - List accounts optionally sorted by total user account or total file size (or account type, as previously)
              35945: Merged BRANCHES/DEV/mward/thor_transforms to BRANCHES/DEV/THOR1_SPRINTS:
                    35819: Added transformation server changes.
                    35820: Fixed compilation error, though a size of -1 for getActiveTransformers(...) is not likely to be valid.
                    35823: Transformations: changed default transformation server URL to be blank.
                    35897: Remote transformations server: fixed webscript bean id so that it responds to requests correctly.
                    35898: Remote transformations server: fixed JSON generation/parsing.
                    35910: Remote transforms server: fixed broken RemoteAlfrescoTransformerTest
                    35920: Remote transformation server: fixed broken test.
                    35937: Remote transformation server: integrated HTTPS support via HttpClientFactory.
                    35939: Remote transformations: added a boolean client-enabling property.
                    35941: Remote transformations: changed ProxyContentTransformer to delegate isExplicit() calls to worker.
              36011: Merged BRANCHES/DEV/THOR1_QUICK_SHARE to BRANCHES/DEV/THOR1_SPRINTS:
                    34685: Creating Quick Share branch
                    34826: First cut of THOR-1270 "F387: As the link receiver, I can view the Document Preview in the browser without having to login"
                    34868: More on THOR-1270 "F387: As the link receiver, I can view the Document Preview in the browser without having to login"
                    34901: QuickShare REST API - WIP ... note: API will change :-)
                    34933: QuickShare REST API - WIP 
                    34934: QuickShare REST API - WIP 
                    34941: QuickShare REST API - WIP ... note: API will change :-)
                    34989: QuickShare REST API - WIP 
                    34995: QuickShare REST API - WIP
                    34996: QuickShare REST API - WIP
                    35011: QuickShare/PublicView REST API
                    35025: F387: As the link receiver, I can view the Document Preview in the browser without having to login
                    35035: QuickShare/PublicView REST API
                    35052: QuickShare/PublicView REST API
                    35069: More on THOR-1270 "F387 As the link receiver, I can view the Document Preview in the browser without having to login"
                    35094: Removed cpnfig property that was commited by mistake
                    35111: First cut of THOR-1268 "F378: As a user I can choose to share a document"
                    35252: THOR-1271 "F388: From the view page, I can easily sign up or login for Alfresco. Sign Up is embedded in the page and Login will redirect you to the Alfresco Login page" partial commit
                    35254: First cut of THOR-1268 "F378: As a user I can choose to share a document" part 2
                    35255: THOR-1270 "F387: As the link receiver, I can view the Document Preview in the browser without having to login"
                    35264: QuickShare/PublicView REST API
                    35317: THOR-1322: New metadata doesn't return "webpreview" in thumbnails (part 1)
                    35319: QuickShare REST API - fix tenant ref when share'ing
                    35330: QuickShare REST API - fix THOR-1322: New metadata doesn't return "webpreview" in thumbnails (part 2)
                    35368: QuickShare REST API - THOR-1336: (F418) Get context (nodeRef, siteId, tenantDomain) for a shared_id
                    35376: QuickShare REST API - fix THOR-1273 (unshare document)
                    35424: THOR-1271 "F388: From the view page, I can easily sign up or login for Alfresco. Sign Up is embedded in the page and Login will redirect you to the Alfresco Login page" partial commit
                    35425: THOR-1271 "F388: From the view page, I can easily sign up or login for Alfresco. Sign Up is embedded in the page and Login will redirect you to the Alfresco Login page" partial commit
                    35566: Fixed THOR-1268 "F378: As a user I can choose to share a document"
                    35617: THOR-1350: Update Slingshot API (doclib2) - make the "qshare:sharedBy" return full details (instead of just userName)
                    35624: THOR-1339: QuickShare REST API
                    35682: Fixed THOR-1268, THOR-1339 & THOR-1269   
                    35935: QuickShare REST API - add "system.quickshare.enabled" prop (if set to false then disables QuickShare service/API)
                    35996: Fixed THOR-1369 & THOR-1270  
                    35997: Fixed THOR-1369 & THOR-1270 part 2  
                    36000: Fixed THOR-1369 & THOR-1270 part 3   
              36082: THOR-1270 "F387: As the link receiver, I can view the Document Preview in the browser without having to login"
                    - Re-added "Document Details" link public share page
              36128: Merged THOR1_SITE_INVITE_THOR-809 to THOR1_SPRINTS
                    THOR-809 "Site Invites Usability - Finish as per original design"
                    - First cut of: #4. Need to be able to cut and paste a long list of emails into the box and have them turned into emails. List can be space, new line or comma separated.
                    THOR-809 "Site Invites Usability - Finish as per original design"
                    - Second cut of #4. Need to be able to cut and paste a long list of emails into the box and have them turned into emails. List can be space, new line or comma separated.
                       * Tooltip is now a common one for all emails rather than individual since that caused issues when being scrolled inside div element. This approach is also less intrusive
                    THOR-809 "Site Invites Usability - Finish as per original design"
                    - Third cut of #4. Need to be able to cut and paste a long list of emails into the box and have them turned into emails. List can be space, new line or comma separated.
                       * Scroll bar is only visible when needed
                       * Now works in IE7
              36153: THOR-694: File size upload limit is not adhered to by Alfresco repository
              36186: Merged BRANCHES/V4.0 to BRANCHES/DEV/THOR1_SPRINTS:
                    32842: ALF-11947: Contributor/consumer can't like/unlike or comment document/folder if versionable aspect applied
                    32850: ALF-11947: Contributor/consumer can't like/unlike or comment document/folder if versionable aspect applied
                    (THOR-1208, THOR-1210)
              36188: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS:
                    34193: ALF-12205 - Contributor can't comment document/folder if versinable aspect is applied
                    (THOR-1209, THOR-1302, THOR-1387)
              36237: THOR-28: Account Service - Get Account Method API
              36252: THOR-28: Account Service - Get Account Method API
           36624: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              36565: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                    36289: THOR-1314: Changed e-mail action in upgrade button to link
                    36290: MT fix for SiteService
                    36291: THOR-538 / THOR-1168 - auto remove external user from a secondary network when they no longer belong to any sites ...
                    36292: THOR-900: Modified URL rewrite filters to enforce encoding of "@" symbols sin URL so that the invalid session timeout error doesn't occur
           36631: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              36570: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                    36308: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS:
                          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
                    36313: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS:
                          33730: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX:
                             33726: ALF-7264 Upgrade Commons Validator to 1.4.0 Final, fixing VALIDATOR-292. Then, update the EmailValidator flags to allow local addresses during validation, so that Alfresco can send emails to @localhost addresses without error
                          33779: Upgrade Tika for ALF-12714
                          33782: ALF-12714 Add 3GPP/3GPP2 video, and MP4 Audio mimetypes
                          33783: Update Tika for more MP4/QuickTime support, and enable MP4 audio metadata extraction + "quick" testing
                          34884: Merged HEAD to BRANCHES/DEV/V4.0-BUG-FIX:
                             34883: Tika and POI upgrade for ALF-13106
                    36340: AttributeService improvement: update puc value + cache (based on keys rather than id)
                    36341: Tenant usage quotas improvement
                    36412: THOR-1403: added connection timeout property to HttpClientFactory.
                    36413: THOR-1403: added 3s connection timeout to transformer client configuration.
                    36425: Tenant usage quotas improvement
                    36428: Merged THOR1_SITE_INVITE_THOR-809 to THOR1_SPRINTS
                          THOR-809 "Site Invites Usability - Finish as per original design"
                             - Added semicolon as email separator
                             - Fixed seecltion bug for SF, text now selected on first click and deselected on 2nd click (tested IE, SF & Chrome)
                    36431: Resolve THOR-1406: Emails with apostrophes aren't accepted
                    36455: Resolve THOR-1146: qamy.alfresco.com: incorrect URL for the RSS items
                    36456: Resolve THOR-1061 Incorrect text for the 'Task History' link
                    36457: Resolve THOR-1345: Missing apostrophe on mobile / cloud sign-up web page
                    36459: Merged BRANCHES/DEV/mward/thor_transforms to BRANCHES/DEV/THOR1_SPRINTS:
                          36458: THOR-1411: New Alfresco remote transformation subsystem is DEBUG logging by default
                    36460: Resolve THOR-1294: Terms and Conditions Link in Sign up screen does not work
                    36464: Resolve THOR-1238: Missing message string: error.header.wrong-reset-user
                    36472: Merged DEV/THOR1_QUICK_SHARE to DEV/THOR1_SPRINTS
                          Improvements for THOR-1270 "F387: As the link receiver, I can view the Document Preview in the browser without having to login"
                          - Added new component evaluator for bringing in different components based on page id
                          - The title of the quickshare page now contains the document's name (to improve the social "Share with:" experience)
                          - Added new icon for page not found screen
                    36477: AttributeService improvement: fix test/build (PropertyValueDAOTest.testPropertyUniqueContextValue)
                    36482: Resolve THOR-1416: Remove Polymorph Client
                    36484: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS:
                          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
                          36264: ALF-13933 Alfresco needs to be able to support LibreOffice for transformations
                             - remove old jodconverter-core-3.0-beta-3.diff
                          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.
                    36485: Resolve THOR-1418: Switch off S3 encryption by default
                    36508: THOR-1200 (CORE CHANGE): Modification to forms-runtime to prevent field undefined errors
                    36509: THOR-1200 (MODULE CHANGE): Re-introduce folder rules
                    36517: THOR-1353: Ensure IE8 users can create tasks
                    36521: Resolve THOR-1348: Account Settings screen should display Account Type
                    36530: Fix solrcore.properties
                    36540: THOR-1200: Force folder rules to run asynchronously
           36634: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              36633: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                    36601: Merge from THOR1_QUICK_SHARE to THOR1_SPRINTS
                          36599: Improvements for THOR-1270 "F387: As the link receiver, I can view the Document Preview in the browser without having to login"
                             - Made the "Preparing previewer... text get rendered using javascript so Google+ won't
                             include it in its description when sharing quickshare links
           36673: Fix issue where thumbnail failed to render when lastModified list provided but not for thumbnail type requested
           36760: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              36758: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                    36735: THOR-1430: QuickShare link breaks after uploading a new version of a shared file
        
        
   48248: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD
        47266: Merged DEV/CLOUD2 to DEV/CONV_V413
           37343: Fixed renamed directive issue in resources.get.html.ftl and updated spring-surf-api lib to ensure checksum appended MessagesWebScript URLs are matched
           37402: THOR-1479: Alfresco.DocumentList.generateThumbnailUrl Ignores renditionName Parameter
              - Changed call to Alfresco.util.generateThumbnailUrl to use renditionName parameter instead of hard-coded "doclib"
              - Added check for null renditionName parameter, if true use default of "doclib"
           37413: Fix issue from "V4.0-BUG-FIX to CLOUD1 merge" r37178 part 4
              - Missing </script> tag in colleagues dashlet
           37414: Added login box shadow for IE8
           37415: Minor Share fixes from Sprint 
              - THOR-383 "When multiple invitations are sent to a single user, the pending invitations UI is not laid out right."
              - THOR-431 ""Site Dashboard" not highlighted in banner when that page is displayed"
           37454: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              37453: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                   37451: Resolve THOR-1477: Video not previewing correctly
   48249: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD (RECORD ONLY)
        47273: Merged DEV/CLOUD2 to DEV/CONV_V413
           37652: THOR-1489: Alfresco.util.generateThumbnailUrl Ignores thumbnailName During Last Modified Check
              - Changed hard-coded "doclib" to thumbnailName
   48250: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD (RECORD ONLY)
        47280: Merged DEV/CLOUD2 to DEV/CONV_V413
           39206: Fixed CLOUD-198 "WASA - XSS issue with quickshare"
   48254: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD (RECORD ONLY)
        47282: Merged DEV/CLOUD2 to DEV/CONV_V413
           37516: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              37509: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                   37167: Merged HEAD to BRANCHES/DEV/THOR1_SPRINTS:
                        37157: THOR-1459: WebDAV: site names cannot start with 'webdav'
                   37302: THOR-1403: ensure indexing happens asynchronously on upload.
                   37303: THOR-1403: removed thumbnail creation during file upload.
                   37459: THOR-1429: Webdav returns 500 when you don't have access to moderated site 
                   37469: THOR-1475: Fixed avatar thumbnails for users joining/leaving/role change on sites.
                   37506: Resolve THOR-1481: Cannot preview PDFs over 3.5MB in size
        
   48256: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD 
        47283: Merged DEV/CLOUD2 to DEV/CONV_V413
           39236: Fixed and baked in Share Hazelcast Cloud specific configuration into thor-share module. Now only need to override hz:hazelcast bean with AWS key specifics for test/production.
           39358: Resolve CLOUD-186 500 error displayed when trying to add 'Content I'm editing' dashlet
           39388: Resolve CLOUD-185: My / Site Activities displayed incorrectly
   48259: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD 
        47302: Merged DEV/CLOUD2 to DEV/CONV_V413
           39877: CLOUD-438: Merged V3.4-BUG-FIX to CLOUD1
              36446: Fix for ALF-13404 - Performance: 'Content I'm Editing' dashlet is slow to render when there is lots of data/sites
               - Effectively removed all PATH based queries using the pattern /companyhome/sites/*/container//* as they are a non-optimized case
               - Replaced the "all sites" doclist query using the above pattern with /companyhome/sites//* plus post query resultset processing based on documentLibrary container matching regex
               - Optimized favorite document query to remove need for a PATH
               - Optimized Content I'm Editing discussion PATH query to use /*/* instead of /*//*
               - Fixed issue where Content I'm Editing discussion results would not always show the root topics that a user has edited
               - Added some addition doclist.get.js query scriptlogger debugging output
              36449: ALF-13404 - Fix for issue where favoriates for all sites would be shown in each site document library in the My Favorites filter.
              37190: Merged PATCHES/V3.4.6 to V3.4-BUG-FIX
                 37189: ALF-13404: Performance: 'Content I'm Editing' dashlet is slow to render when there is lots of data/sites
                    - Additional query improvement by Pavel
              37835: Fix for ALF-14429 - Recently Modified dashlet takes up to 30 seconds to load after upgrade to Alfresco 3.4.6.23
        Merged PATCHES/V3.4.6 to CLOUD1   
              39491: ALF-13404: Another attempt. Still not performing. Giving up on the cm:* idea altogether.
        Merged V3.4-BUG-FIX to CLOUD1
              39672: Merged PATCHES/V3.4.6 to BRANCHES/DEV/V3.4-BUG-FIX
                 39534: ALF-13404: Now we understand it! Content I'm Editing dashlet is non-site specific so should use cm:* in its queries. However, site filters and dashlets should NOT.
           Merged V4.0-BUG-FIX to CLOUD1      
              36635: ALF-13404 for documentlibrary-v2 APIs
              37121: ALF-12796: Ensure that only visible nodes are shown via Category search in Repository view when libraryRoot is changed from company home.
           Merged PATCHES/V3.4.6 to CLOUD1
              37189: ALF-13404: Performance: 'Content I'm Editing' dashlet is slow to render when there is lots of data/sites
              - Additional query improvement by Pavel
           Merged V4.0-BUG-FIX to CLOUD1      
              37443: Hand merge of second round of PATH query improvements for ALF-13404 to doclib2 API scripts
           Merged V4.1-BUG-FIX to CLOUD1
              38209: Tweaks to code merged over recently from 3.4 relating to doclib filters query simplification.
           38298: Fix for ALF-13737 - Error when 'favoriting' Company Home
              39678: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.1-BUG-FIX
              39672: Merged PATCHES/V3.4.6 to BRANCHES/DEV/V3.4-BUG-FIX
                    39534: ALF-13404: Now we understand it! Content I'm Editing dashlet is non-site specific so should use cm:* in its queries. However, site filters and dashlets should NOT.
           Hand merged above changes to documentlibrary-v2 filter scripts.
        
        
        
   48260: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD 
        47305: Merged DEV/CLOUD2 to DEV/CONV_V413
           40104: Fix for CLOUD-476 - userStatusRelativeTime is still referenced in org/alfresco/components/dashlets/my-profile.get.js and causes exception on user profile page when user status has been set.
           40402: Fix to CSS error in cloudsync merge - incorrectly overridden font-size in H3 dashlet contents (fix from Mr "I read CSS in my sleep" Hatfield).
   48262: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD (RECORD ONLY)
        47374: Merged DEV/CLOUD2 to DEV/CONV_V413
           40553: Remove on-premise style MT store Id extraction code from syncmode config lookup.
   48263: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD
        47375: Merged DEV/CLOUD2 to DEV/CONV_V413
           42005: Merged BRANCHES/DEV/FEATURES/CLOUD1_DAM to BRANCHES/DEV/CLOUD1:
              37644: Resolve CLOUD-34: Incorporate Gallery View
              39105: Moved to AMP produced from modules/dam/BRANCHES/V1.0 with overrideSource=cloud build property
              39268: ALF-13984: High Resolution Mime-Aware Place Holder Icons
                   - Implemented in DAM 1.0.2.0
              39651: Deployed DAM module version 1.0.3 to CLOUD1_DAM which fixes:
                   - CLOUD-380: Document library displayed incorrectly in Gallery view in IE7
                   - DAM-36: CLONE - Document library displayed incorrectly in Gallery view in IE7
                   - DAM-37: Gallery View: No Border Around Selected Items in IE7
                   - DAM-38: Gallery View: Two Items Must be Selected in IE7 for Multi-select Actions
                   - DAM-39: Gallery View: Slider Behavior is Erratic in IE7
                   - DAM-40: Gallery View: Upload Instructions Throws Error in IE7
              40083: CLOUD-378: Drag and drop within document library doesn't work in Gallery view
                   - Deployed DAM 1.0.4.0
              40507: Changed name of DAM module to Media Management
              40534: Version 1.0.5.1 of MM module which includes:
                   - DAM-61: Multi-Select Checkboxes Are No Longer Present in 1.0.5
              40723: Deployed version 1.0.5.3 of the Media Management module which includes fixes for:
                   - CLOUD-544 / DAM-66: 'Share' Link Displayed Incorrectly on Info Panel
                   - CLOUD-543 / DAM-65: Gallery View Content Display Should Support Dynamic Changing of Browser Width
              41174: Deployed Media Management module 1.0.5.4 which includes:
                   - DAM-67: Gallery View Changes the Size of Dragging Thumbnails in Other Views
                   - DAM-68: Gallery VIew Should Hide Its Container on destroyView
                   - DAM-69: Gallery View Resizing Should Fire Only When Resizing has Stopped
                   - DAM-71: Gallery View Thumbnail Generation Should Accept Thumbnail Definition Parameter
              41536: Merged HEAD to BRANCHES/DEV/FEATURES/CLOUD1_DAM:
                   40870: m.share fixes
              41537: Merged HEAD to BRANCHES/DEV/FEATURES/CLOUD1_DAM:
                   40919: m.share fixes
              41538: Merged HEAD to BRANCHES/DEV/FEATURES/CLOUD1_DAM:
                   41432: Fixed CLOUD-587 "Drag and Drop Changes Conflict with Hover Events on Touch Devices"
              41614: Changed version of gallery view only MM module to 0.1
              42004: Upgraded to MM 0.1.5.5 which contains fix for DAM-74
        
   48266: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD (UI ONLY)
        47403: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
           42199: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/CLOUD1:
                41113: Creating new [bug fix] branch from BRANCHES/DEV/CLOUD1
                41211: QuickShare: CLOUD-593: prevent copying of QuickShare props on node copy [+ minor refactor]
                41612: QuickShare: Merged form THOR1_QUICK_SHARE to CLOUD1-BUG-FIX
                   36363: QuickShare: Improvment for THOR-1268 "F378: As a user I can choose to share a document"
                41639: QuickShare: Fixed bug where the display of quickshare was based on the showComments property
        
   48267: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD
        47411: Merged DEV/CLOUD2 to DEV/CONV_V413
           42121: Merged BRANCHES/DEV/AMILLER/CLOUD1 to BRANCHES/DEV/CLOUD1:
              39663: CLOUD-153 - Invite box doesn't parse email addresses properly
   48269: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD
        47422: Merged DEV/CLOUD2 to DEV/CONV_V413
           42047: Merged DEV/CLOUD_SIGN_UP into DEV/CLOUD1 (cloud priority 
        47430: Merged DEV/CLOUD2 to DEV/CONV_V413
           42049: 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
           42050: 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
   48270: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD (UI ONLY)
        47438: Merged DEV/CLOUD2 to DEV/CONV_V413
           42160: Merged BRANCHES/DEV/AMILLER/CLOUD1 to BRANCHES/DEV/CLOUD1:
              38864: CLOUD-41 - Resize logo banner on upload
              38878: CLLOUD-42 - Image previews should be larger
   48271: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47345: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             40871: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                  40342: Merged BRANCHES/DEV/THOR1_REST_API1 to BRANCHES/DEV/THOR1_REST_API2:
                       35747: Merged BRANCHES/DEV/THOR1_REST_API to BRANCHES/DEV/THOR1_REST_API1:
                            34235: Upgraded Jackson to 1.9.4
                            34258: Removed invalid bean definitions (classes don't exist) for abstract="true" beans.
                            34463: Exported=true 
                            34464: Removed unused parent workflow
                            34465: Added a createComment method (Just cut and pasted Neils testcase code).
                            34466: Initial check-in of Rest Api code.  Still quite a bit to do.
                            34619: Added sources
                            34620: Going to start another Sprint so I need to check in everything up to date. WIP
                            34691: Renamed Action interfaces for better consistency, Fixed up POST methods with better Metadata about resources and fixed failing tests
                            34727: Reworked the Resource execution, added PUT webscript, improved the tests.
                            34853: Implemented HTTP Methods: GET, PUT, POST, DELETE with better test cases
                            34856: Initial cut of rest api implementations. Work in progress.
                            34935: Added EmbeddedEntityResource and uniqueid annotations. Recursively calls embedded entities, improved tests.
                            34956: Attempted simplification by removing the CollectionResource concept -> Just an EntityResource with 5 potential methods.
                            34986: 2nd cut of rest api implementations: still wip.
                            34987: Added a readById method for Resource GET using the relationship id
                            35007: Rest API (THOR-1150, THOR-1151, THOR-1152, THOR-1153, THOR-1220, ):
                                - explicitly set default timezone for date serialization/deserialization to UTC
                                - more rest api implementation tests
                                - rest api implementation re-factoring resulting from changes to the framework
                            35024: Automatically sets the id of passedIn object for a HTTP PUT for relationship resources.
                            35051: Further impl for public api: THOR-1150 -> THOR-1153 and THOR-1220
                            35059: Separated the GET executor so the embedded objects are called correctly.
                            35102: Added Paging, fixed up the Tests.
                            35117: wip, rest api implementations
                            35312: Made final
                            35313: Better exception handling with messages
                            35314: Improved paging/params and messages, started on embedded relations
                            35322: Added support for relations projections, to filter by properties use "properties" param, to add in relations use the "relations" param
                            35329: Handles null relationship keys
                            35377: Checks for simple property types which don't allow embedding
                            35496: WIP: rest implementations, test framework and tests
                            35529: Initial commit of scope and versioning support.
                            35539: Fixed the versioning for relationship resources
                            35560: Quick cleanup
                            35562: Embedded relationships is now working much better
                            35586: Safer serialization of Maps/Collections
                            35603: Added better version and filtering tests.
                            35611: Added Entity and Relationship not found exceptions
                            35612: Added Entity and Relationship not found exceptions
                            35674: Rest api implementations:
                                 - node refs are represented solely by their uuid (workspace://SpacesStore is assumed)
                                 - updates to model classes (hashcodes, equals, etc)
                                 - more paging support
                                 - tests
                       35858: Merged BRANCHES/DEV/THOR1_REST_API to BRANCHES/DEV/THOR1_REST_API1:
                            35773: Added api versioning with @WebApiDeleted annotation.  Better inheritance handling and improved tests.
                            35774: Deleted, it wasn't supposed to be there.
                       35988: WIP:
                           - sample requests
                           - more tests
                           - general fixes, including security fixes
                           - tag entity
                       35990: Merged BRANCHES/DEV/THOR1_REST_API to BRANCHES/DEV/THOR1_REST_API1:
                            35938: Reworked filtering in a big way. Hopefully now it works.
                            35982: Clean up and bug fix the request
                            35983: Clean up and bug fix the request
                       36002: Merged BRANCHES/DEV/THOR1_REST_API to BRANCHES/DEV/THOR1_REST_API1:
                            35992: Clean up after discussions with David/Steve. New Parameter called "parameters"! 
                       36056: Clean up, not used
                       36057: Changed the way responses are rendered, more consistent "entry" entries.
                       36087: Changed the json structure for tests as well
                       36134: Added paging parameter, cleaned up imports, more tests
                       36146: WIP:
                            - fixed up create tag return type
                            - fixed up Person model entity so that it doesn't extend Node
                       36151: Fix for Serialization of recursive related Collection of results
                       36168: Better empty collection handling, initial sorting tests.
                       36189: Fixes embedded resources by correct id.
                       36210: WIP:
                            - updates to rest api request files
                            - changed Comment so that it doesn't extend Node. removed title
                            - more tests
                       36211: WIP:
                            - service paging and other fixes and updates
                       36298: Moved jetty files to fix the build (it's odd that cloud -r works and yet continuous.xml does not)
                       36299: Update classpath as a result of jetty jars move
                       36301: Fix to stop null values in hashmaps from being returned in results.
                       36302: Added copyright notices
                       36303: WIP:
                            - split site service into a base class (dealing with site permissions and membership) and a subclass (everything else) to aid the following
                            - moved site membership functionality into canned queries for person sites and site members relations
                            - changed totalItems to an Integer so that it can be null if total items is not known
                            - added siteId filtering for activities
                            - copyright notices
                            - creating a comment through the comment service raises a share-like activity
                       36304: WIP:
                            - changed totalItems to an Integer so that it can be null if total items is not known
                            - copyright notices
                       36309: Servlet API 2.5 needs to be included at the top for the embedded jetty to work - need to revisit this.
                       36310: Temporary fix for dealing with nodeRefs embedded in activity summaries: regex match and convert to NodeRef.
                       36312: Fix tests
                       36325: Add jetty jars to ant test classpath
                       36327: Site memberships fix, override search subsystem to force lucene, re-instate full site service implementation (Spring circular dependencies are ok)
                       36335: Add missing file
                       36367: Fixes to tests
                       36368: CommentService fix - permissions.
                       36438: WIP:
                           - Person filtering (for cloud)
                           - Disabled some tests that are preventing the test from running (will revisit)
                           - Person-avatar relation
                       36522: WIP:
                           - fix sort ordering for site members
                           - fix site id filter for activity feed list (add tenant id)
                       36523: WIP:
                           - more tests
                           - improved robustness of tests
                           - added status mappings for EntityNotFound and RelationResourceEntityNotFound
                           - for avatar, return base 64 encoded avatar data and avatar node id
                           - use more specific EntityNotFound and RelationResourceEntityNotFound exceptions.
                       36646: Changes resulting from review
                            - make sure empty strings and null values are not output
                            - person entity tidy-up
                            - person visibility rules applied to person retrieval
                            - more tests
                            - return noderef of avatar node
                       36668: Fix build, add missing file
                       36694: Fix failing test
                       36764: WIP:
                            - site containers canned query
                            - node ratings: return null average (rather than -1) if there are no ratings
                            - site membership canned query sorting - use an enum for sort fields
                       36767: Add missing files
                       36769: WIP:
                            - node ratings: remove user rating summary, added rating date and fixed up tests
                       36770: WIP:
                            - some changes to property names for activity feed entries
                       36823: WIP:
                           - re-instate -1 for average rating when there are no ratings
                       36824: Changes resulting from review:
                           - merge activities into one relation
                           - quota model object to model network quotas
                           - Change HomeAccount -> HomeNetwork
                           - Changes to comment property names
                           - If average rating is -1 (from the rating service) convert to null
                           - remove readById from node entity resource
                           - Favourite sites url renaming
                       36825: Removed debug logging for rest api
                       36826: Commented out tag related tests until I figure out how to get the lucene search working
                       36833: Added discoverablity for the documentation.  New @WebApiDescription, @WebApiParam annotations
                       36871: Added tests for @WebApiDecrition, @WebApiParam
                       37026: WIP:
                            - added discoverability annotations
                            - changes resulting from review:
                               o node ratings output restructure
                               o network quotas restructure (need to revisit this again)
                            - activity summary post processing framework
                            - added non-caching to rest api webscript (need to revisit)
                            - don't output empty strings (need to revisit)
                            - more tests
                       37058: WIP:
                           - change tag service support
                       37141: WIP:
                            - tag sorting
                            - fix JSON issue in PreferencesService
                       37142: WIP:
                            - refactoring: split functional areas into separate REST API implementation classes
                            - added copyright notices
                            - network quotas represented as a list
                            - ensure empty (zero length) JSON strings coming into the REST api are treated as null
                       37300: WIP:
                            - support for update comment
                            - activity summary processing
                            - web script set no caching and response content type
                       37301: WIP:
                            - support for update comment
                       37354: Build fix: try rebuilding indexes
                       37369: Fix build: try again
                       37498: More logging to determine build failure using lucene for search
                       37608: Build fix?
                       37609: Fix build
                       37637: Fix build: try again
                       37672: Build fix (try again)
                       37860: Get networks: consolidate functionality so that it's easily callable from core Thor code and public api code
                       37861: Get networks: consolidate functionality so that it's easily callable from core Thor code and public api code
                       37862: Fix for THOR-1493: "OpenCMIS Change Object Id to be Node GUID"
                       37864: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api"
                       37866: Unit test fix
                       37950: Build fix for ApiTest (another try - override repository-properties bean to force lucene)
                       38051: Build/test fix (another try)
                       38072: Removed file no longer required
                       38114: Better representation of the Resource metadata.  Try calling: /alfresco/service/public/alfresco/versions/1
                       38230: Fix PublicApiTest on the build machine
                       38309: Public api test fixes
                       38319: Public api webscript transaction configuration. Make get webscript r/o transaction.
                       38320: Public rest api: make sure http response headers are written before the response content.
                       38340: More build test fixes
                       38349: Fix for THOR-1493: "OpenCMIS Change Object Id to be Node GUID"
                           - fix up CMIS query fallout
                       38530: Fix tests
                       38531: Fix for THOR-1493: "OpenCMIS Change Object Id to be Node GUID"
                            - fix up cmis queries
                       38552: Further test fixes
                       38574: Added some comments
                       38730: Added OPTIONS webscript to get metadata on the current url
                       38879: Refactored a little to make the code easier to extend / customise
                       38880: Fixed incorrect config, I should try not to delete things.
                       38986: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/THOR1_REST_API1:
                            38954: Fix for ALF-14475: "CMIS : Wrong cmisra:numItems in folder sites and below with /cmisatom binding url"
                       39010: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/THOR1_REST_API1:
                            39006: Fix for ALF-14475 part 2: "CMIS : Wrong cmisra:numItems in folder sites and below with /cmisatom binding url"
                       39090: Fixed broken webscript OPTIONS call
                       39159: Fix broken INFO url mapping
                       39326: Clean up, Added ResourceMetaDataWriter interface for different meta info presentation formats
                       39331: The tests need their own context
                       39609: Update to latest Chemistry libraries
                       39657: Fix for CLOUD-417, part 1: "Delete a Comment"
                       39741: Fix for CLOUD-409: "Change Endpoint for CMIS URLs in Staging"
                       39742: Fix for CLOUD-409: "Change Endpoint for CMIS URLs in Staging"
                       39750: Fix for CLOUD-417, part 2: "Delete a Comment"
                           - added delete comment method to comment service
                       39754: Fix for CLOUD-417, part 3: "Delete a Comment"
                           - fixed up activity generation for update and delete comment
                       39776: OpenCMIS TCK fix: getDescendants is using node service, which unlike the FileFolderService does not automatically remove hidden files.
                       39780: Shifted public api opencmis webscript definitions to Thor
                       39781: Shifted public api opencmis webscript definitions to Thor
                       39782: Fix for CLOUD-409: "Change Endpoint for CMIS URLs in Staging"
                       39783: Minor fixes, comments
                       39785: Public api tests
                           - move jetty libraries to 3rd party
                           - remove JettyComponent as a Spring bean and change how it's constructed
                       39786: Fix for THOR-1493: "OpenCMIS Change Object Id to be Node GUID"
                           - for unversioned documents, the revision number should not be appended
                       39794: Added missing files for public api tests
                       39795: Update to latest Chemistry libraries
                       39834: Fix for THOR-1493: "OpenCMIS Change Object Id to be Node GUID"
                           - for unversioned documents (or documents with version "1.0"), the revision number should not be appended
                       39835: Fix for CLOUD-362: "Discover Networks" API should be at "/tenants"
                       39836: Fix for THOR-1493: "OpenCMIS Change Object Id to be Node GUID"
                       39844: Public api tests
                           - move jetty libraries to 3rd party
                           - remove JettyComponent as a Spring bean and change how it's constructed
                       39854: Fix for CLOUD-362: "Discover Networks" API should be at "/tenants"
                       39856: Re-instate tests.
                       39857: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api"
                            - removed cmisatom url binding (opencmis is now at .../public/cmis/versions/1/atom)
                       39926: Fix for CLOUD-442: "Public API : Tagging + Paging"
                       39927: Fix for CLOUD-442: "Public API : Tagging + Paging"
                            - updates to public api tests
                       40185: Make sure LockService is injected into CommentService
                       40186: Make sure LockService is injected into CommentService
                       40187: Changes resulting from sprint demo:
                           - changes to network and network membership representation
                           - embed modifiedBy person object in comment
                       40211: Changes resulting from sprint demo:
                           - changes to network and network membership representation
                       40212: Fix intermittently failing test
                       40223: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api"
                            - changes resulting from end of spring demo (get repositories located at .../cmis/versions/1.0/atom)
                            - removed browser binding for now
                       40224: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api" (Thor-specific changes)
                            - changes resulting from end of spring demo (get repositories located at .../cmis/versions/1.0/atom)
                            - removed browser binding for now
                       40225: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api"
                            - changes resulting from end of spring demo (get repositories located at .../cmis/versions/1.0/atom)
                            - removed browser binding for now
                       40254: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api"
                            - changes resulting from end of spring demo (get repositories located at .../cmis/versions/1.0/atom)
                       40255: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api"
                            - changes resulting from end of spring demo (get repositories located at .../cmis/versions/1.0/atom)
                       40256: Fix for THOR-1494: "OpenCMIS Change Base Url to be Consistent With Public Rest Api"
                            - changes resulting from end of spring demo (get repositories located at .../cmis/versions/1.0/atom)
                       40270: Turned stacktrace into a String
                       40339: CLOUD-488: "The activities feed in the public API is not returning all required summary data for comments"
                  40548: Merged PATCHES/V4.0.2 to BRANCHES/DEV/THOR1_REST_API2:
                       40526: Fixed ALF-15540: CMIS: Synchronized block in service interceptor
                  40644: Public api:
                  40645: Public Api:
                  40646: Public Api:
                  40649: Public api:
                  40650: Public api:
                  40657: Merged BRANCHES/DEV/THOR1_REST_API1 to BRANCHES/DEV/THOR1_REST_API2:
                       40515: CLOUD-390: Content models to be filtered out of Cloud CMIS implementation
                       40550: Public api:
                           - updates to datetime property names
                       40552: Public api:
                            - sort sites by site title (by default)
                       40596: Removed "system" from exclusions for CLOUD-495
                       40610: CLOUD-495: F414: Add multiple tags to a folder or document
                  40674: Public api:
                  40675: THOR-1324: "F414: Add multiple tags to a folder or document"
                  40676: Public api:
                  40678: Public api:
                  40715: Public api:
                  40730: Merged /alfresco/BRANCHES/DEV/THOR1_REST_API1:r40724  Better meta-data handling for PUT requests
                  40731: Merged /alfresco/BRANCHES/DEV/AMILLER/CLOUD-496:r40659: CLOUD-500: Add trusted auth with key validation.
                  40732: Fixed failing test
                  40739: Merged BRANCHES/DEV/V3.4-BUG-FIX:r40193: ALF-15307 / ALF-15190: FTS indexing can stick forever on purged nodes - May cut 50 minutes off the build time when merged
                  40742: Public api
                  40801: Public api:
                  40802: Public api
                  40803: Public api
                  40804: Public api
                  40807: Public api
                  40811: Public api
                  40815: Public api:
                  40826: Public api
        47357: Fix merge/compile error (solr /cmis query)
        47370: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             41149: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                  41146: Fix trusted authentication against OpenCMIS
        47372: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             41192: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                  41191: Fix for OpenCMIS trusted authentication to allow local opencmis access as before
   48272: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: (no changes)
        47368: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             41128: (RECORD ONLY) Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                  41003: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                  41026: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                  41039: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                  41086: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                  41115: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                  41126: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                       40364: Testcase for ALF-15178, which is not reproduced.
                       40419: Fix for the MLText parts of ALF-15502.
                       40782: Fix ALF-15420: Move: child files/subfolders aren't synced after moving from parent folder and updating in Alfresco on-premise/Cloud
                  41127: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
                       41121: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/V4.1:
                            41003: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                            41026: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                            41039: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                            41086: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
                       41123: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/V4.1:
                            41115: CloudSync: ALF-15734 - force unsync (of last SSMN) on target causes repeating pull errors to appear in both logs
   48274: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47356: (RECORD ONLY) Add temp logging - to investigate unit test failures on build only
   48277: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47376: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             41302: CLOUD-622: "Mobile App connection to testmy build 227 issue"
             41377: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                  40859: public api:
                  40862: CLOUD-555: "Updating comment fails because node not found"
                  40961: CLOUD-566: "Site object shouldn't contain the "sitePreset" property"
                  40979: Added tests for non-numeric params and non-european characters
                  41030: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/THOR1_REST_API2:
                       41027: ALF-15193: "Folder Is Not a Folder CmisInvalidArgumentException thrown when using cmis:objectId"
                  41097: Added quickshare and cloudsync to cmis filter list
                  41098: Renamed serializer/deserializer lists for RestJsonModule
                  41099: Cleaned up consistent Rest responses - CLOUD-574
                  41100: Meta info webscript is disabled because its not been reviewed / in the correct format
                  41104: Meta info webscript is really disabled because its not been reviewed / in the correct format
                  41105: Added key for trusted layer7 relationship
                  41137: Public api:
                  41168: Public apI;
                  41169: CLOUD-565: "API / URL returns a "tenant required" error"
                  41170: public api:
                  41171: public api:
                  41172: public api:
                  41183: CLOUD-598: "API: "GET network" response has unnecessary JSON nesting"
                  41186: Fix solrcore properties
                  41282: CLOUD-616: "CMIS API: Repository names should be more descriptive"
                  41283: CLOUD-601: "API /networkId/public/cmis/versions/ returns a 400"
                  41325: Public api:
                  41367: CLOUD-636: "REST API: Nodes: Tags: Not allowed DELETE method proceeds with status 204"
                  41369: Public api:
             41474: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                  41422: Sample OAuth call for the Resource Owner Password flow
                  41427: Sample OAuth call for the Client Credentials flow
                  41433: Public api: (1) parameterize site members/people sorting in service api
                  41434: Public api: minor comment service fix
                  41438: CLOUD-629: "REST API: It is possible to add a comment to comment"
                  41439: Public api: fix for default tenant id in CMIS requests
                  41449: CLOUD-629: "REST API: It is possible to add a comment to comment"
                  41456: CLOUD-644: "Performing a Checkout in OpenCMIS Results in an Exception in the Share Doc Library"
                  41457: Fix build
                  41461: Public api: more tests
             41560: CLOUD-657: "cmis root service document returning incorrect urls"
             41670: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                  41521: CLOUD-660: "GET favourite sites results in exception when skipCount is greater than number of items"
                  41606: Fix for CLOUD-668 - POSTing to a relationship by id now returns an InvalidArgumentException
                  41607: CLOUD-668 : changed ordering so errors fire in correct order.
                  41628: Public api: more tests
             41710: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                  41672: CLOUD-672: "404 Error when browsing child files/folder "
                  41673: Public api: more tests
                  41675: CLOUD-674: "Root network calls need to return application/json content type"
        47378: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             41670: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                  41521: CLOUD-660: "GET favourite sites results in exception when skipCount is greater than number of items"
                  41606: Fix for CLOUD-668 - POSTing to a relationship by id now returns an InvalidArgumentException
                  41607: CLOUD-668 : changed ordering so errors fire in correct order.
                  41628: Public api: more tests
             41710: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                  41672: CLOUD-672: "404 Error when browsing child files/folder "
                  41673: Public api: more tests
                  41675: CLOUD-674: "Root network calls need to return application/json content type"
   48289: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD
        47447: Merged DEV/CLOUD2 to DEV/CONV_V413
           43323: Merged BRANCHES/DEV/FEATURES/CLOUD1_GRANULARPERMISSIONS1 to BRANCHES/DEV/CLOUD1:
              42257: CLOUD-649: Updates UI action for Granular Permissions
              42295: CLOUD-33: Updates labels
              42303: CLOUD-651: Limit user search to site members only.
              42352: CLOUD-780: Adds a rolesWhitelist to only display those roles that are allowed. Currently set to: ["Consumer", "Contributor", "Collaborator"]. This is only used in the site view. The Repository view behaviour has not changed.
              42427: Removes multi-select manage-permissions dialogue.
              42520: CLOUD-802: Change the way the user is returned to the previous page to work around suspected Chrome bug.
              42604: CLOUD-840: Automatically add SiteManger permisions when inheritAll is switched off. Pervent remaoval of siteManager authority.
              42606: Fixed CLOUD-840 "Granular Permissions: Site Manager should retain access when inherit permissions is turned off"
              42807: CLOUD-863: Reordered code to avoid AccessDeniedException
              43259: CLOUD-901: Revert showComments check so it handles undefined permission
              43266: CLOUD-900: Old Manage permissions form is opened via Permissions panel
              43307: CLOUD-900: Follow-up fix
        
   48291: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD (UI ONLY)
        47453: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
           44059: Merged BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2 to BRANCHES/DEV/CLOUD1:
                43797: Merged BRANCHES/DEV/FEATURES/CLOUD1_SOLR to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                     42526: Merged BRANCHES/DEV/V4.0-BUG-FIX, BRANCHES/V4.1, BRANCHES/DEV/4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_SOLR for CLOUD-798
                           V4.0-BUG_FIX
                               36393: Final part of ALF-13723 SOLR does not include the same query unit tests as lucene
                               36434: Test fix for ALF-13723 SOLR does not include the same query unit tests as lucene
                               36608: First part of ALF-14209 SOLR - does not support query for all stores
                               36676: Fix for ALF-14216 Solr Exception when you try to sort folders or files by size.
                               36954: ALF-14209 SOLR - does not support query for all stores
                               37075: Fix for ALF-14267 SOLR index check - First transaction time used instead of first ACL time - indexCheck, checkInitialState
                               37135: Fix for ALF-13993 It fails to find documents whose tag is longer than 255 characters
                               37253: Fix for ALF-13634 Re-created category won't show up again on a node in Document Library.
                               37384: Fix for ALF-14219 SolrQueryHTTPClient unable to handle long queries (4096 bytes)
                               37628: Build Fix
                               37749: Fix for ALF-14582 SOLR tracking allows incompatible model changed to the current index to be made
                               37863: Fix for ALF-14631 Extraneous Backslash in Solr Configuration File
                               37896: Fix for ALF-14582 SOLR tracking allows incompatible model changed to the current index to be made
                               38008: Fix for ALF-14042 Customisable Alfresco contextPath in Alfresco AbstractHttpClient (used e.g. by Solr CoreTracker)
                               38010: Fix for ALF-14686 https://localhost:8443/solr/admin/cores?action=CHECK - checks the index - it should check the cache
                           V4.1
                               38179: Fix for ALF-14620 SOLR searches run by system user in archive store return fewer results than for admin user
                           V4.1-BUG-FIX
                               40401: Part for for ALF-15406 Index Tracker seems not to gracefully stop upon shutdown keeping all other threads in waiting
                               41201: Fix for ALF-15767 Group query using cm:authorityName
                               41202: Additional unit tests related to ALF-15731  TYPE:"..." queries no longer work for Lucene on 4.X
                               41203: Part 1 for ALF-15811 SOLR query increases DocBitSet inefficiently
                               41210: Part 2:  ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                               41303: Fix for ALF-15799 Under high concurrency load balanced Solr throws an Antlr related NPE
                               41322: Fix for ALF-15858 SOLR ACL tracking can stall or miss acls during tracking
                               41323: Chemistry client java to create test data for ALF-15858, ALF-15782, CLOUD-596, ALF-15753 etc
                               41487: Fix for ALF-15910 SOLR - Add index warming and filter pointless entries from the filter cache
                                      Fix for ALF-15851 Too many live instances of SolrIndexSearcher at one time resulting in OOM - Alfresco 4.1.1 - build 151
                               41730: Fix for ALF-15995 NodeRef is missing in log on "Problem converting to Freemarker" error
                               41747: Fix for ALF-15811 SOLR query increases DocBitSet inefficiently
                                      Part of ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                               41748: Fix for ALF-15950 Solr: throws NPE: org.alfresco.solr.SolrLuceneAnalyser.loadAnalyzer
                               41752: Fix for ALF-13634 Re-created category won't show up again on a node in Document Library.
                               41940: Fix for ALF-16086 SOLR tracking does not include transformation status etc (error in header name)
                               42136: Last SOLR side update for ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                               42143: In-memory bridge table for ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                               42183: Build fix - unit test runs in 64M - for all the washing machines out there ....
                     42547: Fix the model used for embedded tests.
                     42659: Add missing test model
                     42663: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_SOLR
                           42612: Further fix for ALF-16164 Cloud monitoring of SOLR is CPU intensive due to its repeated use of the SOLR stats page 
                           42657: Fix for     ALF-16359 Fix SOLR logging in production and other environments 
                     42660: (RECORD ONLY) Merged DEV/CLOUD1 to DEV/FEATURES/CLOUD_SOLR
                           working copy sync r42514 through r42659
                43799: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                     42377: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX:
                          42363: ALF-16213: renaming versioned file results in file being deleted.
                     42411: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX:
                          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
                     42428: ALF-16217: Remove unnecessary restriction on content type
                     42432: CLOUD-795: Optimise activities feed: rollup multiple (WebDAV) document adds/deletes into a single activity
                43802: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                     42559: Merged BRANCHES/DEV/CLOUD1_SPRINT1/ to BRANCHES/DEV/CLOUD1-BUG-FIX:
                          42548: CLOUD-712: Ensure that all CSS files are loaded in IE (latest Spring Surf libs r1170)
                     42565: CLOUD-837: TenantContentUsageImpl does not handle failed lock
                43811: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                     42570: CLOUD-810: ""emailFeedDisabled" in person JSON needs to be called "emailNotificationsEnabled""
                43813: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                     42572: CLOUD-794: "Activities should be posted for CMIS (to enable both Public API + Mobile clients)"
                     42576: CLOUD-842: Activities Feed: post lookup - job lock + max items per cycle
                     42579: CLOUD-846: Minor optimisation for Site lookup (for a nodeRef)
                43814: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                     42609: CLOUD-712: Updated Surf libs (r1171) to change the number of @import statements supported by each <style> element in IE from 32 to 31
                43815: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                     42694: Fix build (merge issues) + fixes for CLOUD-839: "Activities Are Not Posted For Ratings", CLOUD-860: "Content Created With CMIS Cannot be Rated" and CLOUD-397: "The JSON response of the networks request is incorrect"
                43816: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                     42737: CLOUD-463: Now checks if the current user has read permission for the shared node, before displaying "Document Details" button.
                     42847: CLOUD-794: "Activities should be posted for CMIS (to enable both Public API + Mobile clients)"
                     42868: Fix failing build tests + further/revised public api tests
                     42875: CLOUD-869: "Remove cmiscustom types from the CMIS dictionary"   
                     42884: ALF-1059 / CLOUD-469: Post activities for folder(s) add + delete
                     42899: Fix build
                43817: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                     42950: CLOUD-726: Ensure that i18n messages fall back to properties defined by less specific locale files (updated Surf libs: 1174)
                43818: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                     43138: Fixed CLOUD-491 "'New Folder' form is not displayed on IE7, IE8"
                     43234: CLOUD-313: Implment Transport pooling in email sender.
                     43349: Fix CLOUD-918: Failed to delete folder via Folder Details page
                     43351: Fix CLOUD-905 - activity for Share folder delete are not displayed (OK via WebDAV)
                     43440: CLOUD-928: Cope with missing shredId attributes, due to the copying of QuickShare properties, prior to CLOUD-593 
                     43451: Merged HEAD to BRANCHES/DEV/CLOUD1-BUG-FIX:
                          43449: ALF-16669: removing a site member may break the activity feed (CLOUD-931)   
                43819: Fix merge error
                43820: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                     43465: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)"
                43821: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                     43477: Merged HEAD to BRANCHES/DEV/CLOUD1-BUG-FIX:
                          39205: Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD 
                             39084: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.1-BUG-FIX 
                             39081: Fix for ALF-6139 and ALF-13959 - Incomplete site creation issues - latest Surf libs and related changes to allow atomic creation of multiple Surf objects in a single REST call. Originally authored by Dave Ward for 3.2 - now migrated to SpringSurf. Implemented ADMRemoteStore changes for above change to apply to 4.0.
                     43488: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)"
                43822: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                     43537: ALF-16706: CLONE - POI becoming irresponsive and causing jvm to freeze with XLS that includes fraction formats 
                          43520: ALF-16694 POI becoming irresponsive and causing jvm to freeze for a while with certain XLS (fraction formats)
                             - Patched POI to:
                               - limit the length of fractions to four digits (more than that takes too long to process) e.g. "# #/#####" is too long and will be reduced to "# #/####" which still takes about a second!
                               - handle the -ve fraction format part (i.e. n in p;n;z), so its length is not interpret as part of the fraction format of the +ve fraction part.
                               - handle custom formats a bit better (strip them) rather than interpret the text length as part of the fraction format
                               - handle -ve fractions (just did not work)
                               - limitations:
                                 - custom text gets stripped (still better than before)
                                 - formats that have p (+ve) and n (-ve) parts must include a fraction format in each part. Otherwise +ve and -ve values are not formatted as a fraction (still better than before)
                     43564: CLOUD-939: <Record Only>
                          43558: ALF-16694 POI becoming irresponsive and causing jvm to freeze with XLS that includes fraction formats
                             - Original jar did not get removed in previous commit
                             << NO NEED TO MERGE TO CLOUD1-BUG-FIX as there was a tree conflict and the original jar was removed. >>
                43823: Fix merge error
                43824: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                     43579: Public api test, fix intermittent test failures (hopefully)
                     43721: CLOUD-935: Update thor override of remoteadm.post.desc.xml
                     43726: PUBLICAPI-11: "Extract metadata needs to be called after uploading new content via CMIS"
                43828: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                     43728: Merged BRANCHES/DEV/AMILLER/CLOUD1 to BRANCHES/DEV/CLOUD1-BUG-FIX:
                          38211: CLOUD-115 - Remove Network Admins on downgrade to free/public
                43829: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                     43731: Resolve CLOUD-965: A known config which has been tested can be modified when deploying to production
                     43733: PUBLICAPI-11: "Extract metadata needs to be called after uploading new content via CMIS"
                     43762: Fix the build
                43830: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                     43788: CLOUD-942: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX:
                          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
                          40112: ALF-9254: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1)
                               40111: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration
                                  - Patched jooconverter to handle non western characters in text files, by using the same properties that JOD uses.
                               40073: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration
                                  - Refactored JodContentTransformer and OpenOfficeContentTransformerWorker. Moved common code into OOoContentTransformerHelper,
                                    including fixes that existed on only one or the other.
                                  - For text files, change file encoding from SHIT JIS (and others) to UFT-8, as OpenOffice/LibreOffice do not support this as
                                    an input. They do support it in other file types but not text. JOD now works, but OOo still has problems.
                     43789: CLOUD-942: Add mergeinfo, missed by initial commit from Cornerstone. 
                43831: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                     43488: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)"
                43832: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                     43762: Fix the build
                43833: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                     42692: (RECORD ONLY) Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1-BUG-FIX:
                          40859: public api:
                          40862: CLOUD-555: "Updating comment fails because node not found"
                          40961: CLOUD-566: "Site object shouldn't contain the "sitePreset" property"
                          40979: Added tests for non-numeric params and non-european characters
                          41030: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/THOR1_REST_API2:
                               41027: ALF-15193: "Folder Is Not a Folder CmisInvalidArgumentException thrown when using cmis:objectId"
                          41097: Added quickshare and cloudsync to cmis filter list
                          41098: Renamed serializer/deserializer lists for RestJsonModule
                          41099: Cleaned up consistent Rest responses - CLOUD-574
                          41100: Meta info webscript is disabled because its not been reviewed / in the correct format
                          41104: Meta info webscript is really disabled because its not been reviewed / in the correct format
                          41105: Added key for trusted layer7 relationship
                          41137: Public api:
                          41146: Fix trusted authentication against OpenCMIS
                          41168: Public apI;
                          41169: CLOUD-565: "API / URL returns a "tenant required" error"
                          41170: public api:
                          41171: public api:
                          41172: public api:
                          41183: CLOUD-598: "API: "GET network" response has unnecessary JSON nesting"
                          41186: Fix solrcore properties
                          41191: Fix for OpenCMIS trusted authentication to allow local opencmis access as before
                          41282: CLOUD-616: "CMIS API: Repository names should be more descriptive"
                          41283: CLOUD-601: "API /networkId/public/cmis/versions/ returns a 400"
                          41325: Public api:
                          41367: CLOUD-636: "REST API: Nodes: Tags: Not allowed DELETE method proceeds with status 204"
                          41369: Public api:
                          41422: Sample OAuth call for the Resource Owner Password flow
                          41427: Sample OAuth call for the Client Credentials flow
                          41433: Public api: (1) parameterize site members/people sorting in service api
                          41434: Public api: minor comment service fix
                          41438: CLOUD-629: "REST API: It is possible to add a comment to comment"
                          41439: Public api: fix for default tenant id in CMIS requests
                          41449: CLOUD-629: "REST API: It is possible to add a comment to comment"
                          41456: CLOUD-644: "Performing a Checkout in OpenCMIS Results in an Exception in the Share Doc Library"
                          41457: Fix build
                          41461: Public api: more tests
                          41521: CLOUD-660: "GET favourite sites results in exception when skipCount is greater than number of items"
                          41606: Fix for CLOUD-668 - POSTing to a relationship by id now returns an InvalidArgumentException
                          41607: CLOUD-668 : changed ordering so errors fire in correct order.
                          41628: Public api: more tests
                          41672: CLOUD-672: "404 Error when browsing child files/folder "
                          41673: Public api: more tests
                          41675: CLOUD-674: "Root network calls need to return application/json content type"
                          41790: CLOUD-629: "REST API: It is possible to add a comment to comment"
                          41791: CLOUD-629: "REST API: It is possible to add a comment to comment"
                          41793: CLOUD-629: "REST API: It is possible to add a comment to comment"
                          41823: Public api: more tests
                          41825: Fix for CLOUD-684 - wraps the list, not sure if I like the paging
                          41853: CLOUD-700: "The mobile SDK needs a way to map an accessToken to a user identifier"
                          41867: CLOUD-711: "It should be possible to remove a favourite site"
                          41957: Public api: - error handling improvements - more tests
                          41970: Public api: - fix build  (add missing files)
                          41972: Public api: - more tests (including OpenCMIS TCK)
                          42046: Added some debug timings.  Enabled using log4j.logger.org.alfresco.rest.framework.webscripts=debug
                          42058: Public api: changed logging package name
                          42124: Public api: - more tests - minor fixes
                          42125: CLOUD-734: "CMIS: Query Issues Discovered During Testing"
                          42126: Public api: fix up OpenCMIS tests
                          42171: Consistency fix for CLOUD-695.
                          42180: Fix build
                          42181: CLOUD-695 "Requests to un-implemented urls do not consistently return http status 405 (Method not allowed)": fix up public api tests
                          42214: Public api tests (cmis)
                          42251: Changed the serializer for embedded entities, (related to CLOUD-746)
                          42253: Fix build
                     42735: (RECORD ONLY) Fix build (fix merge error)
                43834: Merged BRANCHES/DEV/FEATURES/CLOUD1_GOOGLEDOCS to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                     43702: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder
                     43703: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder
                     43744: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder
                43846: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                     43840: [CLOUD-955] Add request header config to remove Origin Header in share proxy calls.
                43855: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                     41731: Fix for ALF-16002 - Dashlet - My Documents - I've recently modified - executes unlimited query. In SOLR unlimited (all sites query) is really unlimited, for Lucene it is not. Improved jscript Search debugging to correctly output limit value on query.
                43881: Revert CLOUD-942: Reverse merge r43830 
                43885: CLOUD-942: Reapply changes backed out in r43881 and Comment out faling unit tests.
                43921: Resolve CLOUD-990: REGRESS: No items error is displayed on DocumentLibrary Page (for some files)
                43924: Disable intermittent OpenCMIS tests
                43925: Disable intermittent test
                43952: CLOUD-993: Insure login button is shown when user isn't logged in.
                43992: Resolve CLOUD-1001: REGRESS: New Application Theme and Logo are not applied after re-login
   48293: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD (UI ONLY)
        47530: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
           45853: Merged BRANCHES/DEV/FEATURES/CLOUD1-EMAIL-REFRESH to BRANCHES/DEV/CLOUD1:
                44041: Merged BRANCHES/DEV/CLOUD1_SPRINT1 to BRANCHES/DEV/FEATURES/CLOUD1-EMAIL-REFRESH:
                     40496: Merged from BRANCHES/DEV/AMILLER/CLOUD1_SPRINT_1 to BRANCHED/DEV/CLOUD1_SPRINT1
                          CLOUD-189: Created e-mail template macros and css lib files
                          CLOUD-189: E-mail template image assets
                          CLOUD-189: Updated macros and CSS lib plus finished site invitation template
                          CLOUD-189: Reset password e-mails
                          CLOUD-189: More e-mail templates
                          CLOUD-189: Workflow template
                          CLOUD-144: Refactor AbstractUserNotifier to allow custom models to be passed to template.
                          CLOUD-144: Custom activity feed model builder, for cloud.
                          CLOUD-144: Activities e-mail template
                     40958: CLOUD-580: Added alt text for images
                     40960: CLOUD-585: Added missing quotes to invitation e-mail
                     40967: CLOUD-144: Add joins aggregation to activites feed model and fix missed merge.
                     40970: CLOUD-144: Added joins to activities e-mail
                     40982: CLOUD-582: Fix subject
                     41028: CLOUD-582: Fix unit test assertion on email subject
                     41231: CLOUD-612: Add generation time to model.
                     41276: CLOUD-612: Added date to activity e-mail template
                     41279: CLOUD-614: Added missing footer text to activities e-mail
                     41502: CLOUD-611: Remove corner images
                     41728: CLOUD-681: Add others category to activities e-mail
                     42138: CLOUD-613: Remove exclusions from site activities, sort grouping by site name and improve logic for determining network.
                     42196: CLOUD-613: Group activities by site
                     42914: Translated e-mail templates
                44174: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1-EMAIL-REFRESH:
                     43983: GERMAN: Translation updates based on EN r43703
                     43984: SPANISH: Translation updates based on EN r43703
                     43985: FRENCH: Translation updates based on EN r43703, includes file missing from previous commit.
                     43986: ITALIAN: Translation updates based on EN r43703.
                     43987: JAPANESE: Translation updates based on EN r43703.
                     43990: BDE-108: add workaround of http://jira.codehaus.org/browse/MNG-4979 in Maven Surefire configuration to be able to use JaCoCo easily
                     44024: JAPANESE: Translation updates based on EN r43703. Corrects files missing from previous commit.
                     44031: JAPANESE: Translation updates based on EN r43703. Corrects file missed from previous commit.
                     44032: GERMAN: Translation updates based on EN r43703. Corrects missing line break.
                     44059: Merged BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2 to BRANCHES/DEV/CLOUD1:
                          43797: Merged BRANCHES/DEV/FEATURES/CLOUD1_SOLR to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                               42526: Merged BRANCHES/DEV/V4.0-BUG-FIX, BRANCHES/V4.1, BRANCHES/DEV/4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_SOLR for CLOUD-798
                                     V4.0-BUG_FIX
                                         36393: Final part of ALF-13723 SOLR does not include the same query unit tests as lucene
                                         36434: Test fix for ALF-13723 SOLR does not include the same query unit tests as lucene
                                         36608: First part of ALF-14209 SOLR - does not support query for all stores
                                         36676: Fix for ALF-14216 Solr Exception when you try to sort folders or files by size.
                                         36954: ALF-14209 SOLR - does not support query for all stores
                                         37075: Fix for ALF-14267 SOLR index check - First transaction time used instead of first ACL time - indexCheck, checkInitialState
                                         37135: Fix for ALF-13993 It fails to find documents whose tag is longer than 255 characters
                                         37253: Fix for ALF-13634 Re-created category won't show up again on a node in Document Library.
                                         37384: Fix for ALF-14219 SolrQueryHTTPClient unable to handle long queries (4096 bytes)
                                         37628: Build Fix
                                         37749: Fix for ALF-14582 SOLR tracking allows incompatible model changed to the current index to be made
                                         37863: Fix for ALF-14631 Extraneous Backslash in Solr Configuration File
                                         37896: Fix for ALF-14582 SOLR tracking allows incompatible model changed to the current index to be made
                                         38008: Fix for ALF-14042 Customisable Alfresco contextPath in Alfresco AbstractHttpClient (used e.g. by Solr CoreTracker)
                                         38010: Fix for ALF-14686 https://localhost:8443/solr/admin/cores?action=CHECK - checks the index - it should check the cache
                                     V4.1
                                         38179: Fix for ALF-14620 SOLR searches run by system user in archive store return fewer results than for admin user
                                     V4.1-BUG-FIX
                                         40401: Part for for ALF-15406 Index Tracker seems not to gracefully stop upon shutdown keeping all other threads in waiting
                                         41201: Fix for ALF-15767 Group query using cm:authorityName
                                         41202: Additional unit tests related to ALF-15731  TYPE:"..." queries no longer work for Lucene on 4.X
                                         41203: Part 1 for ALF-15811 SOLR query increases DocBitSet inefficiently
                                         41210: Part 2:  ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                         41303: Fix for ALF-15799 Under high concurrency load balanced Solr throws an Antlr related NPE
                                         41322: Fix for ALF-15858 SOLR ACL tracking can stall or miss acls during tracking
                                         41323: Chemistry client java to create test data for ALF-15858, ALF-15782, CLOUD-596, ALF-15753 etc
                                         41487: Fix for ALF-15910 SOLR - Add index warming and filter pointless entries from the filter cache
                                                Fix for ALF-15851 Too many live instances of SolrIndexSearcher at one time resulting in OOM - Alfresco 4.1.1 - build 151
                                         41730: Fix for ALF-15995 NodeRef is missing in log on "Problem converting to Freemarker" error
                                         41747: Fix for ALF-15811 SOLR query increases DocBitSet inefficiently
                                                Part of ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                         41748: Fix for ALF-15950 Solr: throws NPE: org.alfresco.solr.SolrLuceneAnalyser.loadAnalyzer
                                         41752: Fix for ALF-13634 Re-created category won't show up again on a node in Document Library.
                                         41940: Fix for ALF-16086 SOLR tracking does not include transformation status etc (error in header name)
                                         42136: Last SOLR side update for ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                         42143: In-memory bridge table for ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                         42183: Build fix - unit test runs in 64M - for all the washing machines out there ....
                               42547: Fix the model used for embedded tests.
                               42659: Add missing test model
                               42663: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_SOLR
                                     42612: Further fix for ALF-16164 Cloud monitoring of SOLR is CPU intensive due to its repeated use of the SOLR stats page 
                                     42657: Fix for     ALF-16359 Fix SOLR logging in production and other environments 
                               42660: (RECORD ONLY) Merged DEV/CLOUD1 to DEV/FEATURES/CLOUD_SOLR
                                     working copy sync r42514 through r42659
                          43799: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                               42377: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                    42363: ALF-16213: renaming versioned file results in file being deleted.
                               42411: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                    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
                               42428: ALF-16217: Remove unnecessary restriction on content type
                               42432: CLOUD-795: Optimise activities feed: rollup multiple (WebDAV) document adds/deletes into a single activity
                          43802: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                               42559: Merged BRANCHES/DEV/CLOUD1_SPRINT1/ to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                    42548: CLOUD-712: Ensure that all CSS files are loaded in IE (latest Spring Surf libs r1170)
                               42565: CLOUD-837: TenantContentUsageImpl does not handle failed lock
                          43811: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                               42570: CLOUD-810: ""emailFeedDisabled" in person JSON needs to be called "emailNotificationsEnabled""
                          43813: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                               42572: CLOUD-794: "Activities should be posted for CMIS (to enable both Public API + Mobile clients)"
                               42576: CLOUD-842: Activities Feed: post lookup - job lock + max items per cycle
                               42579: CLOUD-846: Minor optimisation for Site lookup (for a nodeRef)
                          43814: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                               42609: CLOUD-712: Updated Surf libs (r1171) to change the number of @import statements supported by each <style> element in IE from 32 to 31
                          43815: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                               42694: Fix build (merge issues) + fixes for CLOUD-839: "Activities Are Not Posted For Ratings", CLOUD-860: "Content Created With CMIS Cannot be Rated" and CLOUD-397: "The JSON response of the networks request is incorrect"
                          43816: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                               42737: CLOUD-463: Now checks if the current user has read permission for the shared node, before displaying "Document Details" button.
                               42847: CLOUD-794: "Activities should be posted for CMIS (to enable both Public API + Mobile clients)"
                               42868: Fix failing build tests + further/revised public api tests
                               42875: CLOUD-869: "Remove cmiscustom types from the CMIS dictionary"   
                               42884: ALF-1059 / CLOUD-469: Post activities for folder(s) add + delete
                               42899: Fix build
                          43817: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                               42950: CLOUD-726: Ensure that i18n messages fall back to properties defined by less specific locale files (updated Surf libs: 1174)
                          43818: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                               43138: Fixed CLOUD-491 "'New Folder' form is not displayed on IE7, IE8"
                               43234: CLOUD-313: Implment Transport pooling in email sender.
                               43349: Fix CLOUD-918: Failed to delete folder via Folder Details page
                               43351: Fix CLOUD-905 - activity for Share folder delete are not displayed (OK via WebDAV)
                               43440: CLOUD-928: Cope with missing shredId attributes, due to the copying of QuickShare properties, prior to CLOUD-593 
                               43451: Merged HEAD to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                    43449: ALF-16669: removing a site member may break the activity feed (CLOUD-931)   
                          43819: Fix merge error
                          43820: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                               43465: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)"
                          43821: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                               43477: Merged HEAD to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                    39205: Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD 
                                       39084: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.1-BUG-FIX 
                                       39081: Fix for ALF-6139 and ALF-13959 - Incomplete site creation issues - latest Surf libs and related changes to allow atomic creation of multiple Surf objects in a single REST call. Originally authored by Dave Ward for 3.2 - now migrated to SpringSurf. Implemented ADMRemoteStore changes for above change to apply to 4.0.
                               43488: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)"
                          43822: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                               43537: ALF-16706: CLONE - POI becoming irresponsive and causing jvm to freeze with XLS that includes fraction formats 
                                    43520: ALF-16694 POI becoming irresponsive and causing jvm to freeze for a while with certain XLS (fraction formats)
                                       - Patched POI to:
                                         - limit the length of fractions to four digits (more than that takes too long to process) e.g. "# #/#####" is too long and will be reduced to "# #/####" which still takes about a second!
                                         - handle the -ve fraction format part (i.e. n in p;n;z), so its length is not interpret as part of the fraction format of the +ve fraction part.
                                         - handle custom formats a bit better (strip them) rather than interpret the text length as part of the fraction format
                                         - handle -ve fractions (just did not work)
                                         - limitations:
                                           - custom text gets stripped (still better than before)
                                           - formats that have p (+ve) and n (-ve) parts must include a fraction format in each part. Otherwise +ve and -ve values are not formatted as a fraction (still better than before)
                               43564: CLOUD-939: <Record Only>
                                    43558: ALF-16694 POI becoming irresponsive and causing jvm to freeze with XLS that includes fraction formats
                                       - Original jar did not get removed in previous commit
                                       << NO NEED TO MERGE TO CLOUD1-BUG-FIX as there was a tree conflict and the original jar was removed. >>
                          43823: Fix merge error
                          43824: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                               43579: Public api test, fix intermittent test failures (hopefully)
                               43721: CLOUD-935: Update thor override of remoteadm.post.desc.xml
                               43726: PUBLICAPI-11: "Extract metadata needs to be called after uploading new content via CMIS"
                          43828: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                               43728: Merged BRANCHES/DEV/AMILLER/CLOUD1 to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                    38211: CLOUD-115 - Remove Network Admins on downgrade to free/public
                          43829: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                               43731: Resolve CLOUD-965: A known config which has been tested can be modified when deploying to production
                               43733: PUBLICAPI-11: "Extract metadata needs to be called after uploading new content via CMIS"
                               43762: Fix the build
                          43830: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                               43788: CLOUD-942: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                    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
                                    40112: ALF-9254: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1)
                                         40111: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration
                                            - Patched jooconverter to handle non western characters in text files, by using the same properties that JOD uses.
                                         40073: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration
                                            - Refactored JodContentTransformer and OpenOfficeContentTransformerWorker. Moved common code into OOoContentTransformerHelper,
                                              including fixes that existed on only one or the other.
                                            - For text files, change file encoding from SHIT JIS (and others) to UFT-8, as OpenOffice/LibreOffice do not support this as
                                              an input. They do support it in other file types but not text. JOD now works, but OOo still has problems.
                               43789: CLOUD-942: Add mergeinfo, missed by initial commit from Cornerstone. 
                          43831: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                               43488: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)"
                          43832: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                               43762: Fix the build
                          43833: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                               42692: (RECORD ONLY) Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                    40859: public api:
                                    40862: CLOUD-555: "Updating comment fails because node not found"
                                    40961: CLOUD-566: "Site object shouldn't contain the "sitePreset" property"
                                    40979: Added tests for non-numeric params and non-european characters
                                    41030: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/THOR1_REST_API2:
                                         41027: ALF-15193: "Folder Is Not a Folder CmisInvalidArgumentException thrown when using cmis:objectId"
                                    41097: Added quickshare and cloudsync to cmis filter list
                                    41098: Renamed serializer/deserializer lists for RestJsonModule
                                    41099: Cleaned up consistent Rest responses - CLOUD-574
                                    41100: Meta info webscript is disabled because its not been reviewed / in the correct format
                                    41104: Meta info webscript is really disabled because its not been reviewed / in the correct format
                                    41105: Added key for trusted layer7 relationship
                                    41137: Public api:
                                    41146: Fix trusted authentication against OpenCMIS
                                    41168: Public apI;
                                    41169: CLOUD-565: "API / URL returns a "tenant required" error"
                                    41170: public api:
                                    41171: public api:
                                    41172: public api:
                                    41183: CLOUD-598: "API: "GET network" response has unnecessary JSON nesting"
                                    41186: Fix solrcore properties
                                    41191: Fix for OpenCMIS trusted authentication to allow local opencmis access as before
                                    41282: CLOUD-616: "CMIS API: Repository names should be more descriptive"
                                    41283: CLOUD-601: "API /networkId/public/cmis/versions/ returns a 400"
                                    41325: Public api:
                                    41367: CLOUD-636: "REST API: Nodes: Tags: Not allowed DELETE method proceeds with status 204"
                                    41369: Public api:
                                    41422: Sample OAuth call for the Resource Owner Password flow
                                    41427: Sample OAuth call for the Client Credentials flow
                                    41433: Public api: (1) parameterize site members/people sorting in service api
                                    41434: Public api: minor comment service fix
                                    41438: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                    41439: Public api: fix for default tenant id in CMIS requests
                                    41449: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                    41456: CLOUD-644: "Performing a Checkout in OpenCMIS Results in an Exception in the Share Doc Library"
                                    41457: Fix build
                                    41461: Public api: more tests
                                    41521: CLOUD-660: "GET favourite sites results in exception when skipCount is greater than number of items"
                                    41606: Fix for CLOUD-668 - POSTing to a relationship by id now returns an InvalidArgumentException
                                    41607: CLOUD-668 : changed ordering so errors fire in correct order.
                                    41628: Public api: more tests
                                    41672: CLOUD-672: "404 Error when browsing child files/folder "
                                    41673: Public api: more tests
                                    41675: CLOUD-674: "Root network calls need to return application/json content type"
                                    41790: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                    41791: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                    41793: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                    41823: Public api: more tests
                                    41825: Fix for CLOUD-684 - wraps the list, not sure if I like the paging
                                    41853: CLOUD-700: "The mobile SDK needs a way to map an accessToken to a user identifier"
                                    41867: CLOUD-711: "It should be possible to remove a favourite site"
                                    41957: Public api: - error handling improvements - more tests
                                    41970: Public api: - fix build  (add missing files)
                                    41972: Public api: - more tests (including OpenCMIS TCK)
                                    42046: Added some debug timings.  Enabled using log4j.logger.org.alfresco.rest.framework.webscripts=debug
                                    42058: Public api: changed logging package name
                                    42124: Public api: - more tests - minor fixes
                                    42125: CLOUD-734: "CMIS: Query Issues Discovered During Testing"
                                    42126: Public api: fix up OpenCMIS tests
                                    42171: Consistency fix for CLOUD-695.
                                    42180: Fix build
                                    42181: CLOUD-695 "Requests to un-implemented urls do not consistently return http status 405 (Method not allowed)": fix up public api tests
                                    42214: Public api tests (cmis)
                                    42251: Changed the serializer for embedded entities, (related to CLOUD-746)
                                    42253: Fix build
                               42735: (RECORD ONLY) Fix build (fix merge error)
                          43834: Merged BRANCHES/DEV/FEATURES/CLOUD1_GOOGLEDOCS to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                               43702: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder
                               43703: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder
                               43744: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder
                          43846: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                               43840: [CLOUD-955] Add request header config to remove Origin Header in share proxy calls.
                          43855: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                               41731: Fix for ALF-16002 - Dashlet - My Documents - I've recently modified - executes unlimited query. In SOLR unlimited (all sites query) is really unlimited, for Lucene it is not. Improved jscript Search debugging to correctly output limit value on query.
                          43881: Revert CLOUD-942: Reverse merge r43830 
                          43885: CLOUD-942: Reapply changes backed out in r43881 and Comment out faling unit tests.
                          43921: Resolve CLOUD-990: REGRESS: No items error is displayed on DocumentLibrary Page (for some files)
                          43924: Disable intermittent OpenCMIS tests
                          43925: Disable intermittent test
                          43952: CLOUD-993: Insure login button is shown when user isn't logged in.
                          43992: Resolve CLOUD-1001: REGRESS: New Application Theme and Logo are not applied after re-login
                44185: Merged BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE to BRANCHES/DEV/FEATURES/CLOUD1-EMAIL-REFRESH:
                     43021: CLOUD-803, CLOUD-487: Send localised e-mails
                     43024: CLOUD-486 - Choose UI language.
                     43085: CLOUD-803, CLOUD-487: Revert changes to pre-existing process(String, Object, Writer) method.
                     43086: CLOUD-803, CLOUD-487: Fix broken unit tests
                     43106: CLOUD-486 - Choose UI language.
                     43159: CLOUD-486 - Choose UI language.
                     43160: CLOUD-803, CLOUD-487: Fix broken unit tests
                     43182: CLOUD-803, CLOUD-487: Fix broken unit tests.
                     43230: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE:
                          42950: CLOUD-726: Ensure that i18n messages fall back to properties defined by less specific locale files (updated Surf libs: 1174)
                     43246: Bug fix for CLOUD-899.  Added if to catch null values.
                     43267: CLOUD-486 - Choose UI language.
                     43329: CLOUD-911 - Localization change is not working in the preference page from CLOUD-486 - Fixed by setting cookie path to /
                     43626: CLOUD-909 - Keep Email address when language changes
                     43631: CLOUD-909 - Keep Email address when language changes - Updated Spring Surf version
                     43704: Enables all currently cloud supported languages in Cloud specific config file
                     43723: CLOUD-486 - Fix right border of select options and add extra languages
                     43880: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE:
                          43879: FRENCH: Translation updates based on EN r43703
                     43965: CLOUD-486 - Add French, German, Spanish, Italian and Japanese for new fields and pages.
                     43988: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE:
                          43983: GERMAN: Translation updates based on EN r43703
                          43984: SPANISH: Translation updates based on EN r43703
                          43985: FRENCH: Translation updates based on EN r43703, includes file missing from previous commit.
                          43986: ITALIAN: Translation updates based on EN r43703.
                          43987: JAPANESE: Translation updates based on EN r43703.
                     44021: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE:
                          42871: GERMAN: Cloud Translation, based on r 42416
                          42879: SPANISH: Cloud Translation, based on r 42416
                          42890: ITALIAN: Cloud Translation, based on r 42416
                     44026: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE:
                          44024: JAPANESE: Translation updates based on EN r43703. Corrects files missing from previous commit.
                     44033: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE:
                          44031: JAPANESE: Translation updates based on EN r43703. Corrects file missed from previous commit.
                          44032: GERMAN: Translation updates based on EN r43703. Corrects missing line break.
                     44077: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE:
                          43721: CLOUD-935: Update thor override of remoteadm.post.desc.xml
                     44093: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_UI_LANGUAGE:
                          42867: CLOUD-71: add explicit schema number for workflow timers redeploy patch
                          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
                          43120: 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
                          43243: BDE-73: Fork for each test, otherwise some fail because of previous test leftovers
                          43323: Merged BRANCHES/DEV/FEATURES/CLOUD1_GRANULARPERMISSIONS1 to BRANCHES/DEV/CLOUD1:
                               42257: CLOUD-649: Updates UI action for Granular Permissions
                               42295: CLOUD-33: Updates labels
                               42303: CLOUD-651: Limit user search to site members only.
                               42352: CLOUD-780: Adds a rolesWhitelist to only display those roles that are allowed. Currently set to: ["Consumer", "Contributor", "Collaborator"]. This is only used in the site view. The Repository view behaviour has not changed.
                               42427: Removes multi-select manage-permissions dialogue.
                               42520: CLOUD-802: Change the way the user is returned to the previous page to work around suspected Chrome bug.
                               42604: CLOUD-840: Automatically add SiteManger permisions when inheritAll is switched off. Pervent remaoval of siteManager authority.
                               42606: Fixed CLOUD-840 "Granular Permissions: Site Manager should retain access when inherit permissions is turned off"
                               42807: CLOUD-863: Reordered code to avoid AccessDeniedException
                               43259: CLOUD-901: Revert showComments check so it handles undefined permission
                               43266: CLOUD-900: Old Manage permissions form is opened via Permissions panel
                               43307: CLOUD-900: Follow-up fix
                          43353: Fix for remote transform server with new cloud environment
                          43457: Merged BRANCHES/DEV/FEATURES/CLOUD1_GOOGLEDOCS to BRANCHES/DEV/CLOUD1:
                               39869: Merged BRANCHES/V4.1 to BRANCHES/DEV/FEATURES/CLOUD1_GOOGLEDOCS:
                                    Merged /integrations/GoogleDocs/BRANCHES/THOR1_SPRINTS_GOOGLEDOCS to BRANCHES/V4.1   
                                      36307 Fixed THOR-1402 "Need a callback option for Create Content menu"
                                         - Will be revisited to add better comments
                                      36350 Fixed THOR-1402 "Need a callback option for Create Content menu" part 2
                                         - Changed callback obj to match action object better: { nodeRef, node, jsNode }
                                         - Better code documentation
                                         - Removed dev/test code
                                         - Improved error config handling
                                      36358 THOR-1402 "Need a callback option for Create Content menu" part 3
                                         - Changed "link" parameter to "href" (instead of "page") to match actions.
                                      39256 Consistency fix of doclib & repo toolbar templates after work on THOR-1402
                                      39260 Bugfix for "destination" parameter not being resolved correctly THOR-1402
                               39875: Configurtion changes to enable Google Docs V2 within the web tier.
                               39881: It's extension ... not extention
                               39938: Update CLOUD1_GOOGLEDOCS ant build to include installing googledocs amp files
                               39944: CLOUD-437: Ensure that custom doclib action resources are requested after documentlist.js
                               40468: Alfresco GoogleDocs AMPS.  Fixes for [GOOGLEDOCS-73], [GOOGLEDOCS-70], [GOOGLEDOCS-75], [GOOGLEDOCS-76]
                               40624: Update Google Docs AMPs
                               40635: Merge Google Docs Cloud AMPS to Feature Branchs
                               40824: Update Google Docs AMPS, fixing [GOOGLEDOCS-79]
                               40897: Google Docs AMP update 
                               41165: Merge Updated AMPs for [GOOGLEDOCS-83]
                               41179: Update AMPs for [GOOGLEDOCS-87]
                               41262: Update AMPs for GOOGLEDOCS-89
                               41493: Update AMPs for [GOOGLEDOCS-93]
                               41635: AMP update for [GOOLGEDOCS-98] [GOOGLEDOCS-99] [GOOGLEDOCS-100]
                               41805: Update AMPs for [GOOGLEDOCS-101]
                               41840: Add AMPs with i18n strings
                               43316: (RECORD ONLY) Rebase CLOUD1_GOOGLEDOCS with CLOUD1
                               43317: (RECORD ONLY) Re-merge build.properties and projects.xml to include googledocs amps in build
                               43320: Add googledocs repo declaration
                          43538: Fix pesky solrcore.properties ... remove hardcoded amiller ;-)
                          43605: Merged BRANCHES/DEV/FEATURES/CLOUD1_TRIAL_NETWORK to BRANCHES/DEV/CLOUD1:
                               43033: Merged BRANCHES/DEV/AMILLER/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1_TRIAL_NETWORK:
                                    39313: CLOUD-194: Add new trial network account type.
                                    39332: CLOUD-194: Add translation for new network account type.
                               43218: CLOUD-194: Change Trail Network subscription level to Enterprise
                          43658: Merged HEAD to BRANCHES/DEV/CLOUD1:
                               43655: BDE-73: exclude more failing tests which are never run
                               43653: BDE-73: tune surefire config to make it pass with Sonar 3.3
                          43752: Merged HEAD to CLOUD1
                               BDE-73: Repair coverage report, broken since Sonar upgrade   
                          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.
                          43990: BDE-108: add workaround of http://jira.codehaus.org/browse/MNG-4979 in Maven Surefire configuration to be able to use JaCoCo easily
                          44059: Merged BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2 to BRANCHES/DEV/CLOUD1:
                               43797: Merged BRANCHES/DEV/FEATURES/CLOUD1_SOLR to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                    42526: Merged BRANCHES/DEV/V4.0-BUG-FIX, BRANCHES/V4.1, BRANCHES/DEV/4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_SOLR for CLOUD-798
                                          V4.0-BUG_FIX
                                              36393: Final part of ALF-13723 SOLR does not include the same query unit tests as lucene
                                              36434: Test fix for ALF-13723 SOLR does not include the same query unit tests as lucene
                                              36608: First part of ALF-14209 SOLR - does not support query for all stores
                                              36676: Fix for ALF-14216 Solr Exception when you try to sort folders or files by size.
                                              36954: ALF-14209 SOLR - does not support query for all stores
                                              37075: Fix for ALF-14267 SOLR index check - First transaction time used instead of first ACL time - indexCheck, checkInitialState
                                              37135: Fix for ALF-13993 It fails to find documents whose tag is longer than 255 characters
                                              37253: Fix for ALF-13634 Re-created category won't show up again on a node in Document Library.
                                              37384: Fix for ALF-14219 SolrQueryHTTPClient unable to handle long queries (4096 bytes)
                                              37628: Build Fix
                                              37749: Fix for ALF-14582 SOLR tracking allows incompatible model changed to the current index to be made
                                              37863: Fix for ALF-14631 Extraneous Backslash in Solr Configuration File
                                              37896: Fix for ALF-14582 SOLR tracking allows incompatible model changed to the current index to be made
                                              38008: Fix for ALF-14042 Customisable Alfresco contextPath in Alfresco AbstractHttpClient (used e.g. by Solr CoreTracker)
                                              38010: Fix for ALF-14686 https://localhost:8443/solr/admin/cores?action=CHECK - checks the index - it should check the cache
                                          V4.1
                                              38179: Fix for ALF-14620 SOLR searches run by system user in archive store return fewer results than for admin user
                                          V4.1-BUG-FIX
                                              40401: Part for for ALF-15406 Index Tracker seems not to gracefully stop upon shutdown keeping all other threads in waiting
                                              41201: Fix for ALF-15767 Group query using cm:authorityName
                                              41202: Additional unit tests related to ALF-15731  TYPE:"..." queries no longer work for Lucene on 4.X
                                              41203: Part 1 for ALF-15811 SOLR query increases DocBitSet inefficiently
                                              41210: Part 2:  ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                              41303: Fix for ALF-15799 Under high concurrency load balanced Solr throws an Antlr related NPE
                                              41322: Fix for ALF-15858 SOLR ACL tracking can stall or miss acls during tracking
                                              41323: Chemistry client java to create test data for ALF-15858, ALF-15782, CLOUD-596, ALF-15753 etc
                                              41487: Fix for ALF-15910 SOLR - Add index warming and filter pointless entries from the filter cache
                                                     Fix for ALF-15851 Too many live instances of SolrIndexSearcher at one time resulting in OOM - Alfresco 4.1.1 - build 151
                                              41730: Fix for ALF-15995 NodeRef is missing in log on "Problem converting to Freemarker" error
                                              41747: Fix for ALF-15811 SOLR query increases DocBitSet inefficiently
                                                     Part of ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                              41748: Fix for ALF-15950 Solr: throws NPE: org.alfresco.solr.SolrLuceneAnalyser.loadAnalyzer
                                              41752: Fix for ALF-13634 Re-created category won't show up again on a node in Document Library.
                                              41940: Fix for ALF-16086 SOLR tracking does not include transformation status etc (error in header name)
                                              42136: Last SOLR side update for ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                              42143: In-memory bridge table for ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                                              42183: Build fix - unit test runs in 64M - for all the washing machines out there ....
                                    42547: Fix the model used for embedded tests.
                                    42659: Add missing test model
                                    42663: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_SOLR
                                          42612: Further fix for ALF-16164 Cloud monitoring of SOLR is CPU intensive due to its repeated use of the SOLR stats page 
                                          42657: Fix for     ALF-16359 Fix SOLR logging in production and other environments 
                                    42660: (RECORD ONLY) Merged DEV/CLOUD1 to DEV/FEATURES/CLOUD_SOLR
                                          working copy sync r42514 through r42659
                               43799: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                    42377: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                         42363: ALF-16213: renaming versioned file results in file being deleted.
                                    42411: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                         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
                                    42428: ALF-16217: Remove unnecessary restriction on content type
                                    42432: CLOUD-795: Optimise activities feed: rollup multiple (WebDAV) document adds/deletes into a single activity
                               43802: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                    42559: Merged BRANCHES/DEV/CLOUD1_SPRINT1/ to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                         42548: CLOUD-712: Ensure that all CSS files are loaded in IE (latest Spring Surf libs r1170)
                                    42565: CLOUD-837: TenantContentUsageImpl does not handle failed lock
                               43811: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                    42570: CLOUD-810: ""emailFeedDisabled" in person JSON needs to be called "emailNotificationsEnabled""
                               43813: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                    42572: CLOUD-794: "Activities should be posted for CMIS (to enable both Public API + Mobile clients)"
                                    42576: CLOUD-842: Activities Feed: post lookup - job lock + max items per cycle
                                    42579: CLOUD-846: Minor optimisation for Site lookup (for a nodeRef)
                               43814: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                    42609: CLOUD-712: Updated Surf libs (r1171) to change the number of @import statements supported by each <style> element in IE from 32 to 31
                               43815: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                    42694: Fix build (merge issues) + fixes for CLOUD-839: "Activities Are Not Posted For Ratings", CLOUD-860: "Content Created With CMIS Cannot be Rated" and CLOUD-397: "The JSON response of the networks request is incorrect"
                               43816: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                    42737: CLOUD-463: Now checks if the current user has read permission for the shared node, before displaying "Document Details" button.
                                    42847: CLOUD-794: "Activities should be posted for CMIS (to enable both Public API + Mobile clients)"
                                    42868: Fix failing build tests + further/revised public api tests
                                    42875: CLOUD-869: "Remove cmiscustom types from the CMIS dictionary"   
                                    42884: ALF-1059 / CLOUD-469: Post activities for folder(s) add + delete
                                    42899: Fix build
                               43817: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                    42950: CLOUD-726: Ensure that i18n messages fall back to properties defined by less specific locale files (updated Surf libs: 1174)
                               43818: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                    43138: Fixed CLOUD-491 "'New Folder' form is not displayed on IE7, IE8"
                                    43234: CLOUD-313: Implment Transport pooling in email sender.
                                    43349: Fix CLOUD-918: Failed to delete folder via Folder Details page
                                    43351: Fix CLOUD-905 - activity for Share folder delete are not displayed (OK via WebDAV)
                                    43440: CLOUD-928: Cope with missing shredId attributes, due to the copying of QuickShare properties, prior to CLOUD-593 
                                    43451: Merged HEAD to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                         43449: ALF-16669: removing a site member may break the activity feed (CLOUD-931)   
                               43819: Fix merge error
                               43820: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                    43465: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)"
                               43821: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                    43477: Merged HEAD to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                         39205: Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD 
                                            39084: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.1-BUG-FIX 
                                            39081: Fix for ALF-6139 and ALF-13959 - Incomplete site creation issues - latest Surf libs and related changes to allow atomic creation of multiple Surf objects in a single REST call. Originally authored by Dave Ward for 3.2 - now migrated to SpringSurf. Implemented ADMRemoteStore changes for above change to apply to 4.0.
                                    43488: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)"
                               43822: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                    43537: ALF-16706: CLONE - POI becoming irresponsive and causing jvm to freeze with XLS that includes fraction formats 
                                         43520: ALF-16694 POI becoming irresponsive and causing jvm to freeze for a while with certain XLS (fraction formats)
                                            - Patched POI to:
                                              - limit the length of fractions to four digits (more than that takes too long to process) e.g. "# #/#####" is too long and will be reduced to "# #/####" which still takes about a second!
                                              - handle the -ve fraction format part (i.e. n in p;n;z), so its length is not interpret as part of the fraction format of the +ve fraction part.
                                              - handle custom formats a bit better (strip them) rather than interpret the text length as part of the fraction format
                                              - handle -ve fractions (just did not work)
                                              - limitations:
                                                - custom text gets stripped (still better than before)
                                                - formats that have p (+ve) and n (-ve) parts must include a fraction format in each part. Otherwise +ve and -ve values are not formatted as a fraction (still better than before)
                                    43564: CLOUD-939: <Record Only>
                                         43558: ALF-16694 POI becoming irresponsive and causing jvm to freeze with XLS that includes fraction formats
                                            - Original jar did not get removed in previous commit
                                            << NO NEED TO MERGE TO CLOUD1-BUG-FIX as there was a tree conflict and the original jar was removed. >>
                               43823: Fix merge error
                               43824: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                    43579: Public api test, fix intermittent test failures (hopefully)
                                    43721: CLOUD-935: Update thor override of remoteadm.post.desc.xml
                                    43726: PUBLICAPI-11: "Extract metadata needs to be called after uploading new content via CMIS"
                               43828: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                    43728: Merged BRANCHES/DEV/AMILLER/CLOUD1 to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                         38211: CLOUD-115 - Remove Network Admins on downgrade to free/public
                               43829: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                    43731: Resolve CLOUD-965: A known config which has been tested can be modified when deploying to production
                                    43733: PUBLICAPI-11: "Extract metadata needs to be called after uploading new content via CMIS"
                                    43762: Fix the build
                               43830: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                    43788: CLOUD-942: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                         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
                                         40112: ALF-9254: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1)
                                              40111: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration
                                                 - Patched jooconverter to handle non western characters in text files, by using the same properties that JOD uses.
                                              40073: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration
                                                 - Refactored JodContentTransformer and OpenOfficeContentTransformerWorker. Moved common code into OOoContentTransformerHelper,
                                                   including fixes that existed on only one or the other.
                                                 - For text files, change file encoding from SHIT JIS (and others) to UFT-8, as OpenOffice/LibreOffice do not support this as
                                                   an input. They do support it in other file types but not text. JOD now works, but OOo still has problems.
                                    43789: CLOUD-942: Add mergeinfo, missed by initial commit from Cornerstone. 
                               43831: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                    43488: Fixed CLOUD-933 "Invite to site (alfresco.com network) takes 30 secs + (or even 2.5 mins +)"
                               43832: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                    43762: Fix the build
                               43833: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                    42692: (RECORD ONLY) Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1-BUG-FIX:
                                         40859: public api:
                                         40862: CLOUD-555: "Updating comment fails because node not found"
                                         40961: CLOUD-566: "Site object shouldn't contain the "sitePreset" property"
                                         40979: Added tests for non-numeric params and non-european characters
                                         41030: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/THOR1_REST_API2:
                                              41027: ALF-15193: "Folder Is Not a Folder CmisInvalidArgumentException thrown when using cmis:objectId"
                                         41097: Added quickshare and cloudsync to cmis filter list
                                         41098: Renamed serializer/deserializer lists for RestJsonModule
                                         41099: Cleaned up consistent Rest responses - CLOUD-574
                                         41100: Meta info webscript is disabled because its not been reviewed / in the correct format
                                         41104: Meta info webscript is really disabled because its not been reviewed / in the correct format
                                         41105: Added key for trusted layer7 relationship
                                         41137: Public api:
                                         41146: Fix trusted authentication against OpenCMIS
                                         41168: Public apI;
                                         41169: CLOUD-565: "API / URL returns a "tenant required" error"
                                         41170: public api:
                                         41171: public api:
                                         41172: public api:
                                         41183: CLOUD-598: "API: "GET network" response has unnecessary JSON nesting"
                                         41186: Fix solrcore properties
                                         41191: Fix for OpenCMIS trusted authentication to allow local opencmis access as before
                                         41282: CLOUD-616: "CMIS API: Repository names should be more descriptive"
                                         41283: CLOUD-601: "API /networkId/public/cmis/versions/ returns a 400"
                                         41325: Public api:
                                         41367: CLOUD-636: "REST API: Nodes: Tags: Not allowed DELETE method proceeds with status 204"
                                         41369: Public api:
                                         41422: Sample OAuth call for the Resource Owner Password flow
                                         41427: Sample OAuth call for the Client Credentials flow
                                         41433: Public api: (1) parameterize site members/people sorting in service api
                                         41434: Public api: minor comment service fix
                                         41438: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                         41439: Public api: fix for default tenant id in CMIS requests
                                         41449: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                         41456: CLOUD-644: "Performing a Checkout in OpenCMIS Results in an Exception in the Share Doc Library"
                                         41457: Fix build
                                         41461: Public api: more tests
                                         41521: CLOUD-660: "GET favourite sites results in exception when skipCount is greater than number of items"
                                         41606: Fix for CLOUD-668 - POSTing to a relationship by id now returns an InvalidArgumentException
                                         41607: CLOUD-668 : changed ordering so errors fire in correct order.
                                         41628: Public api: more tests
                                         41672: CLOUD-672: "404 Error when browsing child files/folder "
                                         41673: Public api: more tests
                                         41675: CLOUD-674: "Root network calls need to return application/json content type"
                                         41790: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                         41791: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                         41793: CLOUD-629: "REST API: It is possible to add a comment to comment"
                                         41823: Public api: more tests
                                         41825: Fix for CLOUD-684 - wraps the list, not sure if I like the paging
                                         41853: CLOUD-700: "The mobile SDK needs a way to map an accessToken to a user identifier"
                                         41867: CLOUD-711: "It should be possible to remove a favourite site"
                                         41957: Public api: - error handling improvements - more tests
                                         41970: Public api: - fix build  (add missing files)
                                         41972: Public api: - more tests (including OpenCMIS TCK)
                                         42046: Added some debug timings.  Enabled using log4j.logger.org.alfresco.rest.framework.webscripts=debug
                                         42058: Public api: changed logging package name
                                         42124: Public api: - more tests - minor fixes
                                         42125: CLOUD-734: "CMIS: Query Issues Discovered During Testing"
                                         42126: Public api: fix up OpenCMIS tests
                                         42171: Consistency fix for CLOUD-695.
                                         42180: Fix build
                                         42181: CLOUD-695 "Requests to un-implemented urls do not consistently return http status 405 (Method not allowed)": fix up public api tests
                                         42214: Public api tests (cmis)
                                         42251: Changed the serializer for embedded entities, (related to CLOUD-746)
                                         42253: Fix build
                                    42735: (RECORD ONLY) Fix build (fix merge error)
                               43834: Merged BRANCHES/DEV/FEATURES/CLOUD1_GOOGLEDOCS to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                    43702: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder
                                    43703: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder
                                    43744: Fix CLOUD-950: Cannot create GoogleDoc in Synced Folder
                               43846: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                    43840: [CLOUD-955] Add request header config to remove Origin Header in share proxy calls.
                               43855: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1-BUG-FIX2:
                                    41731: Fix for ALF-16002 - Dashlet - My Documents - I've recently modified - executes unlimited query. In SOLR unlimited (all sites query) is really unlimited, for Lucene it is not. Improved jscript Search debugging to correctly output limit value on query.
                               43881: Revert CLOUD-942: Reverse merge r43830 
                               43885: CLOUD-942: Reapply changes backed out in r43881 and Comment out faling unit tests.
                               43921: Resolve CLOUD-990: REGRESS: No items error is displayed on DocumentLibrary Page (for some files)
                               43924: Disable intermittent OpenCMIS tests
                               43925: Disable intermittent test
                               43952: CLOUD-993: Insure login button is shown when user isn't logged in.
                               43992: Resolve CLOUD-1001: REGRESS: New Application Theme and Logo are not applied after re-login
                44196: CLOUD-678 - Incorrect link for 'To change your notifications settings, go here.' message
                44201: CLOUD-486 - Choose UI language
                44202: CLOUD-487: Fix emails after merge of template refresh and localised mail features
                   44414: JAPANESE: Cloud email template translation
                44622: Fixes: CLOUD-1037 - removes unnecessary elements from inside the a tag.
                44623: Cloud-189 - Corrects text and layout for already created email templates.
                44624: Fixes: CLOUD-1044: Updates Email template
                44625: Fixes: CLOUD-1042: Updates Email template
                44626: Fixes: CLOUD-1043: Updates Email template
                44627: Fixes: CLOUD-1041: Updates Email template
                44764: CLOUD-1080: Fixes encoding error.
                44767: CLOUD-1086: Text update to email template
                44888: Email template updates - fixes CLOUD-1099 and CLOUD-1102.
                44892: Fixes error with Activities email - the template fails to process if the only activities are based on follow events. It now processes and gets sent, but with some confusion, see CLOUD-1123
                44914: Fixes CLOUD-1097 - Alt text not displaying due to unspecified image dimensions and colour. Also minor code clean up.
                45145: CLOUD-1123 - Filter out "Following" activities from activity feed email.
                45251: Email template text updates following review.
                45289: Fix issue where email was not sent for 'Invite People'
                45306: Externalises strings for cloud emails
                45316: Adds some defensive code to prevent unused variables being a problem for templates.
                45328: Email translation updates
                45334: Resolve CLOUD-1162: Ability to change sign-up, reminder and reset password timer durations via properties
                45369: Fixes Following Email template
                45376: Resolve CLOUD-1172: Following email does not show domain correctly
                45401: Corrects layout bug in email template
                45407: Removes unnecessary full stop.
                45408: Adds missing email template translations
                45430: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/FEATURES/CLOUD1-EMAIL-REFRESH:
                     45329: FRENCH: Cloud translation updates based on EN r45266
                     45330: GERMAN: Cloud translation updates based on EN r45266
                     45332: SPANISH: Cloud translation updates based on EN r45266
                     45333: JAPANESE: Cloud translation updates based on EN r45266
                     45427: SPANISH: Cloud 1 translation updates based on EN r45266
                45453: Fix for CLOUD-1164 - Failed login is not handled correctly (on email refresh branch)
                45474: Fixes: CLOUD-1189: Incorrect variable used in translated property files.
                45484: Fixes: CLOUD-1190 incorrect quote marks in JA file
                45487: CLOUD-1186: Fixes issue with reminder emails not being localised.
                45501: Potential fix for: CLOUD-678
                45503: Resolve CLOUD-1188: Emails are not rendered as HTML, even though they are HTML
                45539: Resolve CLOUD-1195: Invite people email not rendering as HTML, even though it is HTML
                45559: CLOUD-1197: Fixes issue with reset password template not recognising all the variables in all cases.
                45579: Resolve CLOUD-1186: Email not localized, CLOUD-1202: Invite people / Invite site email sometimes comes in English and is not localized
                45609: Resolve test failures introduced fixing CLOUD-1186
                45613: Resolve CLOUD-1210: Locale is not replicated across tenants if a user has been invited to one or more secondary tenants
                45616: Resolve CLOUD-1205: activities email template the feed are not localized
                45642: Fixes: CLOUD-1211 and CLOUD-1212 - externalises two hard coded strings. Translations to follow.
                45645: CLOUD-1205: activities email template the feed are not localized
                45646: CLOUD-1203: Invite to Site and site reminder the role should be localized
                45654: ALL LANG: Translation updates to email templates, following fixes made for CLOUD-1212, CLOUD-1211.
                45678: Removes hidden chars at start of the file.
                45680: Fixes more hidden chars that the start of UTF8 files.
                45683: Fixes: CLOUD-1216: Typo in Italian properties file.
                45693: Resolve CLOUD-1204: Task type in the workflow emails are not localized
                45702: Minor translation updates following linguistic review.
                45717: GERMAN: Translation updates based on linguistic review
                45719: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1/ to BRANCHES/DEV/FEATURES/CLOUD1-EMAIL-REFRESH:
                     45718: ITALIAN: Translation updates based on EN r45266 (missed from previous bundle import)
                45797: Resolve CLOUD-1226: The task details are not showing in localized details in task list
                45798: Fix single quote encoding in language property file (related to CLOUD-1230, but does not resolve it across the board).
   48304: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        48301: CONV: Revert temp logging (added in r47356)
        48303: CONV: Fix CLOUD-1449 - cannot login to Share as MT (admin) user
   48306: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47379: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: (note: web.xml reverted - initially will be covered by cloud overlay until public api is "merged")
             41754: Merged BRANCHES/DEV/FEATURES/CLOUD1_LAYER7 to BRANCHES/DEV/CLOUD1:
                  41677: No-op skeletons of Public API gateway filter and URL rewrite filter
                  41683: Url rewrite rules for new and old-style public api
                  41705: First working version of gateway filter
                  41732: Trim authenticator keys from config
                  41734: Productising code - tests and bug fixing with layer7, code tidyup, configuration, error handling
                  41753: SSL support for accepting self-signed certificates
   48307: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47382: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             41842: CLOUD-619: "CMIS query for objectId throws exception"
        47400: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             41843: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                  41790: CLOUD-629: "REST API: It is possible to add a comment to comment"
                  41791: CLOUD-629: "REST API: It is possible to add a comment to comment"
                  41793: CLOUD-629: "REST API: It is possible to add a comment to comment"
                  41823: Public api: more tests
                  41825: Fix for CLOUD-684 - wraps the list, not sure if I like the paging
   48310: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47406: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             42206: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/CLOUD1:
                  41213: CLOUD-452: reconfigure Activities DAOs to use common Alfresco datasource
                  41214: CLOUD-452: reconfigure Activities DAOs to use common Alfresco datasource (DO NOT MERGE to Enterprise/HEAD)
                  41270: CLOUD-452 / ALF-15823: reconfigure Activities DAOs to use common Alfresco datasource
        47408: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             42209: Merged BRANCHES/DEV/CLOUD1-BUG-FIX to BRANCHES/DEV/CLOUD1:
                  41292: CLOUD-520: Convert TicketCleanupJob to a StatfulJob
                  41410: CLOUD-119: Change status code to 409 (Conflict), from 400 (Bad Request), when parent folder does not exist
   48311: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47416: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             42285: Merged BRANCHES/DEV/THOR1_REST_API2 to BRANCHES/DEV/CLOUD1:
                  41867: CLOUD-711: "It should be possible to remove a favourite site"
                  41957: Public api: - error handling improvements - more tests
                  41970: Public api: - fix build  (add missing files)
                  41972: Public api: - more tests (including OpenCMIS TCK)
                  42046: Added some debug timings.  Enabled using log4j.logger.org.alfresco.rest.framework.webscripts=debug
                  42058: Public api: changed logging package name
                  42124: Public api: - more tests - minor fixes
                  42125: CLOUD-734: "CMIS: Query Issues Discovered During Testing"
                  42126: Public api: fix up OpenCMIS tests
                  42171: Consistency fix for CLOUD-695.
                  42180: Fix build
                  42181: CLOUD-695 "Requests to un-implemented urls do not consistently return http status 405 (Method not allowed)": fix up public api tests
                  42214: Public api tests (cmis)
                  42251: Changed the serializer for embedded entities, (related to CLOUD-746)
                  42253: Fix build
             42320: Fix build (fix dodgy merge)
   48313: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47492: Fix build/tests - CMISTest.testCancelCheckout & OpenCmisLocalTest.testALF10085 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@48347 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2013-03-19 14:16:01 +00:00
Jan Vonka
6e5b951fe5 Merged BRANCHES/DEV/CONV_HEAD to HEAD: 
48055: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
         46833: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
            Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                30799: THOR-172: Switch Tenant via public API
         46836: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
            Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                30853: Initial implementation of THOR-209. Webscript to get invitation/invitee status.
                30855: More on THOR-209. Added siteTenantTitle to the webscript response.
                30858: Apply generated cloud license
                30859: Miscellaneous tidy-ups and refactorings, additional documentation and some webscript JSON additions. All as part of THOR-209.
                30860: Miscellaneous doc improvements around the MT/Activiti workarounds.
                30861: Removing unnecessary TenantUtil.runas in test code.
                30863: THOR-204. Dev mode option to send invite/sign-up emails to spring-injected address.
                30865: Temporarily disable subscriptions (followers) - pending ALF-9957
                30866: THOR-175: Set and enforce file space quota for tenant
                30868: Deleted obsolete/empty dir
                30869: THOR-210: disable jobs that are not used/required (eg. AVM orphan reaper)
                30870: THOR-209. Have fixed up issue with getting properties from completed workflow instances.
                    Changed invitation to use pathInstanceId instead of taskId as the 'id' for these workflows. Now consistent with signup. Commented in the test that calls invitee-status.get
                30871: THOR-209. Adding the inviteeIsActivated value to the webscript response.
                30872: THOR-204. When emails are sent to the dev-only, spring-injected email address, the subject is now prefixed with the orig
                30879: THOR-209. Making sure inviteeIsActivated is present for both in-flight and completed workflows.
                30883: Resolve THOR-212
                30895: THOR-172: Switch Tenant via public API
                30896: THOR-209. Renaming some files so that they refer to invitation status rather than invitee status. Also added some documentation to make this dicstinction clearer. This is not a general purpose script to get the status of an invitee to a site. It is only for checking if a particular invitation workflow is complete and then getting some additional state data.
                30897: THOR-175: Set and enforce file space quota for tenant
                30900: Changing invitation-status webscript to auth=none; runas=Admin to support invitation flow of exteernal users. Part of THOR-209.
        46845: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
            Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                30967: Invite & signup improvemengts
                30969: Share Activities
                30976: Remove unreliable hosts from isReachableDomain test
   48066: Merged DEV/CONV_V413 to DEV/CONV_HEAD (RECORD ONLY)
        46857: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35731: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              31149: Initial Commit of Analytics Service
              31150: Second draft of Analytics Service
              31151: First cut of forms runtime supporting balloons on "blur" event as requested
              31163: FORMS RUNTIME CHECKPOINT - before making the yellow mandatory only being displayed "on load and until focused"
              31168: Refactored Analytics Service to be static
              31170: Forms runtime as agreed in meeting
   48067: Merged DEV/CONV_V413 to DEV/CONV_HEAD (RECORD ONLY)
        46861: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35752: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              31220: THOR-49. Implementation of Reset Forgotten Password workflow.
              31227: (RECORD ONLY) Fix merge error
              31237: Add email validation to registration and invite services:
              31239: THOR-219: Merge fix (re-disable Repo<->SOLR ssl config)
   48069: Merged DEV/CONV_V413 to DEV/CONV_HEAD (RECORD ONLY)
        46864: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35754: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              31240: MultiSelectAutoComplete now has configurable validation (& tooltips)
              31241: Tenant site count usage/quota - exposed via Account API
              31250: Made events enumerations
              31251: Forgot to add AnalyticsEvent class to previous commit
              31271: Attempt at fixing test dependencies and remove intermittent test
   48070: Merged DEV/CONV_V413 to DEV/CONV_HEAD (NOTE! Added TenantXxxx classes and change in FormUIGet Will be removed in later revisions)
        46911: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35757: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              31367: Merged BRANCHES/DEV/THOR1SURF to BRANCHES/DEV/THOR1:
                   30971: (RECORD ONLY) Creating SURF update branch for THOR1
                   30979: Commit initial Surf lib changes, Cloud classes and config overrides
                   30980: Add custom Cloud Surf authenticator, connector, remote store, user and user factory
                   31015: Renamed classes and references from Cloud to Tenant, custom page view, page view resolvers, URLModel + factory, URLHelper + factory
                   31076: Successful signup and page redirection
                   31091: Correct redirects from <application context> and <application context>/<tenant name> URLs
                   31098: Updated Surf libs
                   31132: Tenant specific implementation of PathStoreObjectPersister - Surf modelobject cache is now partitioned by the tenant name.
                   31133: Updated Surf libs and JavaDoc updates
                   31155: Initial code to handle attempted access to unauthorised tenants, secondary tenants added to TenantUser and page/activations filter rule
                   31210: Fixed 401 & 409 errors on remote GET/POST calls. Logout redirection support.
                   31229: Signup and invitiation completion updates
                   31242: Fixed up invitation, signup and tenant switching problems
                   31270: Fixed forms issue (can now create folders in doc lib)
                   31277: THOR-207. Invitation workflows now run in the inviter's tenant rather than the default tenant.
                       This is checked in on a side-branch because the invitation email's accept/reject links include the tenantId and this tenant-aware Share URL is not yet supported on the THOR1 branch.
                       I removed various TenantUtil.runAsWork calls which were causing the workflow to run on the default tenant rather then the current tenant.
                       SendCloudInvitationEmailDelegate.createInvitationUrl now includes the tenantId in the Share URL it generates.
                       Added new test cases at the Java API level. (Was formerly just at REST API level).
                   31286: (RECORD ONLY) Reset solrcore.properties files
                   31297: Fixed FlashUpload problem
                   31298: Fixed application context only login
                   31302: Fixed no user profile image url issue
                   31306: Updates to TenantUserFactory to defensively handle missing tenant data
                   31326: Repo switch tenant fixes:
                   31356: Resolve switch tenant niggles, with assistance from Erik:
   48072: Merged DEV/CONV_V413 to DEV/CONV_HEAD
        46934: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           46930: Adding extension point to forms runtime's FormUIGet for modifying submission url
        46937: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35762: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              31408: Latest Spring Surf Libs (including SubComponentEvaluator param tokenization fix for THOR)
              31409: Tenant usage/quota -> person count
              31412: RM module cleanup & almost finsihed THOR-287 & THOR-288
              31434: Fix Thor Share eclipse project
   48073: CONV: Fix slingshot eclipse .classpath (add freemarker dep)
   48074: Merged DEV/CONV_V413 to DEV/CONV_HEAD
        46940: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
           35766: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                31450: Additional DB query support in Repo/Core
                31451: Tenant people count (internal + total) usage/quota
                31453: Fix issue uploading small files which resulted in zero byte content
                31456: Fix paging and total count (1000+) when listing accounts
                31457: THOR-312. Addition of NETWORK_ADMINS group authority.
                31461: THOR-314. I've overridden people.get with a cloud-specific template.
                    This adds an isExternal JSON field to each person object.
                31463: THOR-316 webscript filter on people.get for isInternal, isExternal.
                    Overridden people.get.desc.xml and .js in the cloud module in order to add query param
                    and add additional filtering.
                31464: Base work for THOR-178 "F5: Existing user has forgotten password and needs to reset it"
                31468: THOR-321 Create cloud:networkAdmin aspect.
                31469: THOR-315 Return isNetworkAdmin in overridden people.get webscript.
                31470: THOR-275: Add simple caching (for PropertyUniqueContext - used via AttributeService)
                31471: THOR-318 people.get has new cloud query parameter 'networkAdmin'
                31477: THOR-275: temp build fix
                31479: THOR-324 Demote user from admin.
                    New method on RegistrationService to demote a user from NetworkAdmin and tests.
                31484: THOR-319. Fixing maxResults on people.get when internal/external/admin filtering is applied.
                    This issue is not really resolved, but I've commented the code to illuminate the issue.
                31485: THOR-275: fix build/test
                31486: Working forgot password for THOR-178 (problem accessing the reset-password email link though)
                31488: THOR-184: Disable user usages
                31495: F156: Allow super system admin to login to any tenant
                31496: Fix for personExists since hiding admin
                31500: THOR-178
                31501: THOR-329 Add a get-reset-password status webscript.
                31503: Finished forgot password flow THOR-178
                31507: THOR-328: add fixed adjustment (for people usage)
                31508: Back out some of the hidden admin changes
                31509: Revert mistaken check
                31510: THOR-326 Changes to DAO layer to allow update of account type.
                31513: Cloud Console updates
                31514: Switch Network now uses tenants from the user object (instead of making a remote call)
                31515: THOR-326 Changes to the REST & Service layer to allow update of account type.
   48075: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: (effectively record-only - no changes)
        46849: Merged PATCHES/V4.1.3 to DEV/CONV_V413
             46779: ALF-17967: Error in org.alfresco.repo.workflow.WorkflowServiceImpl.getPooledTasks on StartUp.
             - Improved fix that uses the bridge table cache if it is available
             - Groups queried for pooled tasks still limited to 100 by default but can be configured with system.workflow.maxAuthoritiesForPooledTasks
             - Overall number of results can be cut off with system.workflow.maxPooledTasks
   48076: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        46855: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             35706: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  31049: THOR-175: set and enforce per-tenant quota
                  31053: THOR-204: Add dev email mode option
   48077: Merged DEV/CONV_V413 to DEV/CONV_HEAD (RECORD ONLY)
        46944: Merge fallout - fix compile error.
   48078: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: (already fixed - no changes)
        46858: Fix compile error
   48079: Merged DEV/CONV_V413 to DEV/CONV_HEAD
        46953: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35767: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              31516: Hidden admin - attempt 2
              31517: THOR-326. Update to REST-cient rcq file following 31515, which allows for account upgrade.
              31518: THOR-326. DaveC asked me to move the paid business account type out of test config and into product config.
              31519: After tenant switch the client side resources are more sensitive (new requires /res) which it didn't before. This solves the webpreview bug and some other minor stuff.
              31520: THOR-175: Set and enforce file space quota for tenant
              31522: THOR-330. Return Account Class data in Account REST API.
              31523: THOR-330. Added new rsp data into desc.xml sample response.
              31524: THOR-322: refactor tenant file usage/quota
              31525: Skip activity post lookups that have exceptions
              31526: Root webdav to st:sites for now (as per current beta.alfresco.com)
              31528: THOR-323 & THOR-324 Promotion and demotion of users to/from NetworkAdmin.
              31534: Account Summary now also displays name & summary
              31535: Fix for THOR-320. Alfresco logo image in the various Cloud emails is broken.
              31538: Account Summary now handles -2 & MultiSelectAutoComplete  doesn't bounce when selecting first item
              31540: Implementation of THOR-335 webscript for account-types.get
              31541: Account Summary now displays date correctly
              31542: Some paths to client side resources that were missing "/res" in the path
              31547: Various label changes according to Kathryns docs & some new login/forgot password links in invite/signup forms
              31555: Refactored Analytics Service to send JSON Analytics properties
              31557: Some changes to cloud email templates following feedback from Kathryn, Erik.
              31558: THOR-322: refactor tenant file usage/quota
              31559: Turned 'sign up' email URLs into links rather than text. Yes, we'll make these buttons at some point but I just want them to be clickable for now.
   48080: Merged DEV/CONV_V413 to DEV/CONV_HEAD (UI ONLY)
        46954: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35771: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              31563: THOR-123: modules are no longer started for each tenant 
              31566: Update account class display names:
              31567: THOR-123: temp' put back "applyToTenants=true" ...
              31575: THOR-123: pre-req
              31579: Fix issue where setting a preference meant that the person could no longer login:
              31581: Addition of isNetworkAdmin, accountClassName and accountClassDisplayName to the metadata.get webscript, as required by Erik.
              31582: Re-enabling RenditionServiceIntegrationTest which was failing. See THOR-106.
              31584: THOR-123: pre-req
              31585: THOR-347: disable test (pending this JIRA) - ChainingUserRegistrySynchronizerTest
              31590:  Account changes
              31591: Upgrade accound button is now a mailto link pointing to sales@alfresco.com
              31592: Added isNetworkAdmin
              31593: Made sure tooltips are hidden when a dialog/overly is showed/hidden
              31594: Disabling test again pending proper fix. THOR-106
              31595: Reduce log level
              31600: THOR-123: mark modules with "applyToTenants=false"
              31601: Tooltips now dissapear when panel/overlays are destroyed (not only hidden)   
   48081: Merged DEV/CONV_V413 to DEV/CONV_HEAD
        46955: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35779: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              31605: (RECORD ONLY) THOR-336. Fixing /res/themes URLs in activity emails.
                     Fix /res/themes URL in newly located activity emails.
   48088: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        46874: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             35709: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  31054: Fix for email templates (getDirectReadableChannel -> File does not exist)
        46875: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             35711: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  31055: Re-enable activity feed notifications and subscriptions (followers)
   48094: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        46894: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             35759: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  31386: Added some tenancy-awareness to ActionService.
                  31388: Addition of accountTypeId to metadata.get webscript.
                  31391: Fix for unreported issue that arises from the invitation workflow having moved from the system to the inviter tenant.
                  31392: Build fixes: Add pseudo-support for tenant switching in web script test f/w
                  31393: The final fix for the 'external user invites other external user' scenario.
                  31398: Tenant usage/quota - site count
                  31405: Build fix for failing ActionService tests. Compensating actions were not running on the correct tenant.
                  31407: Resolve THOR-248: Extensions is not deployed as part of the build
   48095: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: (repo pre-merge)
        46911: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
             35757: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                31367: Merged BRANCHES/DEV/THOR1SURF to BRANCHES/DEV/THOR1:
                     30971: (RECORD ONLY) Creating SURF update branch for THOR1
                     30979: Commit initial Surf lib changes, Cloud classes and config overrides
                     30980: Add custom Cloud Surf authenticator, connector, remote store, user and user factory
                     31015: Renamed classes and references from Cloud to Tenant, custom page view, page view resolvers, URLModel + factory, URLHelper + factory
                     31076: Successful signup and page redirection
                     31091: Correct redirects from <application context> and <application context>/<tenant name> URLs
                     31098: Updated Surf libs
                     31132: Tenant specific implementation of PathStoreObjectPersister - Surf modelobject cache is now partitioned by the tenant name.
                     31133: Updated Surf libs and JavaDoc updates
                     31155: Initial code to handle attempted access to unauthorised tenants, secondary tenants added to TenantUser and page/activations filter rule
                     31210: Fixed 401 & 409 errors on remote GET/POST calls. Logout redirection support.
                     31229: Signup and invitiation completion updates
                     31242: Fixed up invitation, signup and tenant switching problems
                     31270: Fixed forms issue (can now create folders in doc lib)
                     31277: THOR-207. Invitation workflows now run in the inviter's tenant rather than the default tenant.
                         This is checked in on a side-branch because the invitation email's accept/reject links include the tenantId and this tenant-aware Share URL is not yet supported on the THOR1 branch.
                         I removed various TenantUtil.runAsWork calls which were causing the workflow to run on the default tenant rather then the current tenant.
                         SendCloudInvitationEmailDelegate.createInvitationUrl now includes the tenantId in the Share URL it generates.
                         Added new test cases at the Java API level. (Was formerly just at REST API level).
                     31286: (RECORD ONLY) Reset solrcore.properties files
                     31297: Fixed FlashUpload problem
                     31298: Fixed application context only login
                     31302: Fixed no user profile image url issue
                     31306: Updates to TenantUserFactory to defensively handle missing tenant data
                     31326: Repo switch tenant fixes:
                     31356: Resolve switch tenant niggles, with assistance from Erik:
   48109: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        46917: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts (not mergeinfo/slingshot/web-framework-commons)
             35766: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
        46918: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts (not mergeinfo/slingshot)
             35767: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
        46919: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             35768: Fix compile issue from merge
        46921: Merge fallout - fix compile error.
        46949: Test fallout
        47126: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts
             35954: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
             35960: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
             35961: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
             35962: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
             35963: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
             35964: Spring Surf library refresh
             35995: Fix merge issue
             35999: Fix merge issue
        47144: Fix merge/test failures (WCMTestSuite)
        47539: CLOUD-1375 - fix WCM unit test fallout: SandboxServiceImplTest.testDeleteSandbox + WebProjectServiceImplTest.testDeleteWebProject
   48111: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        46954: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
             35771: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                31563: THOR-123: modules are no longer started for each tenant 
                31566: Update account class display names:
                31567: THOR-123: temp' put back "applyToTenants=true" ...
                31575: THOR-123: pre-req
                31579: Fix issue where setting a preference meant that the person could no longer login:
                31581: Addition of isNetworkAdmin, accountClassName and accountClassDisplayName to the metadata.get webscript, as required by Erik.
                31582: Re-enabling RenditionServiceIntegrationTest which was failing. See THOR-106.
                31584: THOR-123: pre-req
                31585: THOR-347: disable test (pending this JIRA) - ChainingUserRegistrySynchronizerTest
                31590:  Account changes
                31591: Upgrade accound button is now a mailto link pointing to sales@alfresco.com
                31592: Added isNetworkAdmin
                31593: Made sure tooltips are hidden when a dialog/overly is showed/hidden
                31594: Disabling test again pending proper fix. THOR-106
                31595: Reduce log level
                31600: THOR-123: mark modules with "applyToTenants=false"
                31601: Tooltips now dissapear when panel/overlays are destroyed (not only hidden)   
        46956: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
             35782: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                31607:  "Hide everything but the doclib" customizations
                     - Dashlets adjustments
                       * Addons RSS feed - hidden
                       * Site Calendar - hidden
                       * Content I'm editing - added <@markup> extension points so blog, wiki & forum sections are hidden by cloud extension module
                       * Site Data List - hidden
                       * Site Links - hidden
                       * Wiki - hidden
                       * User Calendar - hidden
                     - URL rewrites
                       * Forgot & reset password urls now prettyfied, not using "-default-/"
                     - Duplicated slingshot presets to avoid future slingshot changes popping up in the cloud          
                31611: MT: fix ability to delete a disabled tenant
                31612: THOR-339: Disable/enable logins for a network (account update)
                31621: THOR-106. Taking a failing test class out again, pending fix. Hmmmm.
                31623: THOR-357 - support shared CMIS dictionary
   48112: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: (no changes)
        46957: Test fallout
   48113: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: (no changes - already pre-merged)
         46911: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
             35757: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                31367: Merged BRANCHES/DEV/THOR1SURF to BRANCHES/DEV/THOR1:
                     30971: (RECORD ONLY) Creating SURF update branch for THOR1
                     30979: Commit initial Surf lib changes, Cloud classes and config overrides
                     30980: Add custom Cloud Surf authenticator, connector, remote store, user and user factory
                     31015: Renamed classes and references from Cloud to Tenant, custom page view, page view resolvers, URLModel + factory, URLHelper + factory
                     31076: Successful signup and page redirection
                     31091: Correct redirects from <application context> and <application context>/<tenant name> URLs
                     31098: Updated Surf libs
                     31132: Tenant specific implementation of PathStoreObjectPersister - Surf modelobject cache is now partitioned by the tenant name.
                     31133: Updated Surf libs and JavaDoc updates
                     31155: Initial code to handle attempted access to unauthorised tenants, secondary tenants added to TenantUser and page/activations filter rule
                     31210: Fixed 401 & 409 errors on remote GET/POST calls. Logout redirection support.
                     31229: Signup and invitiation completion updates
                     31242: Fixed up invitation, signup and tenant switching problems
                     31270: Fixed forms issue (can now create folders in doc lib)
                     31277: THOR-207. Invitation workflows now run in the inviter's tenant rather than the default tenant.
                         This is checked in on a side-branch because the invitation email's accept/reject links include the tenantId and this tenant-aware Share URL is not yet supported on the THOR1 branch.
                         I removed various TenantUtil.runAsWork calls which were causing the workflow to run on the default tenant rather then the current tenant.
                         SendCloudInvitationEmailDelegate.createInvitationUrl now includes the tenantId in the Share URL it generates.
                         Added new test cases at the Java API level. (Was formerly just at REST API level).
                     31286: (RECORD ONLY) Reset solrcore.properties files
                     31297: Fixed FlashUpload problem
                     31298: Fixed application context only login
                     31302: Fixed no user profile image url issue
                     31306: Updates to TenantUserFactory to defensively handle missing tenant data
                     31326: Repo switch tenant fixes:
                     31356: Resolve switch tenant niggles, with assistance from Erik:
   48114: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
         46962: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
            40147: (RECORD ONLY) French: Cloud Translation update from Gloria (based on EN rev38372)
            42709: (RECORD ONLY) FRENCH: Translation updates based on EN r42416
            42871: (RECORD ONLY) GERMAN: Cloud Translation, based on r 42416
            42879: (RECORD ONLY) SPANISH: Cloud Translation, based on r 42416
            42890: (RECORD ONLY) ITALIAN: Cloud Translation, based on r 42416
            43879: (RECORD ONLY) FRENCH: Translation updates based on EN r43703
            43983: (RECORD ONLY) GERMAN: Translation updates based on EN r43703
            43984: (RECORD ONLY) SPANISH: Translation updates based on EN r43703
            43985: (RECORD ONLY) FRENCH: Translation updates based on EN r43703, includes file missing from previous commit.
            43986: (RECORD ONLY) ITALIAN: Translation updates based on EN r43703.
            43987: (RECORD ONLY) JAPANESE: Translation updates based on EN r43703.
            44031: (RECORD ONLY) JAPANESE: Translation updates based on EN r43703. Corrects file missed from previous commit.
            44032: (RECORD ONLY) GERMAN: Translation updates based on EN r43703. Corrects missing line break.
            45329: (RECORD ONLY) FRENCH: Cloud translation updates based on EN r45266
            45330: (RECORD ONLY) GERMAN: Cloud translation updates based on EN r45266
            45332: (RECORD ONLY) SPANISH: Cloud translation updates based on EN r45266
            45333: (RECORD ONLY) JAPANESE: Cloud translation updates based on EN r45266
            45427: (RECORD ONLY) SPANISH: Cloud 1 translation updates based on EN r45266
            45718: (RECORD ONLY) ITALIAN: Translation updates based on EN r45266 (missed from previous bundle import)
            45838: (RECORD ONLY) FRENCH: Cloud Translation update based on EN r45266
            45966: (RECORD ONLY) Translation update to fix CLOUD-1270 in FR and ES
            46365: (RECORD ONLY) ALL LANG: Translation updates based on EN r46289
            46366: (RECORD ONLY) ALL LANG: Updates copyright year to 2013
            46377: (RECORD ONLY) ALL LANG: Adds strings missing from previous commit.
         47192: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: (record-only - WebDAV mostly resolved as part of 36117 merge)
            36408: (RECORD ONLY) Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                 36404: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                      36060: THOR-1373: Proxied WebDAV must generate correct URLs when URL-rewriting is used.
                      36083: THOR-1373: Proxied WebDAV must generate correct URLs when URL-rewriting is used.
         47369: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
            41180: (RECORD ONLY) Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                 40482: ALF-13998: 'No items' error is highlighted in red, even that is not sever error.
                    - ALF-15453: Incorrect manage permissions working for a file/folder
                 Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/CLOUD1:
                    40486: ALF-15453: Incorrect manage permissions working for a file/folder
         47377: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
            41048: (RECORD ONLY) Merged DEV/V4.1-BUG-FIX to DEV/CLOUD1
                  40382: Fix for ALF-15491 SOLR is generating queries for lucene style cross-language support
                  40632: Fix for ALF-15487 Search not working for queries containing 3-digit versions
                         Fix for ALF-15356 SOLR doesn't support searching by cm:name of file with underscore and dots
                  40662: Eclipse classpath fixes
                  41032: Fix for ALF-15753       Infinite loop during Solr ACL indexing when ACL Changeset batch is empty
         47393: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             Merged DEV/CLOUD1-BUG-FIX into DEV/CLOUD1:
                 41674: ALF-15967: Using START_USER_ID_ instead of "initiator" property to query process instances started by user X to prevent extra joins + removed unused constants
                 41650: Fixed CLOUD-667: Merged fix for ALF-14438 into CLOUD1-BUG-FIX + using START_USER_ID_ instead of custom "initiator" property to query initiator to boost performance even more
         47412: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
            42252: (RECORD ONLY) Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/CLOUD1
                  42233: Fix for ALF-16164 Cloud monitoring of SOLR is CPU intensive due to its repeated use of the SOLR stats page
                         and related CLOUD-760 Cloud monitoring of SOLR is CPU intensive due to its repeated use of the SOLR stats page
         47429: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
            42200: Merged DEV/CLOUD1-BUG-FIX into DEV/CLOUD1: Record-only (r41650 and r41674)
         47433: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             CLOUD-808: Fix for timer deploying MT-process when shared is required caused test to fail
         47435: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             Merged BRANCHES/DEV/CLOUD1_CORS to BRANCHES/DEV/CLOUD1:
                 43100: Update the salesforce amp to include the CORS Filter
                 43101: Update web.xml to enable to the CORS Filter with filter-mapping
                 43117: Add updated amp with removed CORS Filter.  CORS Filter is now available in 3rd-party libs
                 43118: [CLOUD-724] Add CORS Filter jar to 3rd-party libs
                 43119: [CLOUD-724] Add missing jar java-property-utils-1.6.jar to 3rd-party libs
         47485: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
            44203: (RECORD ONLY) Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1
                  44200: Probable fix for     ALF-16895 SOLR: Cannot find files after restart and reindex solr
            44276: (RECORD ONLY) Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1
                  44275: Part 2 for ALF-16895 SOLR: Cannot find files after restart and reindex solr
                         - fix initial cache state to cope with duplicate leaf/aux doc entries.
            44314: (RECORD ONLY) Merged BRANCHES/V4.1 to BRANCHES/DEV/CLOUD1
                    44312: Part 3 for ALF-16895 SOLR: Cannot find files after restart and reindex solr
                           - fix incremental cache state to cope with duplicate leaf/aux doc entries.
         47523: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
            44573: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/CLOUD1:
                 44572: Clean up of unused files.
            44576: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1_CORS to BRANCHES/DEV/CLOUD1:
                 44518: [CLOUD-955] Change CORS filter-mapping to use servelet instead of url
            44691: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD1_CORS to BRANCHES/DEV/CLOUD1:
                 44688: (RECORD ONLY) Rebase CLOUD1_CORS with CLOUD1
                 44689: [CLOUD-1072] Add public api url to CORS filter mapping.  Move CORS filter mapping to live above the publicapi filter mappings.  OPTIONS calls made to the CORS filter should be evaluated before Layer7 authentication.
         47548: Merged DEV/CLOUD2 to DEV/CONV_V413
            46931: Overriding form runtime's submissionUrl using extesnion point in FormUIGet
            46984: Overriding entire sent-invites.js (instead of modifying the core slingshot code) with a copy of the core code modified to work with the cloud invite apis.
            46986: Overriding help pages config in cloud-config.xml (rather than modifying the core files!)
         47553: Merged DEV/CLOUD2 to DEV/CONV_V413
            47421: Overriding entire sent-invites.get ftl & properties (instead of modifying the core slingshot code) with a copy of the core code modified to fit the cloud requirements.
            47442: Add web overlay for share + tune embedded librairies
            47455: Add dependency on jetty-webapp to compile the tests
   48115: CONV: Fix cache defs (propertyUniqueContextCache & siteNodeRefCache)
   48117: Merged DEV/CONV_V413 to DEV/CONV_HEAD
        46959: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35790: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              31624: Resolve THOR-302: transformation-client-1.0.0-SNAPSHOT.jar not in alfresco/WEB-INF/lib:
              31632: More reliable test, hopefully
              31644: Fix unreported issue in aws-context.xml.sample (not well-formed XML)
              31645: Customized invite links to use "cloud dialog" instead of "invite page" for the following components:
              31662: New Analytics events and tests
              31663: New Analytics events and tests
              31678: Addition of isExternal data to site membership webscripts.
   48118: Merged DEV/CONV_V413 to DEV/CONV_HEAD
        46960: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35791: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              31684: THOR-367 - #1 Within Site 
                   - Remove all page components other than site dashboard, document library and members 
                   - Remove customize site
              31685: New lightweight webscript to retrieve user/network metadata about the currently authenticated user in the current tenant.
              31693: THOR-365: Private site cannot be access (since surf-config is not imported) - causes: Could not resolve view with name ...
              31695: THOR-367 - #2 Document Library 
                    - remove Create Content... menu 
                    - remove actions: manage aspects, change type, publish, manage rules (for folders) 
                    - document-details page: remove publishing history panel
              31697: For reference only: update description of cmis/test webscript 
   48119: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        46972: Fix test fallout (re: THOR-293)
   48120: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: (repo pre-merge)§
        47001: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
             35798: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                31805: Adding utility method to our CollectionUtils class that I need as part of pending invitations work (THOR-373).
                31809: Parameterized signup url & email
                31812: THOR-373 Pending invitations.
                31814: Made changes to way aid is captured ready for allowing events to override aid if needed
                31820: Mapping of network admin to system admin part 1:
             35801:Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                31829: Fixed THOR-352 "Incorrect validation of emails on "Forgot Password" page"
                31830: (RECORD ONLY) Exclude ExportDbTest; issues with MySQL
                31831: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1:
                     31784: Fix up unit test.
                31833: Email validation now allows 7 character long top level domain (so we can do tests with example)
                31834: New form colors for invalid & mandatory fields
                31837: THOR-327 - remove bootstrapped guest / guest@<tenant>
                31838: THOR-327 - remove bootstrapped guest / guest@<tenant>
                31844: Added missing headers to Java files.
                31845: Mapping of network admin to system admin part 2:
                31846: Addition of very basic test script for the Script API of AnalyticsService.
             35803: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                31853: Forms refactor first cut - for review
                31855: THOR-387. Analytics event for user activation is sent.
                31858: THOR-387. Fixing a corner-case bug in SendAnalyticsRequest.
                31863: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1:
                     31841: Build Fix
                31868: THOR-361: Fix /service/index
                31881: THOR-387. Adding analytics event for site invitation.
                31882: THOR-387. Fixing analytics event for site invitation.
                31883: THOR-66: disable some of the /alfresco (web.xml) servlet mappings
                31884: THOR-387. Analytic event callouts for site invitation response.
                31899: Revert solrcore.properties checkin
                31900: THOR-249: override edition interceptor
                31901: Fix for THOR-396. Spelling mistake on signup screen.
                31902: Resolve THOR-251: Update the Help URLs for Cloud
                31904: Resolve THOR-403: -system- tenant not found logged from server
                31918: Create site form tweak (manual form.validate() call required since javascript is changing a another fields value)
                31919: Logout page refactoring
                31925: Create site now resets form before show using forms-runtime's new "reset" method
                31926: Disable flash upload
                31927: THOR-363: increase initial file quota
                31930: Updated SimpleDB service so you can set the SimpleDB domain to record events too
             
        47003: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
             35804: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                31933: THOR-387. Analytics.
                    Added analytic call for account registration (the initial signup, not the activation, which was added previously).
                    This adds a new mandatory parameter to the signup webscript: "source" as well as various new optional parameters.
                    The same parameter is now mandatory on the RegistrationService.
                    Impacts on test code.
                    Changed the rest-client .rcq file to show new required parameter.
                    Changed AnalyticsProperties to take the Object wrappers for primitives as these are optional and so we need to be able to pass null.
                    Added a new (hidden) field to Erik's signup Share page to send an appropriate value for the signup.
                31939: THOR-404: disable JBPM
                31943: THOR-387. Analytics.
                    I've overridden upload.post.js to add analytics data for file uploads.
                31946: Fixed THOR-385 "Account summary file usage bar does not display for any theme other than the default theme"
                31947: Fixed THOR-308 "Invite user drop-down works incorrectly"
                31948: Resolve THOR-384: It is impossible to create user administrator@'domain':
                31949: Follow-up fix for case sensitive user names
                31953: THOR-311: It is impossible to create workflow when 'Send Email Notifications' flag is checked:
                31959: Removing change-password override since user shall be able to change his password
                31961: Fix tests after recent username/email address changes
                31966: Grey Theme
                31979: Dropping Analytics logging level down to 'warn' from 'debug'.
                31982: Fixed THOR-419 "UI edits required"
                31983: Fixed THOR-419 "UI edits required" part 2
                32003: THOR-422. Spurious error logging during signup/registration (not activation).
                    This was because the analytics event action code assumed the user exists, which they don't do at registration, of course.
                32004: Resolve undefined undefined seen in invite signup dialog
                32006: Restricted tentant component now displays dialog instead of gray page
                32007: THOR-300: fix AWS config
                32013: Fixed THOR-353 "No validation for the fields on the "Reset Password" page"
                32014: Fixed THOR-423 "Removing the yellow "Welcome to your dashboard, firstname, lastname" causes error"
                32018: Made sure new cloud theme (greyTheme) also has new theme border & bgs (making the account quota being displayed)
   48122: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47007: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             35817: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  32250: (RECORD ONLY) Merged /HEAD to BRANCHES/DEV/THOR1: (ok'ed with DC/DG)
                       31750: Solr: Fix owner Id cache
                       31751: Fix for ALF-11104: add authenticated user to authorisations list in PermissionService + fix inconsistency in AuthorityService
                       31760: Correct Fix for SOLR owner ID cache
                       32172: Fixes for: 
                                  ALF-11521 Protect SOLR running against the wrong Alfresco DB      
                                  ALF-11602 Solr Core Tracker - does not need to re-init CMIS dictionary (when there are no model changes)       
                                  ALF-11621 SOLR old versions of tracked models are not getting deleted when models are updated
                       32234: Fix for ALF-11568 SOLR indexing is ignoring properties that are indexed but not tokenised and not stored - was WCMQS navigation is broken
                  32256: THOR-488. Tidy up account types.
                  32258: Login analytics event.
                  32260: Reduce logging on startup for enabled tenants (see also THOR-475 / THOR-81)
                  32262: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1:
                       32139: Fix for ALF-11599 - Section ''Others are Editing'' shows documents that should not be present
   48123: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: (repo pre-merge)
        47038: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
             35811: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                32019: Merged rev 32016 from THORSURF1
                32021: THOR-428: Fix activity feed email notifications (to contain network/tenant ctx)
                32024: Fixed "THOR-424 'Upload File' button is disabled in FF for the second and futher uploads"
                32026: Restricted tenant page now has link back to users home dashboard so he doesn't feel stuck
                32029: Fixed GetRequest test to ignore uid's that aren't emails (like admin)
                32030: THOR-310: Override getCacheKey method from AbstractCachedViewResolver to ensure that each tenant gets their own cached copy of each Share page (this ensures that nested Component config gets processed for all tenants)
                32031: Resolve THOR-417 Workflow notification emails do not take into account tenant in their urls back to Share
        47039: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
             35812: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                32041: Label changes according to Kathryn's "UI Text_scenario 5.docx"
                32052: THOR-405: Fix 'contentstore.deleted' to be on S3 (albeit co-mingled)
                32058: Removed unnecessary borders from profile pages
                32065: Fix build issue where cloud share war was not being cleaned before build
                32066: Fix those pesky solrcore properties
                32071: THOR-461: fix following email notification (to contain network/tenant ctx)
                32076: Fix to disable error on unit tests
                32077: Added logging to NullPointerException fix
             35814: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                32103: Finally! A fix for THOR-193. :)
                32119: Fix for setting theme as network admin
                32120: Improved text on upgrade account page
                32124: Refactored CloudInvitationService Integration Tests to allow for easier expansion and then I expanded.
                32130: Fix for THOR-457. Already have an account email template needs updating/fixing.
                32135: THOR-464 Fix "ThumbnailRegistry init does not scale with # of tenants"
                32140: Apply Beta logos and adjust about dialog for cloud
             35815: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                32144: THOR-438: Latest Spring Surf libs (fix relative URI login redirect problem caused by un-encoded URI)
                32147: THOR-475 - improvement(s) to trim time to create tenant
                32148: THOR-475 - improvement(s) to trim time to create tenant
                32154: GreyTheme updates
                32157: THOR-430: Forgot password dialog: UI text not what was suggested
                32159: GreyTheme updates
                32174: THOR-454 - User can find content stored in Company Home/Data Dictionary via Advanced Search
                32176: Signup page now cloud.alfresco.com
                32179: THOR-475 - improvement(s) to trim time to create tenant
                32184: Remove jargon from workflow names and descriptions
                32185: Pesky solrcore.properties
             35816: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                32188: THOR-478: Updated Spring Surf libs - fixed relative URL redirect after login including support for @ symbol in URL
                32195: Fix for THOR-379. Pending invitations UI show invitee emails as links to profile pages - even for non-existent users.
                    Added yet more data to the CloudInvitation REST API: inviteeIsMember which tells caller whether the invitee is already a member of the tenant in which the invitation is running.
                    Returning this flag through the Java API & REST API
                    Tweaks to the Share JS so that it renders a <span> for invitees who are not members and an <a> for those who are. 
                32198: Replace workflow text with task related text
                32202: Resolve THOR-481: Moving or copying content always shows error popup but always succeeds
                32204: Build fix
                32238: THOR-290: Configurable google-analytics tracking code script insertion
                32239: Tidying up some UI text. Missing apostrophes, invitation instead of invite.
                32241: THOR-471: Added GetSatisfaction feedback widget
             35818: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                32266: Addition of createSite analytics recording.
                32268: THOR-505: Disable (turnoff autostart) of unused subsystems
                32270: Adding in some theme colors that dissapeared (will make the quota bar get displayed again)
                32272: Resolve THOR-354: (None) displayed for network administrators
                32273: THOR-499: New Relic monitoring updates
                32279: Implemented THOR-508 "Accept terms & conditions checkbox & link on the complete profile pages"
                32280: Fixed THOR-474	  "Password Strength indicator does not conform with other leading website password indicators"
   48125: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: (repo pre-merge)
         47053: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
            32377: (RECORD ONLY) THOR-565: fix unfortunate type that affects activity permissions (for connected users - either via site membership or followers)
            32378: CollectionUtils method for collection intersection. Should be merged to HEAD.
            32383: THOR-572: remove unused JBPM servlets (deployprocess, workflowdefinitionimage)
            32384: Fixed THOR-549 "Google Analytics Installed but not seeing any events raised on GA reports"
            32389: Fix for THOR-567 "userprofile broken"
            32401: THOR-525 - fix MT-specific issue (deleting site does not clear associated activities within tenant)
            32409: THOR-66: disable WebDAVServlet (does not need to load-on-startup) + a few others
            32414: Theme updates from linton
            32423: Fixed THOR-661 "Limit number of simultaneous connections in drag n drop upload"
            32424: THOR-81: support for signup/activate scaling tests
   48126: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47058: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts (not mergeinfo/slingshot/web-framework-commons/3rd-party) 
             35827: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
             35828: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
             35829: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
             35830: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
             35831: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
             35832: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
   48129: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47067: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts
             35844: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
             35845: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
             35846: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
             35847: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
             35848: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
             35849: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
             35850: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
             35853: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
             35854: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
             35855: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
        47069: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts
             35860: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  33057: Refactored Slingshot overrides so that they are now in the Thor-Share private module. This has been done to reduce conflict issues when merging back into HEAD.  The overrides are now in the correct locations (the only files that could not be moved to the private module are urlrewrite.xml and surf.xml).
             35870: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: (part 1 - repository project)
                  33022: THOR-662: Email templates should load/resolve (initially) from classpath
        47071: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts
             35877: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  33090: ALF-10826: hidden aspect
                  33091: THOR-416: fix surf-config folder (appears where it shouldn't)
                  33093: Sweep through email templates.
        47072: Fix merge error (FeedCleaner)
        47073: Fix merge error (WorkflowTestSuite)
        47074: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts
             35881: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  33104: Tweak to invitation email template
                  33112: Refactored impl of THOR-694 so that content limit of 25Mb is on by default in THOR for both local FS and S3-based FS.
                      Changed ContentLimitProvider bean to take String limit, rather than long - to allow empty string value on core Alfresco.
                      Set the limit to the empty string in core Alfresco, which means 'no limit'.
                      Applied the limit always.
                      Set the limit to 25Mb in Thor/alfresco-global.properties
                      Fixed a minor bug in error reporting due to previous exception renaming.
        47076: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts
             35885: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  33134: THOR-874: Updated Surf libs Fixes ArrayIndexOutOfBoundsException caused by multiple threads apply i18n extensions to a WebScript
                  33135: Missing WebScripts sources JAR from r33134
                  33153: Resolve THOR-551: Password Hashes Need Review
                  33154: Update to latest email blacklist
                  33155: Fixed THOR-534 "Login Box shows scroll bars"
                  33156: Build fix for tests failing due to recent password changes
                  33157: Build fix for updated email blacklist
                  33172: THOR-776: Re-implement Share override as guided by Erik
                  33173: THOR-831: Text in Someone
             35886: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  33174: Latest SpringSurf libs - improved RemoteClient reused of connections per request thread.
                  33176: THOR-833: Search: clicking on All Sites returns no results
   48131: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47098: (RECORD ONLY) Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
             35895: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                34105: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                   33267: (RECORD ONLY) Created branch THOR1_SPRINTS (from THOR1 r33255)
                   33269: Snapshot of simple redeploy shell script (for AWS mini-dev/test env)
                   33272: JMeter test script
                34106: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                   33313: THOR-928: Added caching for i18n bundles provided by extensibility modules (latest Surf libs, r980)
   48133: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47097: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts
             35906: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
             35907: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
        47099: Fix merge/compile error.
        47103: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts
             35913: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
             35914: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
             35915: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
             35916: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
             35917: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
        47111: Fix merge error
        47115: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts
             35930: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
             35933: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
             35934: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
        47132: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts
             36053: 1st pass at upgrading to latest Spring Surf
             36059: Fix CloudInvitationService tests for cloud1
        47133: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
   48135: Merged DEV/CONV_V413 to DEV/CONV_HEAD
        46977: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35792: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              31724: Can't compare pages using page.url.uri anymore since that doesn't include the tentant, now skips that part of the url and uses page.id instead.
              31733: Add account info to user network web script
              31736: Refactored RegistrationServiceImpl.promote... so that it uses the presence of cloud:personExternal aspect to prevent promotion of external users rather than account-based data.
           35794: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              31744: Account relates to url & various Share features now hidden in cloud
              31746: 1/5 for THOR-341 "F147: Share features are disabled for external network member"
           35796:Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              31756: THOR-265: Currently the first user to sign up to a dmain becomes the domain admin, and can view the full admin console. Is this going to change?
              31771: Added stub for SimpleDBAnalytics Service
              31772: Final interfaces and integration with SimpleDB for Analytics
              31774: Modified landing_time key for MixPanel
              31776: Implemented #3 for THOR-341 "F147: Share features are disabled for external network member"
              31777: Resolve test classpath since introduction of new thor libs
              31779: Implemented #3 for THOR-341 "F147: Share features are disabled for external network member" part 2
              31781: Resolve issue getting access to account settings when network admin of paid business account
              31783: Implemented #2 for THOR-341 "F147: Share features are disabled for external network member"
              31794: Minor changes after review with DavidC and NeilM
              31797: Collaboration title improvement: Now hiding the html elements used to build the menu until the menu is created so ui doesn't bump and look ugly.
              31799: Part #6 of THOR-367 "F60: Remove Share features not required for Cloud"
                   - 6) Document Selectors - root is Sites folder
              31801: Removed ugly "extra" borders around some of the input fields in the user profile form
              31802: Fixed part #7 of THOR-367 "F60: Remove Share features not required for Cloud"
                   - 7) Edit Profile - remove edit email from edit profile form
              31804: Fixed part #5 of THOR-367 "F60: Remove Share features not required for Cloud"
                   - 5) Move... / Copy... dialog  - remove repository  - remove my user home
   48136: Merged DEV/CONV_V413 to DEV/CONV_HEAD
        47001: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35798: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              31805: Adding utility method to our CollectionUtils class that I need as part of pending invitations work (THOR-373).
              31809: Parameterized signup url & email
              31812: THOR-373 Pending invitations.
              31814: Made changes to way aid is captured ready for allowing events to override aid if needed
              31820: Mapping of network admin to system admin part 1:
           35801:Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              31829: Fixed THOR-352 "Incorrect validation of emails on "Forgot Password" page"
              31830: (RECORD ONLY) Exclude ExportDbTest; issues with MySQL
              31831: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1:
                   31784: Fix up unit test.
              31833: Email validation now allows 7 character long top level domain (so we can do tests with example)
              31834: New form colors for invalid & mandatory fields
              31837: THOR-327 - remove bootstrapped guest / guest@<tenant>
              31838: THOR-327 - remove bootstrapped guest / guest@<tenant>
              31844: Added missing headers to Java files.
              31845: Mapping of network admin to system admin part 2:
              31846: Addition of very basic test script for the Script API of AnalyticsService.
           35803: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              31853: Forms refactor first cut - for review
              31855: THOR-387. Analytics event for user activation is sent.
              31858: THOR-387. Fixing a corner-case bug in SendAnalyticsRequest.
              31863: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1:
                   31841: Build Fix
              31868: THOR-361: Fix /service/index
              31881: THOR-387. Adding analytics event for site invitation.
              31882: THOR-387. Fixing analytics event for site invitation.
              31883: THOR-66: disable some of the /alfresco (web.xml) servlet mappings
              31884: THOR-387. Analytic event callouts for site invitation response.
              31899: Revert solrcore.properties checkin
              31900: THOR-249: override edition interceptor
              31901: Fix for THOR-396. Spelling mistake on signup screen.
              31902: Resolve THOR-251: Update the Help URLs for Cloud
              31904: Resolve THOR-403: -system- tenant not found logged from server
              31918: Create site form tweak (manual form.validate() call required since javascript is changing a another fields value)
              31919: Logout page refactoring
              31925: Create site now resets form before show using forms-runtime's new "reset" method
              31926: Disable flash upload
              31927: THOR-363: increase initial file quota
              31930: Updated SimpleDB service so you can set the SimpleDB domain to record events too
   48137: Merged DEV/CONV_V413 to DEV/CONV_HEAD
        47003: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35804: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              31933: THOR-387. Analytics.
                  Added analytic call for account registration (the initial signup, not the activation, which was added previously).
                  This adds a new mandatory parameter to the signup webscript: "source" as well as various new optional parameters.
                  The same parameter is now mandatory on the RegistrationService.
                  Impacts on test code.
                  Changed the rest-client .rcq file to show new required parameter.
                  Changed AnalyticsProperties to take the Object wrappers for primitives as these are optional and so we need to be able to pass null.
                  Added a new (hidden) field to Erik's signup Share page to send an appropriate value for the signup.
              31939: THOR-404: disable JBPM
              31943: THOR-387. Analytics.
                  I've overridden upload.post.js to add analytics data for file uploads.
              31946: Fixed THOR-385 "Account summary file usage bar does not display for any theme other than the default theme"
              31947: Fixed THOR-308 "Invite user drop-down works incorrectly"
              31948: Resolve THOR-384: It is impossible to create user administrator@'domain':
              31949: Follow-up fix for case sensitive user names
              31953: THOR-311: It is impossible to create workflow when 'Send Email Notifications' flag is checked:
              31959: Removing change-password override since user shall be able to change his password
              31961: Fix tests after recent username/email address changes
              31966: Grey Theme
              31979: Dropping Analytics logging level down to 'warn' from 'debug'.
              31982: Fixed THOR-419 "UI edits required"
              31983: Fixed THOR-419 "UI edits required" part 2
              32003: THOR-422. Spurious error logging during signup/registration (not activation).
                  This was because the analytics event action code assumed the user exists, which they don't do at registration, of course.
              32004: Resolve undefined undefined seen in invite signup dialog
              32006: Restricted tentant component now displays dialog instead of gray page
              32007: THOR-300: fix AWS config
              32013: Fixed THOR-353 "No validation for the fields on the "Reset Password" page"
              32014: Fixed THOR-423 "Removing the yellow "Welcome to your dashboard, firstname, lastname" causes error"
              32018: Made sure new cloud theme (greyTheme) also has new theme border & bgs (making the account quota being displayed)
   48147: CONV: fix merge issue - remove duplicate prop def (contentLimitProvider)
   48148: Merged DEV/CONV_V413 to DEV/CONV_HEAD
        merge fix for r48072
   48149: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47111: Fix merge error
        47115: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts
             35930: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
             35933: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
             35934: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
        47132: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: - pre-merge of repo parts
             36053: 1st pass at upgrading to latest Spring Surf
             36059: Fix CloudInvitationService tests for cloud1
        47133: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
   48150: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: (effectively RECORD ONLY - no changes)
        47173: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             36232: MT - fix pop of tenant ctx (to match push)
   48154: Merged DEV/CONV_V413 to DEV/CONV_HEAD
        47038: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35811: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              32019: Merged rev 32016 from THORSURF1
              32021: THOR-428: Fix activity feed email notifications (to contain network/tenant ctx)
              32024: Fixed "THOR-424 'Upload File' button is disabled in FF for the second and futher uploads"
              32026: Restricted tenant page now has link back to users home dashboard so he doesn't feel stuck
              32029: Fixed GetRequest test to ignore uid's that aren't emails (like admin)
              32030: THOR-310: Override getCacheKey method from AbstractCachedViewResolver to ensure that each tenant gets their own cached copy of each Share page (this ensures that nested Component config gets processed for all tenants)
              32031: Resolve THOR-417 Workflow notification emails do not take into account tenant in their urls back to Share
        47039: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35812: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              32041: Label changes according to Kathryn's "UI Text_scenario 5.docx"
              32052: THOR-405: Fix 'contentstore.deleted' to be on S3 (albeit co-mingled)
              32058: Removed unnecessary borders from profile pages
              32065: Fix build issue where cloud share war was not being cleaned before build
              32066: Fix those pesky solrcore properties
              32071: THOR-461: fix following email notification (to contain network/tenant ctx)
              32076: Fix to disable error on unit tests
              32077: Added logging to NullPointerException fix
           35814: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              32103: Finally! A fix for THOR-193. :)
              32119: Fix for setting theme as network admin
              32120: Improved text on upgrade account page
              32124: Refactored CloudInvitationService Integration Tests to allow for easier expansion and then I expanded.
              32130: Fix for THOR-457. Already have an account email template needs updating/fixing.
              32135: THOR-464 Fix "ThumbnailRegistry init does not scale with # of tenants"
              32140: Apply Beta logos and adjust about dialog for cloud
           35815: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              32144: THOR-438: Latest Spring Surf libs (fix relative URI login redirect problem caused by un-encoded URI)
              32147: THOR-475 - improvement(s) to trim time to create tenant
              32148: THOR-475 - improvement(s) to trim time to create tenant
              32154: GreyTheme updates
              32157: THOR-430: Forgot password dialog: UI text not what was suggested
              32159: GreyTheme updates
              32174: THOR-454 - User can find content stored in Company Home/Data Dictionary via Advanced Search
              32176: Signup page now cloud.alfresco.com
              32179: THOR-475 - improvement(s) to trim time to create tenant
              32184: Remove jargon from workflow names and descriptions
              32185: Pesky solrcore.properties
           35816: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              32188: THOR-478: Updated Spring Surf libs - fixed relative URL redirect after login including support for @ symbol in URL
              32195: Fix for THOR-379. Pending invitations UI show invitee emails as links to profile pages - even for non-existent users.
                  Added yet more data to the CloudInvitation REST API: inviteeIsMember which tells caller whether the invitee is already a member of the tenant in which the invitation is running.
                  Returning this flag through the Java API & REST API
                  Tweaks to the Share JS so that it renders a <span> for invitees who are not members and an <a> for those who are. 
              32198: Replace workflow text with task related text
              32202: Resolve THOR-481: Moving or copying content always shows error popup but always succeeds
              32204: Build fix
              32238: THOR-290: Configurable google-analytics tracking code script insertion
              32239: Tidying up some UI text. Missing apostrophes, invitation instead of invite.
              32241: THOR-471: Added GetSatisfaction feedback widget
           35818: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              32266: Addition of createSite analytics recording.
              32268: THOR-505: Disable (turnoff autostart) of unused subsystems
              32270: Adding in some theme colors that dissapeared (will make the quota bar get displayed again)
              32272: Resolve THOR-354: (None) displayed for network administrators
              32273: THOR-499: New Relic monitoring updates
              32279: Implemented THOR-508 "Accept terms & conditions checkbox & link on the complete profile pages"
              32280: Fixed THOR-474	       "Password Strength indicator does not conform with other leading website password indicators"
        47053: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
           Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              32377: (RECORD ONLY) THOR-565: fix unfortunate type that affects activity permissions (for connected users - either via site membership or followers)
              32378: CollectionUtils method for collection intersection. Should be merged to HEAD.
              32383: THOR-572: remove unused JBPM servlets (deployprocess, workflowdefinitionimage)
              32384: Fixed THOR-549 "Google Analytics Installed but not seeing any events raised on GA reports"
              32389: Fix for THOR-567 "userprofile broken"
              32401: THOR-525 - fix MT-specific issue (deleting site does not clear associated activities within tenant)
              32409: THOR-66: disable WebDAVServlet (does not need to load-on-startup) + a few others
              32414: Theme updates from linton
              32423: Fixed THOR-661 "Limit number of simultaneous connections in drag n drop upload"
              32424: THOR-81: support for signup/activate scaling tests
   48157: Merged DEV/CONV_V413 to DEV/CONV_HEAD
        Fixing merge issue from r48135
   48158: Merged DEV/CONV_V413 to DEV/CONV_HEAD (RECORD ONLY)
        47046: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
              Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              32281: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1 (ok'd with DC):
                   32242: ALF-11664 Moderated sites should use site.public.group (from SysAdminParams) for setting the group with general access, as Public sites already do, rather than hard coding the EVERYONE group
              32283: Added "guest" to the list of blocked usernames, thereby showing failure to register guest@tenant.com, rather than allowing it and failing to activate the account later.
              32285: THOR-505: Disable (turnoff autostart) of unused subsystems
              32286: Fix NPE in AnalyticsProperties when empty json provided
              32287:  THOR-508 "Accept terms & conditions checkbox & link on the complete profile pages"
              32289: Miscellaneous changes to account types & classes.
              32290: Change "recent activities" email notification interval from hourly to daily
              32292: Resolve THOR-516: Check all email template URLs point to cloud.alfresco.com not www.alfresco.me
              32293: THOR-517. Insert Signup Analytics Event into Site Invite process.
              32305: Fixed THOR-306 "Invite user autocomplete not working correctly"
              32308: THOR-529: Red "No items" in doc lib when adding 1st document into a x-network site (WebDAV error in log)
              32309: Fixed THOR-306 "Invite user autocomplete not working correctly"
              32314: THOR-520: Change workflow in tooltip text to task
              32318: THOR-532: Improve auto-generate of home site shortname (in case of clash)
              32339: Updated analytics events to include  parameter
              32342: Additional debug logging as part of THOR-544.
              32376: THOR-574: Accept invite while logged in displays 'you've declined...' message
   48163: Merge CONV_V413 to CONV_HEAD
        46713: Set Maven version in POM files to 4.1.3-CONV-SNAPSHOT
        46741: Deploy SPP jar file (aka VTI) into Maven repository as well
        47440 RECORD ONLY: Declare dependency on Surf 1.2.0-SNAPSHOT in Maven poms
        47450 RECORD ONLY: Bring Chemistry OpenCMIS libs back into the wars
        47579 RECORD ONLY: Switch Chemistry OpenCMIS version to a custom 0.8.0-20120706
        47646: POM dependency: use 4.2-min version of netcdf rather than 4.2, which embeds an old commons-codec
        47683: Create a jar holding the sharepoint config, for use with CLOUD2
        47740 RECORD ONLY: Merge V4.1-BUG-FIX to CONV_V413
           46360: ALF-17697: Create proper source jars, to deploy to Maven repository
        47964: Filter servlet-api from dependencies
   48166: Merged DEV/CONV_V413 to DEV/CONV_HEAD
        47064: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35827: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              32446: Fixed THOR-658 "File Upload Limits"
              32455: Tweak logging (S3 exists check -> debug)
              32462: Move tenant enabled check from low level services to web script entry point:
              32467: THOR-666: Improve startTenants - do not need to re-update enable/disable flag on startup
              32474: JMeter test script updates (#3)
              32485: Fix to ensure the HTML upload POSTed response can return html content type.
              32486: JMeter test script updates (#4)
        47084: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35828: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              32491: Fix account signup since change to tenant authentication (which is now slightly stricter:
              32518: Fix for mixed cased usernames login problems
              32523: Add db pool validate query
              32546: Minor - remove unecessary call to getObjectDetails (to avoid calling twice for non-existent object)
              32556: Fixed tenant url edge cases and followed up a fix started by DavidC for signup logins
              32560: Fixed tenant url edge cases and followed up a fix started by DavidC for signup logins - part 2
           35829: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              32571: Resolve THOR-653: Uploads consume disk space in /var/cache/tomcat6/
              32572: Fixed THOR-563 "UI: CSS / layout issue on profile page"
           35830:Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              32577: THOR-682: refactor Tenant/S3 routing content store (it is now self-routing based on S3 content url)
              32580: Added missing init-method attributes to key CachingContentStore components.
              32583: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1:
                   32321: ALF-11700: Possible to generate feed entries with malformed NodeRefs
              32593: THOR-688 Analytics to support various URLs not just "website".
                  Addition of optional sourceUrl paramater to account-signup analytics.
              32603: Added file size limitation and hooked in html upload to the form validations w backgrounds and tooltips.
              32629: THOR-199: Fix create user (activate) sometimes has to retry - due to: "Deadlock ... alfresco.permissions.insert_AclMember-Inline"
              32654: THOR-692: Disable (auto) home folder creation
           35831: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              32661: Latest SpringSurf libs: 
           35832: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              32666: Build: add cloud/cloud-share to ant clean-modules/clean
              32672: Ensure that application context is available for TenantAlfrescoAuthenticator in TenantUserFactory
              32675: THOR-536: Added TenantPageTypeViewResolver
              32686: JMeter test script updates (#5)
              32700: THOR-689: DevTest: 2 uploads failed (out of 10000) - missing retry ?
           35844:Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              32702: JMeter test script update
              32718: THOR-691: Feed Notifier sends emails on startup of Server
              32756: Fixed THOR-556 "Can't view members in a public Site"
           35845: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: (+ resolved conflicts w/ 4.0.1)
              32032: THOR-370: Add tenant-switching to /cmisatom (OpenCMIS-based v4.x impl => AlfrescoCmisService)
           35846: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              32759: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1
                      32757: Fix for ALF-9365
              32761: Changed restricted tenant to appear as page not found
              32763: THOR-792: Ensure that failed login returns to login page
              32769: Updated networks icon
              32770: Authentication updates: Unauthenticated requests to inaccessible tenants (either that don't exist or not authorized to access) will be prompted for authentication and if credentials are valid the "Page Not Found" page will be shown, but authentication will have completed and user can return to their home dashboard via link provided
              32785: Fix for THOR-798
              32789: THOR-796: reduce startup time (1000s of tenants)
           35847: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              32790: THOR-480: Spring Surf lib updates - ensure that i18n properties extensions degrade the specificity of the locale to ensure that no message keys are shown (unless the message genuinely doesn't exist)
              32798: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1: (fix for THOR-721)
                   32245: Unit tests for ALF-10343, with the problematic parts commented out pending a fix
                   32251: ALF-11664 site.public.group (via SysAdminParams.SitePublicGroup) should be used when updating site visibilities, as it is for creating sites
           35848: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              32805: Latest SpringSurf libs:
        47085: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35849: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              32807: Fixed invalid network switching URLs
              32808: Updated Spring Surf libs to that revert invalid changes to relativeUri determining method
              32837: Set Alfresco connector reconnect timeout to zero
              32856: Fix for THOR-801. Trying to access the archive as 'admin' gives error.
           35850: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              32858: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1: 
                 (pull in some pre-reqs for cleaner merge of ALF-10826)
                 31864: ALF-10686 - Original modification date is lost when files are copied into Alfresco via CIFS
                 31934: Update stale File State Cache.
                 32068: ALF-10941 - CIFS Open file from excel
                 32097: build fix.
                 32131: ALF-10902 - No friendly notification occurs when Editor or Collaborator tries to delete content
                 32132: Open read-only for attributes only.
                 32182: ALF-10963      Cannot overwrite files on CIFS share with Notepad++
              32876: THOR-784: Fix 'Accounts API loading is very slow' (get page of accounts)
              32939: THOR-480: Latest Spring Surf libs - fix i18n extensibility problems.
              32948: THOR-859: Performance: Disable rules service
              32953: THOR-863: Performance: loadUserByUsername -> isAdminAuthority
              32959: (RECORD ONLY) Merged HEAD to DEV/THOR1
                 32958: (record-only) Merged Dev/THOR1 to HEAD
                    32945: Fix for ALF-12122 Some CMIS queries with SOLR are not returning correct results
           35853: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              33024: Fixed THOR-670 "Incorrect window title for 'Task History' page"
              33027: Missing merge info for r32694
           35854: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
               33033: Latest SpringSurf libs:
           35855: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              33038: Minor: do not bootstrap web script readme x2 into Data Dictionary (when creating tenant)
              33039: Resolve THOR-839: Following webscripts doesn't set Content-Type response header
              33040:  Fixed THOR-817 "Issues with "invite user" email autocomplete field"
              33041: Fixed THOR-789 "Mix of languages"
              33042: Resolved THOR-849: Upload issue ? - Failed to get content ... (No such file or directory) ... x22
   48169: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47176: (RECORD ONLY) Fix Eclipse .classpath to match Spring Surf libs
   48170: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        48168: CONV: Fix NPE in get people CQ
   48183: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47184: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                35989: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/THOR1:
                     34153: Minor: THOR-5: MT-aware immutable singletons (spp/vti)
                     34161: Prevent session timeout redirect problem resulting from clicking user link in activities feed
                     34183: Part one of THOR-1129.
                     34185: Part two of THOR-1129. The Thor-specific parts.
                     34199: Fix for THOR-106 a failing test case that was switched off.
                     34202: THOR-106 addendum. Editing build.xml to put the test class back in to the build.
                     34211: BM: sync ThorTest (additional coverage)
                     34308: Merged HEAD to THOR1_SPRINTS
                          34250: Fixed THOR-1137 "Make Spring Surf enable-auto-deploy-modules by default"
                     34540: Share UI - copyright should be 2012 (related to THOR-1015)
                     35286: Resolve THOR-1242: Update Beta Logo
   48187: Merged DEV/CONV_V413 to DEV/CONV_HEAD
        47086: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35860: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              33057: Refactored Slingshot overrides so that they are now in the Thor-Share private module. This has been done to reduce conflict issues when merging back into HEAD.  The overrides are now in the correct locations (the only files that could not be moved to the private module are urlrewrite.xml and surf.xml).
           35870: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: (part 1 - repository project)
              33022: THOR-662: Email templates should load/resolve (initially) from classpath
           35877: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              33090: ALF-10826: hidden aspect
              33091: THOR-416: fix surf-config folder (appears where it shouldn't)
              33093: Sweep through email templates.
           35881: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              33104: Tweak to invitation email template
              33112: Refactored impl of THOR-694 so that content limit of 25Mb is on by default in THOR for both local FS and S3-based FS.
                 Changed ContentLimitProvider bean to take String limit, rather than long - to allow empty string value on core Alfresco.
                 Set the limit to the empty string in core Alfresco, which means 'no limit'.
                 Applied the limit always.
                 Set the limit to 25Mb in Thor/alfresco-global.properties
                 Fixed a minor bug in error reporting due to previous exception renaming.
           35885: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              33134: THOR-874: Updated Surf libs Fixes ArrayIndexOutOfBoundsException caused by multiple threads apply i18n extensions to a WebScript
              33135: Missing WebScripts sources JAR from r33134
              33153: Resolve THOR-551: Password Hashes Need Review
              33154: Update to latest email blacklist
              33155: Fixed THOR-534 "Login Box shows scroll bars"
              33156: Build fix for tests failing due to recent password changes
              33157: Build fix for updated email blacklist
              33172: THOR-776: Re-implement Share override as guided by Erik
              33173: THOR-831: Text in Someone
        47096: Fix merge compile issue
        47100: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35906: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              33054: THOR-796: slow startup time (on QA env with ~ 10k tenants)
              33055: Implementation of THOR-694. File size upload limit within ContentStore.
           35907: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              33213: THOR-833: wip
              33214: Allow for workflows which may have a reference to a repo based email template
              33228: Added extension points for links in user profile toolbar
              33230: Added extension points for links in user profile toolbar part 2
              33232: Fixed THOR-907 "Remove Share functionality which allows access to people profiles outside of your site memberships"
              33233: Fixed THOR-907 "Remove Share functionality which allows access to people profiles outside of your site memberships" part 2
              33234: Extension points in members bar now ft the pattern of user profile toolbar.
              33236: Fixed THOR-907 "Remove Share functionality which allows access to people profiles outside of your site memberships" part 3
              33241: THOR-908 - wip
              33243: THOR-908 / THOR-64 - wip
              33253: Fixed THOR-907 "Remove Share functionality which allows access to people profiles outside of your site memberships" part 4
              33255: Fixed THOR-907 Remove Share functionality which allows access to people profiles outside of your site memberships part 5
        47169: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35913: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
              33410: Merged form THOR1_SHARE_PERFORMANCE to THOR1_SPRINTS
                   33111 Branch for testing out new Spring Surf client side resource improvements
                   33291 Share client side resource handling to avoid stale client side cache part 1
                      - New spring surf libs with <@script> & <@link> directives that adds the checksum of the file to avoid client cache beoming stale
                      - Refactored most old <script> to become <@script>
                      - Refactored most old <link> to become <@link>
                      - Removed old <@link> macro from alfresco-temaplte.ftl, resources.get.html.ftl & corm-console.ftl (now using the directive instead)
                      - i18n messages now imported by <@generateMessages> directive to avoid stale cache
                      - Added calendar, cookie, resize & uploader yui modues to yui common to decrease the number of .js files requested
                      - Added new YUI module filter that adds "-min.js?v=<YAHOO.VERSION>" to stop a yui resources being stale after a yui upgrade
                   33307 Share client side resource handling to avoid stale client side cache part 2
                      - Made TinyMCE avoid becoming stale after a new release
                   33334 Share client side resource handling to avoid stale client side cache part 2
                      - New surf libs with <@checksumResource> directive used by ie6.css, ie7.css, ipad.css & tiny_mce.js to avoid manual change of version number in script import
                   33368 Share client side resource handling to avoid stale client side cache part 3
                      - Avoiding re-load of .js, .css & images (referenced from a .css) when switching tenants (note images that have been referenced using <img src=""> will get reloaded)
                   33405 CSS import duplication fix
           35914: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
              33417: Thor JMeter test script tweaks
              33420: THOR-1000: Solr tracking: NodeContentGet should not create (empty) temp file if there is no transformer (eg. for image node)
              33434: The <#if> statement & <script> element for google analytics wasn't in sync, causing a closing </script> element always being printed.
              33440: Latest SpringSurf libs - performance and thread safety improvements.
              33458: ThorTest-preReg (JMeter) test update
              33460: Latest SpringSurf libs:
              33466: THOR-1002: Updated enterprise overlay
              33480: Latest SpringSurf libs - Surf performance improvements from Thor high load profiling in Jmeter/Jprofiler
           35915: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
              33493: THOR-979: HTML5 upload support
              33505: THOR-983: Preload images, JS and CSS for basic dashboards, document library and document details (from login page)
              33518: THOR-979: HTML5 upload tweaks (upload doesn't start automatically when updating to give opportunity to set version type and add comment
              33520: THOR-900: Modified header.get.html.ftl to ensure that user name is URL encoded (so that the "@" symbol in the user name becomes "%40" to ensure that timeout redirects work)
              33527: THOR-1027: Header Alfresco image now links back to application context and about dialog is now linked from footer Alfresco image
              33551: THOR-1007: Fixed upload hang on FireFox when uploading folders
           35916: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
              33556: Merged BRANCHES/DEV/THOR1_INVITATION to BRANCHES/DEV/THOR1_SPRINTS:
                   33386: Branch for Invitation enhancements
                   33474: THOR-1006. Part 1. Services-level changes to support invitation enhancements.
                   33475: THOR-1006. Documentation on the desc.xml.
                   33476: THOR-1006. Commenting out some unfinished code to avoid any unwanted side-effects.
                             Still to do: get the authentication check working and ensure no unexpected side-effects.
                   33483: THOR-1006. Completion of basic services changes to support 'accept invitation on alternate email'.
                       Note! The authentication of the alternative email's password is NOT YET IMPLEMENTED due to a repo
                             dependency. This MUST be implemented before merge to THOR1_SPRINTS. I'll create a new JIRA.
                   33511:  Fix for THOR-1017.
                   33525: THOR-1017. Slight improvement to desc.xml doc. HTTP status codes in response.
                   33529: Fixed THOR-980 & THOR-1024 & THOR-1025
                   33553: Fixed THOR-980 "F14: Allow users to login using existing email address if invite is sent to wrong email address and they already have an account"
              33571: Fixed HTML5 uploader to work with profile avatar image upload
              33585: Thor JMeter test script tweaks
              33596: THOR-1035: Enabled HTML5 uploader for application logo upload
              33598: THOR-1031: Reduced HTML5 checks for uploader to ensure that it works for Safari on Mac
              33603: THOR-1039: Updated UX for HTML5 upload when 0kb files are selected
              33606: THOR-1037: Updated variable titles for HTML5/DND upload dialog to support update
           35917: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
              33615: Latest SpringSurf libs - performance and concurrency improvements
              33690: Resolve THOR-1003: Forgotten Password email is case sensitive
              33692: Merged BRANCHES/DEV/THOR1_PRIVACY to BRANCHES/DEV/THOR1_SPRINTS:
                   33488: Reversed merge revisions related to THOR-907 - 33232, 33233, 33236 - hand tweaks related to 33253, 33255.
                   33492: Removed unused import of com.sun... class
                   33497: Fixes and improvements to user profile page loading - reducing remote calls required and refactoring link build code. Fixed a issue with displaying the Following link on other users profile page.
                   33506: THOR-1020: people visibility
                   33509: Reduced remote calls required to build user profile page.
                   33519: THOR-985, THOR-986
                   33542: THOR-989 - Added extensibility hooks to People Finder component
                   33558: THOR-1014: Profile visibility -1st cut for THOR-993 (/api/people)
                   33564: THOR-1014: Profile visibility - THOR-992 (/webframework/content/metadata?user=)
                   33569: Implemented THOR-985, THOR-986, THOR-989
                   33572: Performance improvement to remove the need for a share->repo call for each page or ajax request to resolve account class name.
                   33579: THOR-1020: cloud people API (re: visibility)
                   33599: Share Thor performance improvements - removed the need to call /internal/cloud/current-user inside various common components - now using cached data in user object.
                   33608: THOR-1014: Profile visibility - fix PeopleRestApiTest
                   33625: THOR-1020: people visibility
                   33632: THOR-984 - Hide Account Settings screen from External Users.
                   33636: THOR-1014: profile visibility
                   33670: THOR-1020/THOR-1014: people/profile visibility
                   33674: THOR-1047: Privacy REST - subscriptions (follower) API
                   33688: THOR-1047: Privacy REST - subscriptions (follower) API
              33696: Fix for THOR-785 "F272: API call to get the number of accounts"
              33698: THOR-1033: Fixed free accounts showing console settings (updated Spring Surf libs)
              33700: Committed other Surf updates missing from r33698 (WebScript JARs) to ensure that manifest meta-data isn't misleading
              33705: THOR-1052: VersionService: ensureVersioningEnabled
              33706: Merged BRANCHES/DEV/THOR1_UPLOADLIMITS to BRANCHES/DEV/THOR1_SPRINTS:
                   33510: (RECORD ONLY) File Upload Limit enhancements
                   33656: Account Quotas / File Upload limit pt1
                   33686: Modified dnd-upload and html-upload WebScripts to retrieve maximum upload size from internal service (and refactored core WebScripts to support override)
              33710: THOR-1020: Privacy (People REST API)
              33713: THOR-1020: Privacy (People REST API)
              33718: THOR-1020: Privacy (People REST API)
              33722: Thor JMeter test script
              33742: Latest SpringSurf libs - performance improvements and concurrency fixes
           35930: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
              33764: THOR-1021: F287: Account Types can define file size upload limits for the Account which are set when the account is upgraded/downgraded between Account types
              33767: Tweaked HTML5 upload dialog so that error messages are handled gracefully
              33785: Resolve THOR-457: Already have an account email template needs updating/fixing
              33786: Fix to issue spotted by DaveC where switching networks would not correctly refresh user metadata. Also fixed minor encoding issues in related Networks WebScripts.
              33792: Merged BRANCHES/DEV/THOR1_PUBLIC_EMAIL to BRANCHES/DEV/THOR1_SPRINTS:
                   33490: Initial feature branch
                   33535: Fix to unreported issue whereby DirectoryService.getDefaultAccount returns the home account.
                   33547: THOR-176. Invite new user (public domain email address) into site. Part 1.
                   33592: Further work for THOR-176. user metadata REST API now does not return homeTenant if the user is from a public email domain. This conditional removal of the 'homeTenant' JSON property is needed by Share.
                   33593: THOR-176. Refactor of UserTenant to use AccountClass to check isPublicEmailDomain.
                   33620: Fix for NPE in UserTenant.isPublicDomainUser(). The admin user has no account-type.
                   33627: Share updates for public e-mail
              33797: THOR-176: consolidate public domain check
              33802: Remove temporary option to use double @ login (as per THOR-156) - no longer required
              33804: Removed locale from the cachekey used for tenant page view cache.
              33810: Merged BRANCHES/DEV/THOR1_BLACKLIST to BRANCHES/DEV/THOR1_SPRINTS:
                   33709: Blacklist CRUD: THOR-974, THOR-975, THOR-976, THOR-977, THOR-978 (Part 1 - DAO layer)
                   33711: Blacklist CRUD: THOR-974, THOR-975, THOR-976, THOR-977, THOR-978 (Part 2 - Foundation Service layer)
                   33747: THOR-974, THOR-975, THOR-976, THOR-977 and THOR-978. REST API for CRUD of blacklisted email domains.
                   33809: THOR-974, THOR-975, THOR-976, THOR-977, THOR-978 Adding REST-client rcq files for blacklist CRUD.
           35933: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
              33814: Merged BRANCHES/DEV/THOR1_ACCOUNT_SETTINGS to BRANCHES/DEV/THOR1_SPRINTS:
                   33411: (RECORD ONLY) Thor account settings branch from Thor1_Sprints.
                   33607: Initial checkin for THOR-972, THOR-971, THOR-410
                   33621: THOR-972, THOR-971, THOR-410 - added missing files
                   33639: THOR-971, THOR-972, THOR-410:
                        - add paging properties to the list people web script
                        - default network admin to true and internal to null
                   33641: Second cut of THOR-964 "F173: Network admin can list users of network (with paging support)"
                   33642: THOR-972, THOR-971, THOR-410 - changed paging properties in list users
                   33652: Implemented THOR-964,THOR-965,THOR-965,THOR-966,THOR-967,THOR-968,THOR-969
                   33653: User action click event now stopped so it doesn't modify the url
                   33671: THOR-971: webscript implementation
                   33687: Making premote/demote available for network-admins and not only for admins. check for network admin role already exists in the service code.
                   33694: THOR-971:
                       - Added analytics handling
                       - Fixed invite share url to include tenant
                   33699: THOR-963    "F17: Network admin can add a one or more internal users to their network"
                   33702: THOR-971:
                        - changed the bulk create url
                        - changed the activate email template
                   33703: Make sure Java-based network admin scripts set the response status to 401 if the authenticated user is not a network admin
                   33737: THOR-410:
                       - more unit tests
                       - tidy up
                   33744: (RECORD ONLY) Merged BRANCHES/DEV/THOR1_USER_MANAGEMENT to BRANCHES/DEV/THOR1_ACCOUNT_SETTINGS:
                        33417: Thor JMeter test script tweaks
                        33420: THOR-1000: Solr tracking: NodeContentGet should not create (empty) temp file if there is no transformer (eg. for image node)
                        33434: The <#if> statement & <script> element for google analytics wasn't in sync, causing a closing </script> element always being printed.
                        33440: Latest SpringSurf libs - performance and thread safety improvements.
                        33458: ThorTest-preReg (JMeter) test update
                        33460: Latest SpringSurf libs:
                        33466: THOR-1002: Updated enterprise overlay
                        33480: Latest SpringSurf libs - Surf performance improvements from Thor high load profiling in Jmeter/Jprofiler
                        33493: THOR-979: HTML5 upload support
                        33505: THOR-983: Preload images, JS and CSS for basic dashboards, document library and document details (from login page)
                        33518: THOR-979: HTML5 upload tweaks (upload doesn't start automatically when updating to give opportunity to set version type and add comment
                        33520: THOR-900: Modified header.get.html.ftl to ensure that user name is URL encoded (so that the "@" symbol in the user name becomes "%40" to ensure that timeout redirects work)
                        33527: THOR-1027: Header Alfresco image now links back to application context and about dialog is now linked from footer Alfresco image
                        33551: THOR-1007: Fixed upload hang on FireFox when uploading folders
                        33556: Merged BRANCHES/DEV/THOR1_INVITATION to BRANCHES/DEV/THOR1_SPRINTS:
                             33386: Branch for Invitation enhancements
                             33474: THOR-1006. Part 1. Services-level changes to support invitation enhancements.
                             33475: THOR-1006. Documentation on the desc.xml.
                             33476: THOR-1006. Commenting out some unfinished code to avoid any unwanted side-effects.
                                          Still to do: get the authentication check working and ensure no unexpected side-effects.
                             33483: THOR-1006. Completion of basic services changes to support 'accept invitation on alternate email'.
                                 Note! The authentication of the alternative email's password is NOT YET IMPLEMENTED due to a repo
                                       dependency. This MUST be implemented before merge to THOR1_SPRINTS. I'll create a new JIRA.
                             33511:  Fix for THOR-1017.
                             33525: THOR-1017. Slight improvement to desc.xml doc. HTTP status codes in response.
                             33529: Fixed THOR-980 & THOR-1024 & THOR-1025
                             33553: Fixed THOR-980 "F14: Allow users to login using existing email address if invite is sent to wrong email address and they already have an account"
                        33559: Initial feature branch
                        33669: First cut of THOR-994 and THOR-995 - remove internal and external user from network.
                        33685: Making remove-external-user.delete.desc.xml accept a domainName templateArg as well as the existing accountId.
                        33716: THOR-994 and THOR-995. Remove user from network.
                            Addressing some review comments from DaveC. Refactoring mostly.
                            Also added protection on RegistrationService.deleteUser() to prevent deletion of last NetworkAdmin in network.
                   33745: Adding NetworkdAdmin protection to the remove-external-user.delete webscript.
                   33752: Additional fixes for THOR-966 & THOR-969
                       * Improved messages/dialogs: demoting yourself, demoting last admin, removing last admin
                       * New User Button align layout fix as requested by Imran
                   33754: Documentation for the remove-external-user.delete webscript.
                   33756: THOR-410:
                       - unit test tidy
                   33766: Fix for signup link when already logged in as another user
                   33769: THOR-963 "F17: Network admin can add a one or more internal users to their network"
                   33770: Ensure a 403 is returned (rather than 500) when attempt is made to remove last NetworkAdmin in a tenant.
                   33774: Added padding on top of name for the Manage Users screen as requested by ux
                   33790: Promote/demote icons from Imran
              33815: Fix issue with removal of public email user from last invited network
              33817: THOR-1060: Activities Feed - perf tweak to halve the number of generated feed entries
              33819: THOR-1060: fix ActivitiesFeed subsystem (re-)name
              33820: Merged BRANCHES/DEV/THOR1_ACCOUNT_SETTINGS to BRANCHES/DEV/THOR1_SPRINTS:
                   33756: THOR-410:
                       - unit test tidy
                   33766: Fix for signup link when already logged in as another user
                   33769: THOR-963 "F17: Network admin can add a one or more internal users to their network"
                   33770: Ensure a 403 is returned (rather than 500) when attempt is made to remove last NetworkAdmin in a tenant.
                   33774: Added padding on top of name for the Manage Users screen as requested by ux
                   33790: Promote/demote icons from Imran
              33825: People REST API
           35934: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
              33850: (RECORD ONLY) Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS
                   33843: Fix for ALF-12775
              33866: Fix for THOR-1071
              33878: Fix the build
              33881: THOR-1069: Ensure that invitations can be accepted when a user is already logged in
              33882: Resolve THOR-1082: Possible to register email address with invalid domain (according to our tenant id rules)
              33883: Resolve THOR-1070: External user's avatar not displayed on the People Finder page.
              33884: Fix solrcore.properties
              33899: Resolve THOR-1077: Incorrect free space displayed when uploading files which exceeds quota
              33922: Resolve THOR-1079: Incorrect behavior of the button "Save and close" to "Send Document (s) For Review" tasks.
              33933: Resolve THOR-1088: Hide Account Id from Account Summary Screen
              33934: Resolve THOR-1089: Review Account Quota text on Account Summary Screen
              33942: Fix for THOR-1094. InvalidDomains FTL couldn't handle NULL notes field.
                  This shouldn't arise in the field as we don't put NULL-valued notes in the DB, but it might matter in some test envs.
              33949: Resolve THOR-1093: Incorrect notification title displayed when trying to invite user from another network from Manage Users page
              33953: Fix for THOR issue where public users should not be able to see Following and Following Me tabs in their own profile.
           35954: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
              34140: THOR-1098: Prevent resources being requested twice (latest Surf libs)
              34153: Minor: THOR-5: MT-aware immutable singletons (spp/vti)
              34161: Prevent session timeout redirect problem resulting from clicking user link in activities feed
           35960: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
              34224: Fix for THOR-789 - Mix of languages. The original bug was not never actually completely fixed, added some additional handling in SpringSurf WebScripts View to not override the locale from the original request parameters if it has already been set elsewhere.
              34301: (RECORD ONLY) Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS:
                   34279: NodeDAO: re-parent "lost & found" orphan child nodes (see ALF-12358 & ALF-13066 / SYS-301)
              34343: (RECORD ONLY) Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS:
                   34338: NodeDAO: re-parent "lost & found" orphan child nodes (see ALF-12358 & ALF-13066 / SYS-301) - test fix
                   34341: NodeDAO: re-parent "lost & found" orphan child nodes (see ALF-12358 & ALF-13066 / SYS-301) - test fix
              34388: THOR-953/SYS-294: add db.pool.evict.num.tests option (=> numTestsPerEvictionRun)
              34729: (RECORD ONLY) Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS:
                   31867: Merged DEV/TEMPORARY to V3.4-BUG-FIX
                        31400: ALF-10764: PDF vs 1.5 cause crash jvm
                           - PDFRenderer library has been updated from 2009-09-27 to 0.9.1 version to support PDF documents of 1.5 version
                   32061: ALF-11376 Requesting PDFBox 1.6 be included in future service pack release.
                        Upgrading pdfbox,fontbox,jempbox from 1.5.0 to 1.6.0
              34731: THOR-1261: repo cluster fix (propertyUniqueContextCache)
              34734: THOR-1261: repo cluster fix (propertyUniqueContextCache)
              34435: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS:
                   34434: ALF-13066: Fix for intermittent failure (testConcurrentLinkToDeletedNode)
           35961: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
              34558: THOR-1216: tenant context mismatch (Solr tracking)
              34606: THOR-1216: tenant context mismatch
              34441: (RECORD ONLY) Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/THOR1_SPRINTS
                   33285: Fix for ALF-12336 - Share loses performance if noncachableObjectTypes are defined (page & component)
              34489: Fix to remove hazelcast subdir from build.xml for -exploded build - Thor specific merge issue.
              34722: Added hazelcast-cloud jar to allow AWS Hazelcast config options for Share clustering on Thor
              34848: THOR - specific version of ClusterAwarePathStoreObjectPersister.
              34931: Thor specific lookup of Share custom app context files to include the custom-slingshot-cloud-context and custom-slingshot-application-context only and in the order we want. Also updated Hazelcast example config to include AWS by default
           35962: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
              34940: THOR-1288: Extra diagnostics for tracking leaked tenant context on thread:
              34187: Updated Surf libs (down grades duplicate dependency warnings to debug info)
              34410: THOR-1169: Latest Spring Surf libs to fix missing template CSS probs
              34418: (RECORD ONLY) Merged BRANCHES/DEV/BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/BRANCHES/DEV/THOR1_SPRINTS
                   34316: Method signature change to ConfigService fixes for RepoXMLConfigService
              34471: (RECORD ONLY) Merged BRANCHES/V4.0 to BRANCHES/DEV/THOR1_SPRINTS
                   34468: Fix for ALF-13172
                      Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V4.0
                         34467: Fix for ALF-13237 - Change dashboard Layout is not working correctly, original layout is still used after saving changes.
              34891: Added missing jug-asl-2.0.0.jar to slingshot deps for Thor
           35963: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/CLOUD1:
              35087: Minor: remove NOOP (introduced in r30776)
              35123: THOR-1288: update leak logger
              35124: THOR-1288: prod login failure when using cloud console for (bulk) signups
              35132: THOR-1288: build/test fix
              35133: THOR-1288: build/test fix
              35395: Resolve THOR-1340: Alberto.Vazquez@w.illi.am cannot sign up
           35964: Spring Surf library refresh
           35995: Fix merge issue
           35999: Fix merge issue
           36053: 1st pass at upgrading to latest Spring Surf
           36059: Fix CloudInvitationService tests for cloud1
   48191: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47185: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             MT - enable ability to get call context if overriding of beginCall/afterCall
             - eg. for cloud use-case (x-network switching)
   48192: Temporarily disable generation of installers, to speed up build


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@48255 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2013-03-18 09:52:08 +00:00
Jan Vonka
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
 2013-03-18 09:23:29 +00:00
Dave Ward
bf7da274c4 Merged V4.1-BUG-FIX to HEAD 
47870: ALF-13949: Copying folder which contains working copy doesn't work properly
   - Avoid interfering with current behaviour on a move in order to fix broken CIFS unit test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@47874 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2013-03-11 15:00:09 +00:00
Dave Ward
ca4089d895 Merged V4.1-BUG-FIX to HEAD 
47526: ALF-13949: Copying folder which contains working copy doesn't work properly.
   - Correct recursive copy and FileFolderService copy to respect the working copy renaming behaviour from ETHREEOH-2762
   - Fix researched by Alex Bykov
   47563: Merged PATCHES/V4.1.4 to V4.1-BUG-FIX
      47529: ALF-18207: Alfresco not starting with WQS module applied
      - Regression caused by change in surf constructor behaviour
      47536: ALF-18249: Alfresco doesn't start with Kerberos or NTLM authentification - Authentication filters do not demarcate transactions
      - Precautionary fix to restore existing behaviour regressed by ALF-17979
      - Don't try to use transactional caches if there is no transaction
      - Moving authentication filters to public PersonService would add necessary transaction demarcation, but may cause regressions due to permission evaluation
   47565: Merged PATCHES/V4.1.4 to V4.1-BUG-FIX (RECORD ONLY)
      47500: Merged V4.1-BUG-FIX to PATCHES/V4.1.4
         47497: Fixed ALF-13679 "Cannot play a movie file in Preview, which has double byte characters in the file name"
         - Fix from previous commit where a typo sneaked in just before commit
      47517: ALF-18243: Merged V4.1-BUG-FIX to PATCHES/V4.1.4
         47508: Merged HEAD to BRANCHES/DEV/V4.1-BUG-FIX
            47448: Optimize ApplicationScriptUtils.toJSON() - threadlocal cache for namespace resolution to avoid DD access, smarter retrieval of cm:person properties - 40% quicker or more in some cases
                   Convert short qnames to long qnames in our templates to avoid DD access to resolve full qnames
                   Optimize out N+1 queries from calling RatingService.getRating() unless the document has at least one Like (which is available in the rolled up property already present on the node) - up to 99% quicker when building "Likes" JSON structure...!
                   Added new optimized method to FileFolderService to retrieve a cm:name based path
            47484: Fix exception throw in FileFolderServiceImpl.getNameOnlyPath() to ensure only FileNotFoundException is thrown not RuntimeException to pass unit test.
            47504: Performance improvements to retrieving lists of nodes and single nodes.
                   - no longer perform N+1 queries to get thumbnails when retrieving nodes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@47566 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2013-03-05 12:14:18 +00:00
Kevin Roast
b029353cfc Fix exception throw in FileFolderServiceImpl.getNameOnlyPath() to ensure only FileNotFoundException is thrown not RuntimeException to pass unit test. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@47484 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2013-03-04 09:23:11 +00:00
Kevin Roast
3373456c13 . Optimize ApplicationScriptUtils.toJSON() - threadlocal cache for namespace resolution to avoid DD access, smarter retrieval of cm:person properties - 40% quicker or more in some cases 
. Convert short qnames to long qnames in our templates to avoid DD access to resolve full qnames
. Optimize out N+1 queries from calling RatingService.getRating() unless the document has at least one Like (which is available in the rolled up property already present on the node) - up to 99% quicker when building "Likes" JSON structure...!
. Added new optimized method to FileFolderService to retrieve a cm:name based path - only the String for each path element not the full FileInfo structure for each (avoid full getProperties() - 70% quicker to build webdav URL
overall before/after to retrieve doclist2 script (8x concurrent threads x25 repeats etc.) Before: 1030ms After: 645ms
Also improves original doclist script (used by dashlets) and single node retrievals.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@47448 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2013-03-01 15:43:08 +00:00
Dave Ward
fb887123ea Merged V4.1-BUG-FIX to HEAD 
44918: Fix for ALF-14850 Opencmis getTotalNumItems doesn't return the correct result when setting MaxItemsPerPage
   - correctly report the max number of items
   44927: ALF-16254 ("Leave Site" behaviour for group based site membership)
   44931: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (RECORD ONLY)
      44930: Merged V3.4 (3.4.12) to V3.4-BUG-FIX
         44929: Merged V4.1-BUG-FIX to V3.4 (3.4.12)
            42118: ALF-15878 ALF-15741: generate doc and src zip for web-framework-commons and jlan
   44939: Remove svn:mergeinfo
   44985: Merged DEV to V4.1-BUG-FIX
      44981: ALF-17085 : DB2: unexpected index found in database
         Correcting db structure after upgrade from 3.4. Optional statement was added.
   44988: Merged DEV to V4.1-BUG-FIX
      44937: ALF-16756: WebDAV: An error occurs on drag&drop content from local machine to alfresco when inbound move rule configured.
         Add check for content data length during determining existence of content on node.
   44989: Merged PATCHES/V4.1.3 to V4.1-BUG-FIX
      44984: Merged DEV to PATCHES/V4.1.3
         44983: ALF-12425: Can't launch activiti workflow console from Share when external / ntlm / kerberos authentication is used.
         In activiti-admin.get.js generated an absolute URL . Use  url.server + url.context  instead of /alfresco.
      44986: (RECORD ONLY) Merged DEV to PATCHES/V4.1.3
         44937: ALF-16756: WebDAV: An error occurs on drag&drop content from local machine to alfresco when inbound move rule configured.
         Add check for content data length during determining existence of content on node.
      44987: ALF-17331 60k Site Performance: Admin Console | Groups | Browse Groups (include sys groups): Pagination doesn't work correctly
   45008: ALF-17300 - ConcurrentModificationException
   45011: BDE-103 - Timezone test fail when not run from the UK (at least from Maven build)
   45054: Merged from DEV to V4.1-BUG-FIX
     ALF-13312 - If the license does not exist, please specify in the error message
   45055: Fix for ALF-13921. Description of the web project is not updated.
   45063: Slight improvement to test code as part of ALF-15413.
     Changing test code to get companyHome from repositoryHelper rather than Lucene query, which doesn't work on a dev box with ill-configured SOLR/Lucene.
   45170: Merged PATCHES\V4.1.3 to BRANCHES\DEV\V4.1-BUG-FIX
       45161: Fix for     ALF-17341  CLONE - Hyphen not handled correctly in cmis-alfresco search for Aspects/types : " no viable alternative at character 'a' "
   45192: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.1-BUG-FIX:
      45187: (RECORD ONLY) Fix for ALF-16997 Discrepancies between standalone and cluster ehcache config
   45312: Merged V4.0.2 (4.0.2.23-24) to V4.1-BUG-FIX (4.1.4)
      44912: MNT-248 - 4.0.2.22 HOT FIX: Extra version is created saving changes in OpenOffice document via CIFS
      44964: Merged DEV to PATCHES/V4.0.2
         44963: MNT-263 : CLONE - CIFS: Image document version history lost after saving content in Preview on Mac Mountain Lion
         Fix for "Preview" shuffle scenario on Mac Mountain Lion. New ScenarioDoubleRenameShuffle scenario was added for pattern .*\.sb(-[A-Za-z0-9]*){2}. Unit test for correspomding scenario was added.
      45037: Remove PID check from byte range lock list checks. MNT-266.
      45286: MNT-277 - CIFS: Input/output error during saving ods file via OpenOffice. (Linux Specific)
   45319: NORWEGIAN: Translation updates.
   45338: Merged V4.1.3 (4.1.3) to V4.1-BUG-FIX (4.1.4)
      45186: ALF-17303: fix naming mismatch when deploying alfresco-enterprise-repository artifactId to Maven
      45247: Part 2: Better fix for     ALF-16359 Fix SOLR logging in production and other environments
      45265: ALF-17337 Read time out when browsing trash can 
      45298: ALF-17389: Merged: CLOUD1 to V4.1.3
         45082: CLOUD-1139: Cloud feednotifier running on 2 boxes
         - FeedNotifierImpl modified to use reliable lock refresh
         - Added additional debug logging to AbstractUserNotifier just in case we have to prove duplicate entries are still being processed
         - For full debug logging set
            log4j.logger.org.alfresco.repo.activities.feed.FeedNotifier=debug 
         - Happy New Year!
   45355: ALF-17389: Fix build error
   45357: Fix for     ALF-17430  CMIS valid relationships do not check the source and target are valid CMIS docs or folders.
   45363: Merge CLOUD1-BUG-FIX to V4.1-BUG-FIX
     42576 : Job Locking of PostLookup
   45367: Build fix corrections to merge 45363
   45381: ALF-17389 : Implementing Activities Job Lock.
   45416: Merged V4.1.3 (4.1.3) to V4.1-BUG-FIX (4.1.4) RECORD ONLY
      45415: ALF-17389: Merged V4.1-BUG-FIX to V4.1.3 (4.1.3)
         << Previous merge was to the wrong branch >>
         45363: Merge CLOUD1-BUG-FIX to V4.1-BUG-FIX
           42576 : Job Locking of PostLookup
         45367: Build fix corrections to merge 45363
         45381: ALF-17389 : Implementing Activities Job Lock.
   45424: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2013_01_05 to BRANCHES/DEV/V4.1-BUG-FIX:
      45235: ALF-15604 : Oracle: schema reference files missing nvarchar2 column sizes
   45425: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2013_01_05 to BRANCHES/DEV/V4.1-BUG-FIX:
      45236: ALF-15604 : Oracle: schema reference files missing nvarchar2 column sizes
   45480: ALF-17224: There will not be a "pageList" object in the freemarker model if a wiki page does not exist in a site and the wiki dashlet will cause an error on the site
   45482: Fixed ALF-11036, applied the patch, ran the tests.
   45485: ALF-17224: If the wiki page which was configured in the wiki dashlet will be deleted the dashlet will cause an error. The result of the call must be checked.
   45513: MNT-279: Use binary search in cached authority search to cut down search time when a group contains an astronomical number of authorities
   - Experimental fix to cut down on severe profiling hit
   45542: Fix for ALF-17443 - Contributors cannot edit their own discussion reply
   --This line, and th se below, will be ignored--
   M    root/projects/remote-api/source/java/org/alfresco/repo/web/scripts/discussion/ForumPostPut.java
   M    root/projects/remote-api/source/java/org/alfresco/repo/web/scripts/discussion/DiscussionRestApiTest.java
   45550: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      44920: ALF-11315 removed date localisation on blogpost.lib.ftl dates and corrected date format on pubDate within postlist-rss.get.rss.ftl (iso8601 was being used instead of the required RFC822)
      44936: Fix build
      44967: Merged V3.4 to V3.4-BUG-FIX
         44966: Merged PATCHES/V3.4.11 to V3.4 (3.4.12)
            44891: ALF-17339: Merged DEV to V3.4.11 (3.4.11.2)
               44877: MNT-265: possible improvement to Alfresco SQL query?
               -   Add getOneTxnsByCommitTimeDescending function that makes efficient query to find most recent transaction in time range.
            44951: ALF-17325 / MNT-274: Merged HEAD to PATCHES/V3.4.11
               33015: ALF-11837 - Alfresco 4.0 SMTP Inbound does not work with messages without From and To Headers.
      45191: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX:
         45172: Fixed ALF-16140: Blank filetype icon is displayed for tiff image
      45436: Merged HEAD to BRANCHES/DEV/V3.4-BUG-FIX:
         31107: Google Docs SSL error
             * Fixed SSL required error that has appeared recently.
             * Google seemingly no longer supports non secure access to GDoc API.
             * Default URL's fixed up.
      45547: Merged V3.4 to V3.4-BUG-FIX
         45166: ALF-17339: Merged V3.4.11 (3.4.11.4) to V3.4 (3.4.12)
            45162: Merged DEV to V3.4.11 (3.4.11.4)
               44877: MNT-275 Possible issue with MNT-265 fix
                  - SQL from original HF should have used < rather than <= for upper time limit.
         45230: Merged DEV to V3.4 (3.4.12)
            45203: ALF-16992 : patch.fixAclInheritance is failing on sharedAclsThatDoNotInheritCorrectlyFromThePrimaryParent
            Ignoring of repeated ACL added
         45233: Mark the NFS server as active during startup. ALF-16228.
         45287: ALF-12145 Calendar autocomplete for advanced search form incorrectly handles zeros 
         45380: ALF-17461: There is different size of wcm-bootstrap-context.xml file from installer and archive
         - Replicated changes from ALF-11644 to Bitrock-installed copy of wcm-bootstrap-context.xml 
         45454: ALF-17396, ALF-13805: Merged V4.1-BUG-FIX (4.1.4) to V3.4 (3.4.12)
            Revision: 45452
            Author: kroast
            Date: 16 January 2013 09:59:45
            Message:
            Corrected config check for ALF-16413 - Share asks for Basic-Auth while not needed trying to access RSS feeds (thus breaking SSO).
            ----
            Modified : /alfresco/BRANCHES/DEV/V4.1-BUG-FIX/root/projects/slingshot/source/java/org/alfresco/web/site/servlet/SlingshotFeedController.java
         45491: Merge DEV to V3.4 (V3.4.12)
            45473: ALF-11956: WCM accessibility
            DOJO time picker has been fixed to allow selection of hours and minutes, using keyboard. Missing JavaScript key event handlers have been added.
            CSS class checking has been fixed in 'alfresco.xforms.FocusResolver' in 'xforms.js' to support all versions of IE. Some other minor changes...
         45543: Merged V4.1 to V3.4
            44743: ALF-17533 / ALF-17117: Created article or publication cant be viewed on WQS site
            - Further corrections to locking to avoid deadlocks
            44682: ALF-17512 / ALF-17118 WQS: Impossible to upload document to publications space
               - Only first part to do with the transformation failure has been committed. 
            44653: ALF-17533 / ALF-17117: Created article or publication cant be viewed on WQS site
            - Missed file from previous checkin
            44652: ALF-17533/ ALF-17117: Created article or publication cant be viewed on WQS site
            - Fixes by Dmitry Vaserin
            - Removed unnecessary outer read locks from getRelatedAssets and getRelatedAsset to prevent deadlock
            - Correct markup error when node doesn't have tags
         45546: ALF-17512: Corrections to property names by Pavel
      45548: Merged V3.4 to V3.4-BUG-FIX (RECORD ONLY)
         44977: Merged V3.4-BUG-FIX to V3.4
            44936: Fix build
   45553: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (RECORD ONLY)
      45523: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/V3.4-BUG-FIX:
         45482: Fixed ALF-11036, applied the patch, ran the tests.
   45557: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (RECORD ONLY)
      45556: Merged V3.4 to V3.4-BUG-FIX
         45554: Latest translations from Gloria for revision 45205
   45568: Merged PATCHES/V4.1.3 to V4.1-BUG-FIX
      45421: Merged HEAD to PATCHES\V4.1.3
          44243: Merged BRANCHES\DEV\AUTH_BRIDGE to HEAD
              43735: Final part of ALF-14861 	  SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
                     ALF-17489  ALF-17456
      45428: ALF-17455 : BM-0013: SOAK01_04: Activities Feed Cleaner query runs for minutes
      45489: ALF-17455 : BM-0013: SOAK01_04: Activities Feed Cleaner query runs for minutes
   45569: Merged PATCHES/V4.1.3 to V4.1-BUG-FIX (RECORD ONLY)
      45564: ALF-17492: WebScript errors must contain useful information 
      - So doth Derek decree
      - Copied in Surf revision 1217 changes as class local to share.war to avoid pulling in any more untested Surf changes
   45591: ALF-17465 (Document "social buttons/actions" not showing in document library page while document is being edited (locked))
   45601: ALF-17433 (Document detail version display incorrect document version when clicking on edit off line)
   45611: ALF-17478 - MailMetadataExtracter does not store all Message-Recipient-Address
   45622: Merged HEAD to BRANCHES/DEV/V4.1-BUG-FIX:
      35614: ALF-17598: CLONE - Add range header support to the webDAV servlet
   45633: ALF-17469: JSON message sent back to a client after a category creation is only partially JSON
   --This line, and th se below, will be ignored--
   M    category.post.json.ftl
   45641: Fix non-ASCII character in source comment
   45649: ALF-17556 (Share not redering URL correctly in description field)
   45650: Manually merged HEAD to BRANCHES/DEV/V4.1-BUG-FIX:
      - Changes to StreamContent from merge of THOR1_SPRINTS to HEAD in r34698
   45651: Merged HEAD to BRANCHES/DEV/V4.1-BUG-FIX:
      45222: ALF-17599: CLONE - Support For HTTP Range Requests in Repository WebScripts
           - Added HttpRangeProcessor.processRange which takes a WebScriptResponse parameter instead of HttpServletResponse
           - Changed HttpRangeProcessor.processSingeRange and HttpRangeProcessor.processMultiRange to accept a generic Object parameter then cast to the appropriate WebScriptResponse or HttpServletResponse
           - Added Javadoc to HttpRangeProcessor.processRange
           - Changed StreamContent.streamContentImpl to add code from BaseDownloadContentServlet which does the work of processing the range header from the request
           - Changed StreamContent.streamContentImpl method signature to accept nodeRef and propertyQName parameters needed for multi-range requests
           - Modified methods which override or call StreamContent.streamContentImpl for new method signature, passing in nodeRef and propertyQName or nulls where appropriate
   45655: Merged DEV to V4.1-BUG-FIX (4.1.4)
      45565: ALF-17503 : Lucene search with skipcount > hits fails when RM is installed
      Return a length=0 if a difference of values (count of finded results and results, that need to skip) is < 0
   45672: ALF-17452 (Status can't be updated with a blank status)
   45682: ALF-17444: Transformation of Outlook files (.msg) doesn't work ootb
   45751: Merged DEV to VC4.1-BUG-FIX (4.1.4)
      45748: ALF-17517: Document does not revert to previous version if certain rule is applied to the parent folder.
      Check node existance on ActionExecuterAbstractBase execution. Add unit test for case when inbound rule executed on node that was checked in.
   45758: ALF-12264: Fixed issue with pooled-tasks for groups with same name across tenants
   45761: Block r45756 from being merged to V4.1-BUG-FIX
   45765: Fix for     ALF-17153    FTS query parser FTSQueryParser is not debuggable
   45810: ALF-17520: Open Document templates are not tranformed properly for thumbnail and preview generation
   45828: Additional fix for     ALF-17153  FTS query parser FTSQueryParser is not debuggable
   45857: ALF-17516 (SHARE: Admin console of users and groups)
   45873: Remove so-called intermittent test category, so that only RepositoryStartupTest remains as a gatekeeper
   45903: ALF-16611 (When opening My Pages filter, a link to the renamed document becomes red)
   45906: ALF-17515: Wrong mimetype name in mimetype-map.xml
      - Changed macroEnabled to macroenabled
   45913: ALF-17462 (In Alfresco explorer invitation to a site does not show the correct options)
   45921: Fix for     ALF-17421  If a property is both multi-valued and multilingual a ClassCastException is thrown when Solr tries to index the property 
   - support multi-valued ML text but not content
   45926: Fix for     ALF-17602    lucene.defaultAnalyserResourceBundleName is not injected anywhere in the spring config
   46024: Merged V4.1.3 (4.1.3) to V4.1-BUG-FIX (4.1.4)
      45585: ALF-17303: alfresco-platform-distribution was not deployed properly to Maven repo
      45621: Removed svn:mergeinfo.  A 1.7 client should do this automatically.
      45669: Fix ALF-17582 - BM-0013: JMeter: Run 02: MT ContentStore caching is not thread safe
      45670: Fix ALF-17589 - BM-0013: JMeter: Run 02: CMISAbstractDictionaryService caching of DictionaryRegistry is not thread safe
      45692: Config option for     ALF-17526  BM-0013: JMeter: Run 02: Improve efficiency of services for SOLRAPIClient.getNodesMetaData 
      - preloading can be controlled + removed incorrect use of the secondary cache that could pull in stale data
      45705: Reverted Config option for     ALF-17526  BM-0013: JMeter: Run 02: Improve efficiency of services for SOLRAPIClient.getNodesMetaData 
      - preloading can be controlled + removed incorrect use of the secondary cache that could pull in stale data
      45716: Fix for ALF-17594 	SolrTracker: CMIS model diff (show 1 repeated diff) => CMIS dictionary re-init x2 (every 15 sec) 
      - only refresh the CMIS dictionary if there was an actual model put
      45755: Extra support to make clear what causes any difference between SOLR reports ALF-17588 	BM-0013: JMeter: Run 02: Deviation was detected in full index check reports for SOLR nodes. 
      - also added RETRY command to retry indexing any nodes that failed with errors.
      45803: Fix for     ALF-17490 Solr indexation problem with certain acls on a customer environment 
      - AclsGet respects the maximum acls requested and does not silently truncate toe 1024
      45829: GERMAN: Translation updates based on EN r45262
      45830: SPANISH: Translation updates based on EN r45262
      45831: FRENCH: Translation updates based on EN r45262
      45832: ITALIAN: Translation updates based on EN r45262
      45833: JAPANESE: Translation updates based on EN r45262
      45834: DUTCH: Translation updates based on EN r45262
      45835: RUSSIAN: Translation updates based on EN r45262
      45836: CHINESE: Translation updates based on EN r45262
      45858: Fix ALF-17634 -on startup FeedNotifier fetches all people slowly
      - switch from GetChildren CQ -> GetPeople CQ
      45859: Fix ALF-17634 -on startup FeedNotifier fetches all people slowly
      - reverse fix for this test ... for now, until we re-implement the deprecated method and fix the test case ;-)
      45951: Fix for     ALF-17687  BM-0013: Soak: Run 02: SolrJSONResultSet must preload nodes 
      - added node preload
      45952: SiteServiceImplTest: Added check that size limiting of results is working (and other minor cleanup)
      45953: Fixed ALF-17702: BM-0013: Soak: Run 02: getCachedChildAuthorities is not caching results 
       - getChildAssocs specifically checks for 'members' associations (was eliminated by code)
       - Cache negative results i.e. when there are no children
      45969: Part fix for     ALF-17526   BM-0013: Soak: Run 02: SOLRAPIClient.getNodesMetaData does N+1 calls to NodeDAO 
      - prependPaths caches nodes for the next layer
      45998: Part 2     ALF-17526   BM-0013: Soak: Run 02: SOLRAPIClient.getNodesMetaData does N+1 calls to NodeDAO 
      - make sure bulk node load works and that assocs are cached
      45999: Alternative implementation for     ALF-17719  BM-0013: Soak: Run 03: Contained authorities cache warmup times are restrictive 
      - bridge table is the default for hasAuthority()  - configurable on AuthorityServiceImpl
      46000: ALF-17574 BM-0013: JMeter: Run 02: Blocked threads on PDFParser.parse 
         - Found two blocking points in PdfBox to do with loading fonts from the class path (this was the main cause) and
           the PDFOperator access to a Synchronised map (identified above by Derek).
         - Note in 1.7.0 of PDFBox generally no font was loaded, but under 1.6.0 it was.
           This may be a bug in 1.7.0
      46001: ALF-17722: Merged V3.4 (3.4.12) to V4.1.3 (4.1.3)
         45629: ALF-17536: Stack Specific: Can't transform pdf to jpg
            - Added TRACE to log env properties using
              log4j.logger.org.alfresco.util.exec.RuntimeExec=trace
         45667: ALF-17536 Can't transform multi page pdf to jpg
            - issue was introduced by ALF-15436 Alfresco 3.4c + Share + TIFF preview only shows the first page
      46018: Merged HEAD to PATCHES/V4.1.3
         41904: Fixes bugs uncovered by JDK 7 upgrade
         - nodeService's interceptors depended on nodeService, resulting in some 'interesting' interceptor ordering in the chain (3 * the normal number in a random order). Now we use a lazy interceptor to break the cycle.
         - When the Content Language was en_GB and an MLText property contained {en_US, en_GB} it would return the en_US one, not taking country codes into account when available
      46023: Follow on to previous check in. Fix up evil cloud sync override of "nodeService" to also not suffer from a cyclic dependency!
   46034: Merged V3.4-BUG-FIX (3.4.13) to V4.1-BUG-FIX (4.1.4)
      45745: Merge V3.4 (3.4.12) to V3.4-BUG-FIX (3.4.13)
         45629: ALF-17536: Stack Specific: Can't transform pdf to jpg
            - Added TRACE to log env properties using
              log4j.logger.org.alfresco.util.exec.RuntimeExec=trace
         45667: ALF-17536 Can't transform multi page pdf to jpg
            - issue was introduced by ALF-15436 Alfresco 3.4c + Share + TIFF preview only shows the first page
         45724: ALF-17533 CLONE - Created article or publication cant be viewed on WQS site
            - Further change required to avoid deadlock
         45743: Correction to AuditComponentTest
            - Test was reporting "Incorrect number of audit entries after failed login expected:<1000> but was:<XXX>"
              where XXX was less than 1000. This was because results was being cleared if all all audit failures were
              not available in the first loop. The results needed to cleared before the first loop rather than in every
              loop. For example an XXX value of 830 would simply indicate that the first loop had received 170 audit
              results and that a second loop was required to get the rest.
      45754: Merged V3.4 (3.4.12) to V3.4-BUG-FIX (3.4.13)
         45747: Correction to AuditComponentTest
            - Okay last commit did not work. Try just waiting a bit longer than a second if we don't have all records.
      45976: Merged DEV to V3.4-BUG-FIX
         45925: ALF-16992 : patch.fixAclInheritance is failing on sharedAclsThatDoNotInheritCorrectlyFromThePrimaryParent
            Added a detection on cyclic loop for "inherits from" field.
   46037: Merged V4.1.3 (4.1.3) to V4.1-BUG-FIX (4.1.4)
      46033: Build fixes
      46032: ALF-17628 (No information is displayed in My Activities and Site Activities dashlets for content creation)
   46095: 
   46100: ALF-17773, ALF-17774, ALF-17775, ALF-17776: Merged V4.0.2 (4.0.2.26) to V4.1-BUG-FIX (4.1.4)
      45469: MNT-280: Merge from HEAD to V4.0.2 (4.0.2.25)
         43617: Fix for     ALF-16795 CMIS 0.8 TCK - load of large content fails
      45875: Merged DEV to V4.0.2 (4.0.2.26)
         45874: MNT-282: Mbean error stemming from cmis create.
         Synchronize initiating ContentStore.
         Add tenant name to object name of ContentStore MBean for preventing overriding of tenant MBeans.
      45904: MNT-285 Content Stream Errors during CMIS load test (Continuation of MNT-280)
         - Added 'advice' above retrying transactions to supply a ReusableContentStream
      45910: MNT-285 Content Stream Errors during CMIS load test (Continuation of MNT-280)
         - Added unit tests - tests both new TempFileProvider method and AlfrescoCmisStreamInterceptor
         - Corrections to interceptor
   46104: ALF-15843: Upgrade swftools back to 0.9.2
   46109: Merged RECORD ONLY V4.1.3 (4.1.3) to V4.1-BUG-FIX (4.1.4)
      46106: Merged V4.1-BUG-FIX (4.1.4) to V4.1.3 (4.1.3)
         46100: ALF-17773, ALF-17774, ALF-17775, ALF-17776: Merged V4.0.2 (4.0.2.26) to V4.1-BUG-FIX (4.1.4)
            45469: MNT-280: Merge from HEAD to V4.0.2 (4.0.2.25)
               43617: Fix for     ALF-16795 CMIS 0.8 TCK - load of large content fails
            45875: Merged DEV to V4.0.2 (4.0.2.26)
               45874: MNT-282: Mbean error stemming from cmis create.
               Synchronize initiating ContentStore.
               Add tenant name to object name of ContentStore MBean for preventing overriding of tenant MBeans.
            45904: MNT-285 Content Stream Errors during CMIS load test (Continuation of MNT-280)
               - Added 'advice' above retrying transactions to supply a ReusableContentStream
            45910: MNT-285 Content Stream Errors during CMIS load test (Continuation of MNT-280)
               - Added unit tests - tests both new TempFileProvider method and AlfrescoCmisStreamInterceptor
               - Corrections to interceptor
      46087: Merge V4.1-BUG-FIX (4.1.4) to V4.1.3 (4.1.3)
         45480: ALF-17224: There will not be a "pageList" object in the freemarker model if a wiki page does not exist in a site and the wiki dashlet will cause an error on the site
   46112: Merged (4.1.3) to V4.1-BUG-FIX (4.1.4)
      46048: ALF-17727 - BM-0013: Soak: Run 03: Site creation leads to contention on sites container
      - disable auditable behaviour on "sites" container (when creating a site)
      46050: ALF-17727 - BM-0013: Soak: Run 03: Site creation leads to contention on sites container
      - disable auditable behaviour on "sites" container (when deleting a site)
      46055: ALF-17729 - BM-0013: Soak: Run 03: ADMRemoteStore optimization to reduce contention on share folders
      - disable auditable behaviour on parent folder (when creating / deleting file)
      46059: Fixed ALF-17756: Thumbnails are being indexed 
       - Add the cm:indexControl aspect to thumbnails at creation time
       - Also prevent timestamp propagation when adding or removing thumbnails
      46077: Following on from rev 46059 (ALF-17756): Fixed up the mock NodeService.createNode call as we now pass in indexControl properties
      46078: Build fix for SiteServiceImplTest.testGroupMembership(SiteServiceImplTest.java:1308)
      46079: Additional fix for out of transaction tests
   46124: Reverse merge
      << Will A. did not intend to commit this >>
      46095: 
   46159: Fixed ALF-16889, Enabled cookie support for /wcs/api/login, independent from SSOAuthenticationFilter, on by default.
   46165: Fix for ALF-17787 - Site Members 'All Members' link should not run query immediately
   46169: Fix for ALF-17787 - Site Members 'All Members' link should not run query immediately - missing file
   46184: Refactoring a test class to use JUnit Rules - as part of attempt to reproduce ALF-17797.
   Using JUnit Rules like this will make it much easier to switch users between test methods.
   Checking in separately from future work as this check-in is a pure refactor.
   46185: ALF-17503 : Lucene search with skipcount > hits fails when RM is installed
      Fix build failures
      - Correct tests which expected -ve number of rows returned in a resultset
   46192: Enhancement to JUnit Rule TemporaryNodes.java as required by fix for ALF-17797.
   This check-in enhances TemporaryNodes to allow for the easy creation of specific named quick files.
   Previously you could only easily create a quick file selected by MIME type.
   Now you can use e.g. 'quickCorrupt.pdf' to get that specific file.
   46194: Fix for ALF-17797. AddFailedThumbnailActionExecuter is failing.
   This check-in adds a test case that reproduces the issue and a fix.
   The fix was to have the AddFailedThumbnailActionExecuter action runAs system.
   This is consistent with the behaviour of the create-thumbnail action itself.
   There is no way via the ActionService to run an action (in this case a compensating action)
   as a nominated user, and therefore I have had to change the implementation of
   AddFailedThumbnailActionExecuter.executeImpl so that it always runs-as system.
   46202: ALF-17644: Document version was increased after canceling editing.
   - Also a better fix for ALF-17167
   46208: ALF-17517 Document does not revert to previous version if certain rule is applied to the parent folder.
      - fix build failures (may still be one left) - Not all actions are node based
   46230: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (4.1.4)
      46227: Filter repository test resources from alfresco.war
   46272: ALF-17841: Upgrade 4.0 --> 4.1.4 ClassCastException from OnPropertyUpdateRuleTrigger
   - Only listen for updates of single-valued content properties and cope with it previously being multi-valued (as can be the case with the devious license property)
   46279: ALF-17810: Imagemagick requires installation of Visual C++ redistributables
   - x86 VC++ 2008 SP1 redistributables now installed to support ImageMagick
   46354: ALF-10569: Reversing r32622 as it was due to an invalid interpretation of a Microsoft spec and should be unnecessary for the correct support of WebDAV 'dead properties'.
   - Correct fix about to be merged in from V3.4-BUG-FIX
   46360: ALF-17697: Create proper source jars, to deploy to Maven repository
   46361: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      45756: ALF-14722: Repeat merge of V4.1-BUG-FIX to V3.4-BUG-FIX - previous merge in r43028 did not bring over all required changes
      42902: Merged DEV to V4.1-BUG-FIX
         42519: ALF-13588: Google Doc failed to authenticate after incorrect password being entered for google account
            Add ability to unregister class behaviours.
            Unregister googledocs behaviours when subsystem stops. 
      45948: Merged DEV/WABSON/V4.1-GOOGLEDOCS-BUG-FIX to DEV/V3.4-BUG_FIX
         45898: ALF-17704 / ALF-16167: 'Edit Offline' checks out document in Google docs
            - Edit in Google Docs action is now decoupled from Edit Offline action
            - The checkout to Google Docs is only performed if a new parameter 'gdc' is set as a paramter when calling the action web script
            - This paramter causes the web script to call a new method checkoutToGoogleDocs() on ScriptNode if the parameter is set
            - The new method simply calls the existing checkout() method after setting a custom property on the transaction
            - The Google Docs policies now check for the presence of this transaction property before sending the document to Google
      45976: ALF-17876: Merged DEV to V3.4-BUG-FIX
         45925: ALF-16992 : patch.fixAclInheritance is failing on sharedAclsThatDoNotInheritCorrectlyFromThePrimaryParent
            Added a detection on cyclic loop for "inherits from" field.
      46041: ALF-17877: Merged DEV to V3.4-BUG-FIX (with corrections)
         46013: ALF-17662 : The deleted via Sharepoint document is not removed from Alfresco but hidden aspect is added for it
         Documents marked with sys:hidden aspect should be invisible through SPP protocol and should be treated as nonexistent.
      46054: ALF-17878 / ALF-17633 add alfresco-mmt.jar in the SDK distribution
      46173: ALF-17879 / ALF-17806: Merged PATCHES/V3.4.10 to V3.4-BUG-FIX
         46099: MNT-293: Merged V4.0-BUG-FIX to PATCHES/V3.4.10
            37969: Fixes for:
            ALF-12772 'Path not found' error in Share if user has no permissions to parent folders in breadcrumb
            ALF-14527 Share - Error to display documents if user has no access to the parent folder
            - Share now correctly supports accessing documents and folders (and details page actions) where the user does not have Read permissions on the parent node.
         46101: MNT-293: AccessDenied using CMIS when user does not have access to parent folder
         - Fix by Vasily
         46125: MNT-293: Correct Kev's logic to do permission checks after resolving a path as system
         46127: Merged V3.4 to PATCHES/V3.4.10
            45743: Correction to AuditComponentTest
               - Test was reporting "Incorrect number of audit entries after failed login expected:<1000> but was:<XXX>"
                 where XXX was less than 1000. This was because results was being cleared if all all audit failures were
                 not available in the first loop. The results needed to cleared before the first loop rather than in every
                 loop. For example an XXX value of 830 would simply indicate that the first loop had received 170 audit
                 results and that a second loop was required to get the rest.  
            45747: Correction to AuditComponentTest
               - Okay last commit did not work. Try just waiting a bit longer than a second if we don't have all records.   
      46195: ALF-17880 / ALF-17378: Web content is not editable after cancelling the Edit Web Content Wizard
      - Fix by Andrey
      46227: Filter repository test resources from alfresco.war
      46324: Merged DEV to V3.4-BUG-FIX (with improvements)
         45602: ALF-10569 / ALF-17519 : SPP is setting residual properties with an unknown name space (urn:schemas-microsoft-com)
         Implemented special case for handling dead webdav properties. New webdav:object aspect was introduced. It is used to 
         store all dead properties that may be set on resource.
      46353: ALF-17881 / ALF-17272: TooManyClauses error due to syntax error in the query generated from UIComponentSelector
      - Fixed typo in Lucene query generation introduced in r20310
   46362: ALF-17876: Re-fix typo introduced in V3.4-BUG-FIX merge
   46363: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (RECORD ONLY)
      46285: Merged V4.1-BUG-FIX to V3.4-BUG-FIX
         46279: ALF-17810: Imagemagick requires installation of Visual C++ redistributables
         - x86 VC++ 2008 SP1 redistributables now installed to support ImageMagick
      46325: ALF-17863: Merged V4.1-BUG-FIX to V3.4-BUG-FIX
         43649: ALF-16756: WebDAV: An error occurs on drag&drop content from local machine to alfresco when inbound move rule configured. 
         43651: ALF-16756: Fixed typos - I took this code in good faith!
         44988: Merged DEV to V4.1-BUG-FIX
            44937: ALF-16756: WebDAV: An error occurs on drag&drop content from local machine to alfresco when inbound move rule configured.
               Add check for content data length during determining existence of content on node.
   46395: Merged V4.1.3 (4.1.3) to V4.1-BUG-FIX (4.1.4)
      46121: Fixed code warnings
      46123: Further improvements on ALF-17702: BM-0013: Soak: Run 02: getCachedChildAuthorities is not caching result
       - Reduced cache entry size
       - Removed binary sort search for authority entries
       - PS: This is one of the most heavily used code paths in the system
      46153: Merged DEV to V4.1.3 (4.1.3)
         << Lots of other changes in addition to merged code>>
         46093: ALF-16149 : CLONE - User search retrieves all users from the DB regardless of search criteria
            - Re-implemented deprecated method PersonServiceImpl.getPeople(...) to use getPeopleCQ or FTS search
         - Replaced calls to deprecated getPeople with calls to other one where it would end up being called anyway.
         - Fixed PersonServiceTests
         - Fixed GetPeopleCannedQuery to use totalResultCount - tests failed otherwise
         - Added warning to PersonService.getPeopleFilteredByProperty(...) if PROP_FIRSTNAME, PROP_LASTNAME, PROP_USERNAME
           were not being used. This was the one place that 'could' called the deprecated getPeople(...) method with
      	 other properties. Other properties are not included in the search values.
      46178: ALF-17796 - BM-0013: Soak: Run 04: Contention on folder 'user' containing users
      - disable auditable behaviour on parent folders (see also ALF-17729)
      46244: Fix for     ALF-17801   BM-0013: Soak: Run 04: ConcurrentModificationException in AbstractLuceneQueryParser 
      - consistently name anonymous constraints defined on properties
      46265: ALF-17799 - BM-0013: Soak: Run 04: Regular timeouts getting site memberships
      - initial fix: make sure limit cut-off is also applied when processing "groups to expand"
      46286: Fix for     ALF-17801   BM-0013: Soak: Run 04: ConcurrentModificationException in AbstractLuceneQueryParser 
      - build fixes for 
         1) Anonymous over-ridden constraints defined to contain the wrong property definition (no matter)
         2) but above causes name collision on over-ridden anonymous constraints on properties
         3) fix -over ride order to set inherited property definition info before over-ridding the property
      46290: ALF-17799 - BM-0013: Soak: Run 04: Regular timeouts getting site memberships
      - fix SiteActivityTest fallout (and adhere to current API contract)
      46315: ALF-17788: WebSphere: QueryException occurs during the clean startup
      - Corrected regression where FeedNotifier tries to scroll past the end of a result set
      46316: ALF-17702: Fixed regression of MNT-279 fix
      - Avoid sequential search across massive user sets when evaluating ACLs
      46350: Update Maven POM files
       - Upgrade version to 4.1.3
       - Upgrade pdfbox to 1.7.0-alfresco-20130130, to catch up after r46000 fixing ALF-17574
      46370: ALF-17613: Merged V4.0.2 (4.0.2.27) to V4.1.3 (4.1.3)
         46368: MNT-298 HF - Replace file by drag-and-drop over CIFS on Mac OS X and passthru/LDAP-AD gets "is in use" message and deletes the file 
   46421: Fix for ALF-17886. DeleteRenditionActionExecuter Acces is denied.
   With test of course.
   46438: ALF-17622 (Activities with Google Docs are not displayed in My Site Activities and Site Activities dashlets)
   46445: Fix for  ALF-17327 Cannot retrieve documents with a Japanese keyword.
   46457: ALF-17904 (GoogleDocs action doesn't work in doclib view)
   46482: Fix for ALF-17858. NPE in formService webscript.
   46497: Fix for ALF-15371 Instances of java.util.Map interface cannot be accessed in JavaScript
   The fix was to have getDefaultValue(Class) return the map.toString. It was previously returning null.
   46533: ALF-17286: SPP (Cluster specific):Document workspace is not browseable via Share if alfresco.host is pointing to balancer host
    - Ensure that concurrency conditions from AclDAO get propagagedby NodeDAO
   46540: Fix for     ALF-17397  searching based on property value that contains dashes doesn't work in a crossloanguage context using Solr 
   - fixed - also added support for query/index time analysis control for the default cross-language analyser. 
   - Not required to resolve the bug but may be useful to reduce query complexity (e.g. do not generate concatenated tokens for query)
      which could have been used as a work around for this bug if available.
   46546: Merged DEV to V4.1-BUG-FIX
      46494: ALF-17899 TempFileProvider.createTempFile() is not debugable
      Added debug logs.
   46562: ALF-17917: Corrected internationalization of Imap Home folder
   - Unfinished business from ALF-15700
   46563: Fix for ALF-17572 - Grey background in 'Google Docs Theme' when uploading files with IE8
   46564: Fix for ALF-17150 - Edit Online action missing in Share for some mime types (incorrect mimetype for PowerPoint files with SLDM extension)
   46565: ALF-17917: Correction to previous fix
   - Use distinct key spaces.imap_home.childname, because spaces.imapConfig.childname was already being used for other purposes
   46568: Fix for ALF-17757 and ALF-1101
   RSS Dashlet cannot display RSS feed produced by Shareӳ blog / RSS Feed Dashlet unable to read internal Alfesco Share site RSS Feeds
   - Fix implementation from Will Abson
   NOTE: there is a cavet, suggest SSO style config as per ALF-16413 to avoid basic auth pop-up when displaying some feeds.
   46624: removed
   46625: Undo last commit
   46626: Merged V4.1.1 (4.1.1.21) to V4.1-BUG-FIX (4.1.4)
      46602: ALF-17953: Alfresco constantly running full GCs
      - Possible fix to TikaPoweredContentTransformer to make it wrap FileContentReaders as TikaInputStreams which can be cast to Files and appear not to need reading into memory in their entirety in uncompressed form!
      - Fix also required to TikaOfficeDetectParser to avoid it wrapping a TikaInputStream unnecessarily
   46629: RECORD ONLY Merged V4.1.3 (4.1.3) to V4.1-BUG-FIX (4.1.4)
      46622: ALF-17968: Merged V4.0.2 (4.1.1.21) to V4.1.3 (4.1.3)
         46602: ALF-17953: Alfresco constantly running full GCs
         - Possible fix to TikaPoweredContentTransformer to make it wrap FileContentReaders as TikaInputStreams which can be cast to Files and appear not to need reading into memory in their entirety in uncompressed form!
         - Fix also required to TikaOfficeDetectParser to avoid it wrapping a TikaInputStream unnecessarily
         46607: ALF-17953 Alfresco constantly running full GC's - some java.lang.threads holding around 9Gb of memory
            - Added transformation limits to the 8 TikaPoweredContentTransformer based transformers, so that the maxSourceSizeKBytes
              can be set for each transformer and for each source mimetype used by each transformer.
            - maxSourceSizeKBytes set to 40MB for the newer 2007 MS office types (4 char ext).
         46619: ALF-17953 Alfresco constantly running full GC's - some java.lang.threads holding around 9Gb of memory
            - Changed maxSourceSizeKBytes values from 40MB back to -1 for the newer 2007 MS office types (4 char ext).
   46636: Fix for     ALF-13442      Tomcat memory leak warnings occur during the shutdown
   46679: Merged DEV to V4.1-BUG-FIX (4.1.4)
      46659: ALF-17631 : Errors/Exception during stress tests of CMIS GET children
      RetryingTransactionHelper has now ability to handle pre-configured exceptions as retriable in addition to default list of exceptions.
   46683: Merge PATCHES/V4.1.3 to V4.1-BUG-FIX (4.1.4)
      46637: Update the notice.txt and licenses with the latest modifications
   Add Microsoft Visual C++ 2008 Redistributable Package in the notice.txt
   46693: RECORD ONLY Merged V3.4-BUG-FIX (3.4.13) to V4.1-BUG-FIX (4.1.4)
      46692: ALF-17984: Merged V3.4.12 (3.4.12.2) to V3.4-BUG-FIX (3.4.13)
         46680: MNT-307: DEV to V3.4.12 (3.4.12.2)
            46659: ALF-17631 : Errors/Exception during stress tests of CMIS GET children
            RetryingTransactionHelper has now ability to handle pre-configured exceptions as retriable in addition to default list of exceptions.
            - Change to opencmis-context.xml on DEV (based on 4.1.4) was made to cmis-ws-context.xml on V3.4.12
   46694: Merged DEV to V4.1-BUG-FIX (4.1.4)
      46686: ALF-17631 : Errors/Exception during stress tests of CMIS GET children
      Unit test add for RetryingTransactionHelper to test extra exceptions are rertied correctly.
   46724: create-site.css and create-site.js will be included in the header (share-config.xml) therefore there is no reason to include them in the freemarker templates.
   46759: Merged DEV to V4.1-BUG-FIX (4.1.4)
      46734: ALF-17873 Missing versionLabel property after Version2ServiceImpl.restore()
      1. In Version2ServiceImpl.restore() to props Map was added ContentModel.PROP_VERSION_LABEL property.
      2. In VersionServiceImplTest.testRestore() was added the check that ContentModel.PROP_VERSION_LABEL property is correct.
   46760: Merged DEV to V4.1-BUG-FIX (4.1.4)
      46433: ALF-16883: Incorrect message occurred when delete Workspace if document is locked.
      Not possible to change MS Office message - have improved alfresco log message
   46782: ALF-17317 4.0.2.23 HOT FIX: OpenOffice server conversion failed 
   46783: ALF-17546 OOXMLThumbnailContentTransformer is not registered to handle special Office document types, such as templates and macro-enabled variants of document / template 
   46797: Restore missing mergeinfo accidentally removed in r46562
   46799: ALF-17546 OOXMLThumbnailContentTransformer is not registered to handle special Office document types, such as templates and macro-enabled variants of document / template
      - typo in mimetype case
   46916: ALF-17174 pdf2swf supports converting N first pages but alfresco does not support it via the pageLimit 
   46933: ALF-8144: Drastically improving performance using lazy-loaded WorklfowTask properties and path + improved the way share pages workflow-tasks to prevent building full model for unneeded tasks
   46946: ALF-18000: Startup script depends on the working directory where it is run
   - Changed vti.properties to
   vti.server.ssl.keystore=${dir.keystore}/vti.ssl.keystore 
   46995: Improvement related to     ALF-17380   Solr queries running slowly 
   - reader -> acl cache is built on demand (and warmed via authority warming)
   - this will mean it is not eagerly built for the archive store where it would be little used, and could be configured off for this case
   47032: ALF-17804: cmisatom URL (opencmis backed by Apache Chemistry OpenCMIS) does not support External authentication
    - Now it supports all kinds of authentication because it sits behind Alfresco's authentication filters
    - Fix researched by Alex Mukha
   47033: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      46453: ALF-18122 / ALF-17708: Incorrect behavior of "Show/Hide Breadcrumb" button when RM is installed
      - ContentService.getReader() now triggers a transaction retry if content is found to have disappeared under its feet due to eager content cleaning
      46495: ALF-18122 / ALF-17708: Incorrect behavior of "Show/Hide Breadcrumb" button when RM is installed
      - lower impact fix will only throw retryable exception if stream is accessed
      46822: ALF-18123: Merge Dev to V3.4-BUG-FIX
        ALF-17408 : Content is not displayed in imap folder after recovering
      46823: ALF-18124 / ALF-18091: Fix for MNT-311 - authentication challenge not present when users open direct links below /share/proxy/alfresco/cmis/i
      46927: ALF-18124 / ALF-18091: Merged PATCHES/V3.4.10 to V3.4-BUG-FIX
         46925: Merged V3.4-BUG-FIX to PATCHES/V3.4.10 (with correction)
            46823: Fix for MNT-311 - authentication challenge not present when users open direct links below /share/proxy/alfresco/cmis/*/content
      46942: ALF-17990: Fix security descriptors for new FileFolderService isHidden setHidden methods
      47021: ALF-18125: Merged DEV to V3.4-BUG-FIX
         46825: ALF-17681 : Lucene Search queries with PATH doesn't work in tenants
         A JUnit test was implemented to show that the PATH Lucene indexes are not created correctly for tenants. 
         46968: ALF-17681 : Lucene Search queries with PATH doesn't work in tenants
         The creation of PATH indexes is now made in context of multi tenant System user to run the reindexing process correctly in unauthenticated threads.
   47034: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (RECORD ONLY)
      47030: ALF-16102: Merged PATCHES/V3.4.10 to V3.4-BUG-FIX (RECORD ONLY)
         41755: ALF-16013: Merged V4.1-BUG-FIX to PATCHES/V3.4.10
            41539: ALF-15899: Inbound email does not support multiple recipient folders
               - Fix by Dmitry Vaserin
      47031: ALF-18121: Merged PATCHES/V3.4.11 to V3.4-BUG-FIX
         46978: MNT-320: Merged HEAD to PATCHES/V3.4.11:
            36623: ALF-10243: form-service date-control now allows configuring only to send date-component of date-only formfields (timezone and time-component is reset server-side to prevent unnecesairy timezone-issues)
   47035: Merged PATCHES/V4.1.3 to V4.1-BUG-FIX
      46398: Fix for     ALF-17889   Alfresco failing as constraint in extension model cannot be defined 
      - use the namespace from the containing model and not the over-ridden property.
      46426: Merged BRANCHES/DEV/V4.1-BUG-FIX to PATCHES/V4.1.3:
         46421: Fix for ALF-17886. DeleteRenditionActionExecuter Acces is denied.
      46446: ALF-17864: BM-0013: Soak: Run 05: SiteService.listSites(username, size) performance (=> via listSitesImpl)
      - isAuthorityContained made to prune its search drastically - it caches hits and misses speeding up the search in a deeply nested group hierarchy such as SAP's
      - To avoid huge memory impact with lots of duplicate copies of authority names a pool of authority names is shared across all threads
      - getContainingAuthoritesInZone reinstated for site listing as it warms the same caches as the ACLs
      - Derek's latest tests with the changes applied showed a good speed up
      46501: ALF-17929: BM-0013: Soak: Run 06: /api/sites/{shortname}/memberships/{authorityname} / SiteServiceImpl.getMembersRoleInfo performance poor
      - Possible fix to regression caused by ALF-16254
      - A very inefficient route was being taken towards checking a user's indirect site role
      46502: ALF-17930: BM-0013: Soak: Run 06: ConcurrentModificationException in AuthorityDAOImpl
      - Don't try to mutate the set returned by getContainingAuthorities()
      46503: ALF-17929: BM-0013: Soak: Run 06: /api/sites/{shortname}/memberships/{authorityname} / SiteServiceImpl.getMembersRoleInfo performance poor
      - Further optimizations to prevent unnecessary recursion in AuthorityDAOImpl.listAuthorities()
      46506: ALF-17929: BM-0013: Soak: Run 06: /api/sites/{shortname}/memberships/{authorityname} / SiteServiceImpl.getMembersRoleInfo performance poor
      - Fixed typo producing invalid membership results
      46627: ALF-17967: Error in org.alfresco.repo.workflow.WorkflowServiceImpl.getPooledTasks on StartUp.
      - Logic error in org.alfresco.repo.workflow.WorkflowServiceImpl.getPooledTasks() introduced in ALF-14861 / r45421
      - Rather than fixing the screwy logic (which I think would cause a major performance hit) I'm reinstating the 4.1.2 "cut off after 100 groups" behaviour
      46630: Merged 4.1-BUG-FIX to PATCHES/V4.1.3
         46562: ALF-17917: Corrected internationalization of Imap Home folder
         - Unfinished business from ALF-15700
         46565: ALF-17917: Correction to previous fix
         - Use distinct key spaces.imap_home.childname, because spaces.imapConfig.childname was already being used for other purposes
      46779: ALF-17967: Error in org.alfresco.repo.workflow.WorkflowServiceImpl.getPooledTasks on StartUp.
      - Improved fix that uses the bridge table cache if it is available
      - Groups queried for pooled tasks still limited to 100 by default but can be configured with system.workflow.maxAuthoritiesForPooledTasks
      - Overall number of results can be cut off with system.workflow.maxPooledTasks
      47013: Fix HiddenAspect to NOT use permission-checking NodeService
       - Should fix ALF-17605: CLONE - Severe performance problems with Group ACL checking under stress test 
      47018: (RECORD ONLY) Disabled EmailServiceImplTest.testEmailContributorsAuthority pending ALF-17979
   47036: Merged PATCHES/V4.1.2 to V4.1-BUG-FIX
      46180: Merged DEV to PATCHES/V4.1.2
         46170: MNT-299 : CLONE - Activity feeds get not generated in private sites for added files if username in LDAP-AD contains uppercase letters
            Improved debug logging for Activity Feed and Activity Post DAOs.
   47037: ALF-17973 (Incorrect name (title.single/title.multi) for "cloud target selection" window when RM is installed)
   47042: RM-601 (Copy/Move dialog causes an error in firebug console)
   47047: DE: Translation update based on EN r46507
   47048: SPANISH: Translation update based on EN r46507
   47049: FRENCH: Translation update based on EN r46507
   47050: ITALIAN: Translation update based on EN r46507
   47051: NORWEGIAN: Translation update based on EN r46507
   47052: JAPANESE: Translation update based on EN r46507
   47089: ALF-17089 (Displaying Url Name instead of site Name in Select form)
   47102: New Norwegian translations from Gloria plus Bitrock configuration to enable them
   47110: ALF-10243: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      47105: ALF-18121: Merged PATCHES/V3.4.11 to V3.4-BUG-FIX
         47040: MNT-323: Fixed issue with passing empty due date when starting workflow
         47101: MNT-320: also applied fix to wcmquickstart module
      47109: ALF-18121: Merged PATCHES/V3.4.11 to V3.4-BUG-FIX
         47106: MNT-320: Merged V4.1-BUG-FIX to PATCHES/V3.4.11
            41010: ALF-15697: Not possible to start workflow not specifying the Due Date
               - Regression caused by ALF-10243
   47135: DUTCH: Translation update based on EN r46507
   47137: RUSSIAN: Translation update based on EN r46507
   47138: CHINESE: Translation update based on EN r46507
   47141: Fix for     ALF-17979    EmailServiceImplTest intermittently failing
   47147: Part 2 of    ALF-17979   EmailServiceImplTest intermittently failing 
   - fix related cache to avoid any future issue
   47148: ALF-17804: Fix NPE
   47171: ALF-18060: removing obsolete expensive sorting and preventing too many variable-queries to be performed when listing COMPLETED WorkflowTask


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@47186 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2013-02-27 11:56:13 +00:00
Mark Rogers
f880d47128 ALF-11698 Cifs needs to set hidden file attribute 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@45668 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2013-01-21 15:28:41 +00:00
Dave Ward
d0739b811d Merged V4.1-BUG-FIX to HEAD 
43905: Fixed ALF-16166 "Breadcrumb not refreshing after Move action is used."
   43909: Merged V3.4-BUF-GIX (3.4.12) to V4.1-BUG-FIX (4.1.3)
      43908: Minor changes to TransformerDebug to make output more readable when there are exceptions.
   43912: Fix for ALF-16578. Now guesses the mimetype correctly - (actually uses the existing type).
   43915: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_11_12 to BRANCHES/DEV/V4.1-BUG-FIX:
      43853: ALF-15984: "Concurrent Editing" problem with Edit Online functionality with Office 2010
   43916: Fixed ALF-16906: MySQL: Add support for persisting special numeric property values
    - Double and Float special values ("NaN", "-Infinity" and "Infinity") are persisted
      in alf_node_properties in their string form.
    - Checks included to ensure that conversions to and from Double and Float are covered correctly
   43926: ALF-16909: Discussion topics are sorted in ascending order (oldest first and newest last) when selecting 'All topics'
   - Fixed unit test to expect newest first, as re-introduced into 3.4.12
   43927: ALF-12711: Fixed 'test mode' behaviour of MailActionExecuter
   43928: Merged V4.1 to V4.1-BUG-FIX
      43906: ALF-15993: Installation folder is not empty after uninstall
      - Added webquickstart log removal
      43917: ALF-16886: SubscriptionServiceActivitiesTest and SiteServiceTest failing on Oracle
      - Fix by Dmitry
      43920: ALF-16753: RU: Incorrect date format in Alfresco Explorer 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@43929 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2012-11-24 12:05:57 +00:00
Dave Ward
182c29aac2 Merged V4.1-BUG-FIX to HEAD 
43628: Fix for ALF-16299 - On full user profile, in the 'Sites' tab, the site descriptions are not aligned when a long site description is provided.
   43639: ALF-16701: use newly released Spring Surf 1.2.0-M1 rather than a SNAPSHOT
   43644: ALF-16527: webscript person.lib.ftl does not include all attributes for users out of the box.
       - added missing organizationId attribute.
   43649: ALF-16756: WebDAV: An error occurs on drag&drop content from local machine to alfresco when inbound move rule configured. 
   43651: ALF-16756: Fixed typos - I took this code in good faith!
   43659: ALF-16006: MT: Document Library is absent after upgrade from 3.4.x to 4.1.x (eg. 3.4.10 -> 4.1.1)
       - More patch dependencies required
   43666: ALF-16833 / MNT-187: Fixed regression in inbound rule firing caused by the fix to ALF-14744
   - Inbound rules were not firing for newly created content nodes that had null content properties (e.g. dataListItems)
   - Now the ALF-14744 fix has been revised so that inbound rules are only not fired for new nodes with zero-length content, as possibly created by the OSX / Windows 7 WebDAV clients during an upload, and only if policy.content.update.ignoreEmpty=true (the default)
   - OnContentUpdateRuleTrigger removed. Now all content property updates are handled by OnPropertyUpdateRuleTrigger so that we can have this subtle treatment of 'empty' content properties.
   - Reverted ALF-14744 changes to RuleServiceCoverageTest and added new tests for 'empty' content and ASPECT_NO_CONTENT
   - Updated RuleTriggerTest in line with changes
   43675: Merged V4.1 to V4.1-BUG-FIX
      43674: Merged PATCHES/V4.1.1 to V4.1
         43673: Merged V3.4-BUG-FIX to PATCHES/V4.1.1
            43672: ALF-16834, ALF-16833, MNT-187: Fix unit test failures and 'fine tune' logic to handle multiple updates within a single transaction creating a node
   43676: ALF-12324: Can't delete site with WQS content
   - Don't try to add nodes to the publish queue on site deletion
   43689: Fix for ALF-14207 - cm:link not correctly handled in Share's doclist when users don't have permission
   43690: Fix for ALF-16538 - Wrong label on change group permission message
   43696: ALF-16348 (Inconsistent error message when latest manager leaves a site)
   43719: ALF-16031: "CMISChangeLog does not log Created events"
   43720: ALF-14137: "When calling CMIS getAllVersions method using the OpenCMIS Browser the PreparedStatement is executed multiple times"
   43722: ALF-16352: Re-instated manage permissions action to document list view
   43745: Fix for ALF-15351.
   ContentModelFormProcessor had a TODO to handle associations defined on aspects other than
   those aspects already on the node for which a form is being submitted.
   I've added code that, when an association is added to a node, will check if the association
   is defined on any aspect in the system and if it is, it will let the association be created.
   43757: ALF-16171: If a password for admin user is specified with a space in the end during the installation Alfresco startup fails
      - Added validation that will not allow the specified password to contain leading to trailing white space
   43760: Fixed ALF-16317 "Labels not displaying full text when creating a rule on a folder with IE8" part 2
   43769: Fix for ALF-13461.
   Merged PATCHES/V3.4.8 to BRANCHES/DEV/V4.1-BUG-FIX:
      43344: MNT-162: Merged DEV to PATCHES/V3.4.8
           43254: MNT-162: CLONE - Hidden folder "Comments" is available to searching
              - Removed last '/' from COMMENT_QNAMEPATH constant.
   43770: ALF-15616: Merged V3.4-BUG-FIX (3.4.12) to V4.1-BUG-FIX (4.1.3)
      43768: Merged Dev to V3.4-BUG-FIX (3.4.12)
         43743: ALF-11956: WCM accessibility
         The problem with absence of initial focus on the first Web form element has been resolved in 'alfresco.xforms.XForm._loadHandler()'. This method creates all controls, defined in the form.
         'alfresco.xforms.FocusResolver._findControl()' has been renamed to a public-like method ('alfresco.xforms.FocusResolver.findControl()'). Also it has been modified to introduce a possibility of searching elements, using root XForms widgets container.
         Some other minor fixes.
   43772: Fixed ALF-16497 "Selected Items drop down box is expanded to the right in IE9"
   43787: Merged in Philippe's fix for ALF-16313:unmakeTranslation() called on pivot language gives exception
   43794: ALF-16155: "Notification digest accumulates and is repeatedly sent if 1 or more notification email fails"
   43805: ALF-16212: Fixes double encoding issue.
   43835: Fixed ALF-13595: Patches third party library date.js to prevent infinite loop.
   43836: ALF-16480: Merged PATCHES/V4.1.1 to V4.1-BUG-FIX
       43252: MNT-166: Document lock not removed after the lock expiry date has been reached
           -  Changed evaluator "evaluator.doclib.metadata.isLocked" to use "evaluator.doclib.indicator.nodeLocked" and "evaluator.doclib.indicator.lockOwner" evaluator.
       43253: MNT-165: "Cancel Editing" does not completely remove lock from document
           - Added documentLibrary cancel editing action for locked documents.
       43300: MNT-171: Merged V4.1-BUG-FIX to PATCHES/V4.1.1 (modified)
       43096: Fix for ALF-16283 - When document is checked out, 'Edit Online' and 'Upload New Version' options should not be visible on the original document.
       43311: MNT-165: "Cancel Editing" does not completely remove lock from document
           - Fix for page refresh problem when cancel editing on details page
       43421: MNT-186: 4.1.1.7 HF: Webscipt error on doclib page, containing locked by other users files
           - Change evaluator.doclib.metadata.isLocked to break circular dependency
       43755: MNT-202: Upload New Version not available for a document that has been edited offline
           - Upload New Version is now available if editable by user (respecting locks, type of checkout, etc).
   43844: ALF-16696: Merged DEV to V4.1-BUG-FIX
       43734: Share nodebrowser is unable to access node of a document with MS residual properties
           - Use localname if no prefix is registered for a namespace uri
   43864: Fixed ALF-16320 "Properties side panel collapses after editing properties in document preview window with IE8"
   43866: Fixed ALF-16320 "Properties side panel collapses after editing properties in document preview window with IE8" part 2
   - Checking using YAHOO.util.Event.getTarget instead
   43867: Fixed ALF-16276 "'"Web View' dahslet displays 2 scrollbars in IE8."
   43872: Merged V4.1 to V4.1-BUG-FIX
      43622: ALF-16757: Sharepoint doesn't work correct with SSO
      - Fix by Pavel
      43633: Latest translations from Gloria (r43623)
      43636: Merged PATCHES/V4.1.1 to V4.1
         43301: ALF-16811 / MNT-173: SOLR tracking spending too long evaluating paths
         - Too much time was being spent fetching the individual nodes in each path and there could be potentially thousands
         - Now we traverse all the ancestor parent associations in the cache before switching shared cache reads off, then bulk load them in one shot!
         43303: ALF-16812 / MNT-174: "dictionaryDAO.init() called, yet no namespace registry for domain" after node rejoins cluster
         - namespaceRegistryCache is secondary to the clustered dictionaryRegistryCache, so can be a non-clustered cache. Synchronization and thread locals already in use so still thread safe.
         - dictionaryDAO.init() now has sole responsibility of establishing the NamespaceRegistry threadlocal within its locks, so no more risk of cyclic dependencies, race conditions, partial initialization, or registries dropping out of the cache
         - To avoid being confused by the 'consistent read' behaviour of a transactional cache, DictionaryDAOImpl now reads / writes directly to a shared cache. Again locks and thread locals still used so still thread safe
         43334: ALF-16812 / MNT-174: Fixed failing unit tests
         - Because DictionaryDAOImpl now reads directly from the shared cache we need to reset it on initialization to avoid problems in multi-context unit tests
         43337: ALF-16811 / MNT-173: Fix test failure. Cope with IDs of deleted nodes in getCachedAncestors()
         43356: ALF-16811 / MNT-173: If we are disabling shared cache reads for the transaction, convert all existing reads and updates to avoid 'consistent read' behaviour giving us a potentially out of date node already accessed
         - Existing read buckets are simply thrown away
         - Updates are converted to removes to avoid any assumptions about existing shared cache content
         - New entries are left alone as they haven't come from the shared cache anyway
         43410: ALF-16813 / MNT-185: Web Scripts are being endlessly re-registering in clustered environment
         - Due to 'consistent read' behaviour of transactional cache
         - As accesses are regulated by RW locks we can read straight through to the shared cache instead
         43565: ALF-16814 / MNT-190: Bmlab Solr Node 2 threw unhandled NullPointerException (and possibly made solr unresponsive)
         - Added missing return statement
      43646: ALF-15755: Rationalization of WebDAVMethod.checkNode()
      43681: Merged HEAD to V4.1
         43656: Fix for ALF-16683 CMIS: cannot navigate to original document was created through CMIS with CHECKED OUT version state.
      43698: Latest Russian translations from Gloria
      43838: ALF-16875: Merged V4.1-BUG-FIX to V4.1
          43836: ALF-16480: Merged PATCHES/V4.1.1 to V4.1-BUG-FIX
              43252: MNT-166: Document lock not removed after the lock expiry date has been reached
                  -  Changed evaluator "evaluator.doclib.metadata.isLocked" to use "evaluator.doclib.indicator.nodeLocked" and "evaluator.doclib.indicator.lockOwner" evaluator.
              43253: MNT-165: "Cancel Editing" does not completely remove lock from document
                  - Added documentLibrary cancel editing action for locked documents.
              43300: MNT-171: Merged V4.1-BUG-FIX to PATCHES/V4.1.1 (modified)
              43096: Fix for ALF-16283 - When document is checked out, 'Edit Online' and 'Upload New Version' options should not be visible on the original document.
              43311: MNT-165: "Cancel Editing" does not completely remove lock from document
                  - Fix for page refresh problem when cancel editing on details page
              43421: MNT-186: 4.1.1.7 HF: Webscipt error on doclib page, containing locked by other users files
                  - Change evaluator.doclib.metadata.isLocked to break circular dependency
              43755: ALF-16890 / MNT-202: Upload New Version not available for a document that has been edited offline
                  - Upload New Version is now available if editable by user (respecting locks, type of checkout, etc).
      43868: Reverse merging r43838
      - Merge in wrong direction introducing duplicate fragment into share-documentlibrary-config.xml
      43871: ALF-16890: Merged PATCHES/V4.1.1 to V4.1
         43755: MNT-202: Upload New Version not available for a document that has been edited offline
             - Upload New Version is now available if editable by user (respecting locks, type of checkout, etc).
   43873: Merged V4.1 to V4.1-BUG-FIX (RECORD ONLY)
      43602: ALF-16254: Merged V4.1-BUG-FIX to V4.1
         43598: Merged HEAD to BRANCHES/DEV/V4.1-BUG-FIX
            41906: ALF-11378: REST API has been modified to return extra information about a user whether s/he belongs to a group or not.
      43612: ALF-16598: Merged V4.1-BUG-FIX to V4.1
          43252: MNT-166: Document lock not removed after the lock expiry date has been reached
              -  Changed evaluator "evaluator.doclib.metadata.isLocked" to use "evaluator.doclib.indicator.nodeLocked" and "evaluator.doclib.indicator.lockOwner" evaluator.
          43254: MNT-165: "Cancel Editing" does not completely remove lock from document
              - Added documentLibrary cancel editing action for locked documents.
          43300: MNT-171: Merged V4.1-BUG-FIX to PATCHES/V4.1.1 (modified)
              43096: Fix for ALF-16283 - When document is checked out, 'Edit Online' and 'Upload New Version' options should not be visible on the original document.
          43311: MNT-165: "Cancel Editing" does not completely remove lock from document
              - Fix for page refresh problem when cancel editing on details page
          43421: MNT-186: 4.1.1.7 HF: Webscipt error on doclib page, containing locked by other users files
              - Change evaluator.doclib.metadata.isLocked to break circular dependency
      43615: ALF-16794: Merged V4.1-BUG-FIX to V4.1
         43478: MNT-181: Now WebDAV will ALWAYS preserve the original metadata and versions of ANY node that is temporarily 'moved out' in ANY kind of 'shuffle' operation
         - To make the source node temporarily invisible to WebDAV the client specific HIDDEN aspect features are used
         - WebDAVHelper.isRenameShuffle() method introduced, to parallel ALF-3856 CIFS fix and using similar system.webdav.renameShufflePattern global property to detect the start of a shuffle
         - WebDAVHelper converted to use proper dependency injection
         - CopyMethod has become a simple subclass of MoveMethod as all the hidden aspect munging is done by it
         - DeleteMethod now preserves hidden nodes
         - PropFindMethod now ignores hidden nodes
         - Listing methods will hide hidden nodes from WebDAV
         43483: MNT-181: Corrected typo
         43523: MNT-181: Corrections
         - WebDAVLockService.unlock() made 'harmless' to call on already-unlocked nodes
         - Delete method hides rather than deletes versioned nodes and working copes in case it is called by OSX Finder during a 'replace' operation
         43524: MNT-181: Correction
         - PutMethod now 'unhides' hidden nodes and behaves as though it created them
         43570: MNT-181: More corrections researched by Valery
         - Don't treat all moves to temporary locations as copies - just those from non-temporary locations. Avoids initial upload leaving lots of hidden files around.
         - Only copy the content, not the whole node including aspects to avoid versioning temporary files!
         - Don't version on changes to sys:clientVisibilityMask - avoids 'double versioning'
         - Recognize Mac .TemporaryItems folder and ._ files as temporary
         43586: MNT-181: Final correction researched by Valery
         - Corrected system.webdav.renameShufflePattern so that it matches .TemporaryItems folder and ._ files as a full match
      43616: ALF-15755: Merged V4.1-BUG-FIX to V4.1    
          43591: ALF-16772: If the WebDAV path of a document exceeds 255 characters, documents opened in MSOffice cannot be saved back
              - Interpret null nodeLockToken as not locked.
      43629: Merged V4.1-BUG-FIX to V4.1 (4.1.2)
         43498: Fix for ALF-16648 - Alfresco Enterprise artifacts in artifacts.alfresco.com do not provide POM files / dependencies declarations:
         Merged HEAD to V4.1-BUG-FIX (4.1.2)
            43380: -- added site content for alfresco-platform-distribution POM
            43379: -- added site documentation for alfresco-platform-distribution POM
            43378: -- added site documentation for alfresco-platform-distribution POM
               -- deployed site for 4.2.b Community at https://artifacts.alfresco.com/nexus/content/repositories/alfresco-docs/alfresco-platform-distribution/latest/index.html
               -- created repository for Enterprise docs and added url in the appropriate edition properties
            43273: Use property to define POI version
            42966: ALF-14353 - Added platform distribution POM to standard maven-deploy procedure
            42965: ALF-14353 - added alfresco-platform-distribution to provide a Maven release descriptor (dependencyManagement) per each Community / Enterprise release
               -- moved maven-ant-tasks not to be in the runtime lib
               -- added platform distribution pom in the SDK folder
               -- updated maven.xml to deploy filter and deploy the appropriate platform-distribution POM per each releae
               -- in maven.xml moved configure-release and configure-snapshot goals to maven-env-prerequisites
               -- updated sdk readme to explain the presence of alfresco-platform-distribution POM
            42912: -- updated README header on the POM specifying it's NOT usable to build Alfresco
               -- make a clear reference to the POMs that get deployed by pom-experimental.xml being usable for development
            42842: ALF-14353: Fix artifactId alfresco-jlan -> alfresco-jlan-embed
            41883: ALF-14353 - fixed multiple Maven build issues. Now mvn clean install -f pom-experimental.xml works fine. Also deployed Spring Surf 1.2.0-SNAPSHOT so proper Surf version is retrieved
            41882: added pre-requisites to build POMs successfully with mvn clean install -f pom-experimental.xml
      43634: Merged V4.1-BUG-FIX to V4.1
         43386: ALF-13091: Prevent bean post processor propagation to child application contexts. Remove Jsr250BeanPostPorcessor from the CXF configuration, to prevent strange interaction with component scanning. 
      43641: Merged V4.1-BUG-FIX to V4.1 (4.1.2)
         43639: ALF-16701: use newly released Spring Surf 1.2.0-M1 in POM files rather than a SNAPSHOT
      43645: Merged V4.1-BUG-FIX to V4.1
          43644: ALF-16527: webscript person.lib.ftl does not include all attributes for users out of the box.
              - added missing organizationId attribute.
      43660: Merged V4.1-BUG-FIX to V4.1
          43659: ALF-16006: MT: Document Library is absent after upgrade from 3.4.x to 4.1.x (eg. 3.4.10 -> 4.1.1)
              - More patch dependencies required
      43669: Merged V4.1-BUG-FIX to V4.1
         43666: ALF-16833 / MNT-187: Fixed regression in inbound rule firing caused by the fix to ALF-14744
         - Inbound rules were not firing for newly created content nodes that had null content properties (e.g. dataListItems)
         - Now the ALF-14744 fix has been revised so that inbound rules are only not fired for new nodes with zero-length content, as possibly created by the OSX / Windows 7 WebDAV clients during an upload, and only if policy.content.update.ignoreEmpty=true (the default)
         - OnContentUpdateRuleTrigger removed. Now all content property updates are handled by OnPropertyUpdateRuleTrigger so that we can have this subtle treatment of 'empty' content properties.
         - Reverted ALF-14744 changes to RuleServiceCoverageTest and added new tests for 'empty' content and ASPECT_NO_CONTENT
         - Updated RuleTriggerTest in line with changes
      43697: Merged V4.1-BUG-FIX to V4.1
         43689: Fix for ALF-14207 - cm:link not correctly handled in Share's doclist when users don't have permission
      43761: Merged V4.1-BUG-FIX to V4.1
         43760: Fixed ALF-16317 "Labels not displaying full text when creating a rule on a folder with IE8" part 2
      43796: Merged V4.1-BUG-FIX to V4.1
         43795: Fix for ALF-16254 - "Leave Site" behaviour for group based site membership:
          Blah, Blah, Blah!
   43883: Fix for ALF-12711.
      Separated preparation of email message from sending of email message as described in
      analysis in JIRA. Did not merge the fix provided as MailActionExecuter.java.diff but
      reimplemented a fix based on that.
   43888: ALF-16781: Merged V3.4-BUG-FIX (3.4.12) to V4.1-BUG-FIX (4.1.3)
      43887: ALF-16898 CLONE - Transformation Server history shows incorrect transformation "To" type for images
         - ImageTransformActionExecuter ("Transform and Copy Image") re-factored to use ContentService
           rather than hard coded to ImageMagick
   43900: Merged V4.1 to V4.1-BUG-FIX
      43898: Merged PATCHES/V4.1.1 to V4.1
         43708: ALF-16903 / MNT-203: ACL changes not propagated between two non clustered Alfresco instances hitting same Solr and Database
         - Although SOLRTrackingComponentImpl was not trusting the cache when tracking node transactions, it was still trusting the cache for ACL change sets
         - This mean that when the SOLR node is using an Alfresco out of the cluster (which we are supposed to support) it could see stale ACLs
         - Fixed this by using the same strategy we use in AbstractNodeDAO
         - Now the main acl CRUD cache is set to ignore the shared cache during SOLR tracking
         - All secondary ACL caches are keyed by ACL ID AND version, so it prevents the possibility of retrieving a stale cached ACL for an old version
         43713: ALF-16903 / MNT-203: ACL changes not propagated between two non clustered Alfresco instances hitting same Solr and Database
         - Fix test failures
         - deleteAccessControlEntries must 'touch' all the ACLs it affects to keep caches valid
         - createAccessControlList should return the newly-versioned ACL
         43736: ALF-16904 / MNT-204: Index showing no progress on Solr server
         - SAP's tracking thread got stuck indefinitely waiting on a content response after sending a request, probably due to some misbehaving proxy or balancer
         - Now we make it possible to recover from this
         - A new alfresco.socketTimeout parameter is now supported in solrcore.properties
         - It specifies the number of milliseconds SOLR will wait before giving up waiting for data on an HTTP connection
         - The default is still zero which means wait indefinitely
         43759: ALF-16904 / MNT-204: Fixed compilation error
      43899: Merged PATCHES/V4.1.1 to V4.1 (RECORD ONLY)
         43667: Merged V4.1-BUG-FIX to PATCHES/V4.1.1
            43666: ALF-16833 / MNT-187: Fixed regression in inbound rule firing caused by the fix to ALF-14744
            - Inbound rules were not firing for newly created content nodes that had null content properties (e.g. dataListItems)
            - Now the ALF-14744 fix has been revised so that inbound rules are only not fired for new nodes with zero-length content, as possibly created by the OSX / Windows 7 WebDAV clients during an upload, and only if policy.content.update.ignoreEmpty=true (the default)
            - OnContentUpdateRuleTrigger removed. Now all content property updates are handled by OnPropertyUpdateRuleTrigger so that we can have this subtle treatment of 'empty' content properties.
            - Reverted ALF-14744 changes to RuleServiceCoverageTest and added new tests for 'empty' content and ASPECT_NO_CONTENT
            - Updated RuleTriggerTest in line with changes
   43901: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      43571: Merged DEV to V3.4-BUG-FIX 
       43569: ALF-16222: It's impossible to delete a file/message via IMAP using Microsoft Entourage 2008 in MacOSX 10.8
         fixed: UID failed.Existing file or folder error on attempt to delete file if deleted items already contains file with the same name.
         modified: AttachmentExtractor modified to avoid code dublication.
      43599: Fix for ALF-16505 - Discussion topics are sorted in ascending order (oldest first and newest last) when selecting 'All topics'
      43610: Merged Dev to V3.4-BUGFIX (3.4.12)
         43416: ALF-16470: SPP:Meeting recurent events are displayed incorrect in share calendar in all tabs (Day, Week, Month)
            Incorrect lucene query to search for events (it was search for events ONLY after fromDate, that gets from browser query. And recursive events, that have startDate before browser's query date, wasn't included into summary query for search for events.
            Start date is incorrect and is sets two times.
            Interval for month of end date is to small.
            Recursive event, that was started in previous month, and ends in current month, isn't included into result of search.
            For events, that ends on next date after start date, displays (view by month) only start date.
      43625: ALF-11817: Cope with incomplete lock token headers from Microsoft-WebDAV-MiniRedir without the enclosing <> by just consuming the whole string
      43670: ALF-11817: Prevent auto-hidden dot underscore files from reappearing on a put by checking for a shuffle path before 'unhiding'
      43746: Merged DEV to V3.4-BUG-FIX (with corrections)
         43692: ALF-16808 Webdav: Two versions of document have been added after the document has been rewritten once more via drag and drop action.
         1. Checked whether the current content property is empty.
         2. Disabled the versionable aspect.
         3. Added the new content to the node. 
      43763: Fix for ALF-14828 - Incorrect behavior on delete action (WCMQS site)
      43771: Fix for ALF-12752 - Custom form appearance parameters not accounted for causing ovverlapped textareas xforms changing their height
      43773: Merged DEV to V3.4-BUG-FIX (3.4.12)
         42010: ALF-14040: Event start/end time displays incorrect on MS Outlook Calendar and Calendar of created Meeting workspace
         1) Send a date for "Site Calendar" dashlet in ISO-8601 format (like in v4.1.1), then after transformation to client's time zone it is displayed correct
         2) For "My Calendar" dashlet we need to take into account that if the event is "all day event", then date should be used without time zone transformation
      43804: ALF-12326 HomeFolderProviderSynchronizer fails to move any user space which has a rule configured on it 
      43837: Fixes ALF-12145: Date.js patches merged to 3.4
      Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/V3.4-BUG-FIX:
         36202: ALF-13483: Japanese: Incorrect date handle in a date Input filed
      Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/V3.4-BUG-FIX:
         43835: Fixed ALF-13595: Patches third party library date.js to prevent infinite loop.
      43839: ALF-16869: Merged PATCHES/V3.4.8 to V3.4-BUG-FIX
          43344: MNT-162: Merged DEV to PATCHES/V3.4.8
              43254: MNT-162: CLONE - Hidden folder "Comments" is available to searching
                  - Removed last '/' from COMMENT_QNAMEPATH constant.
   43902: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (RECORD ONLY)
      43177: Merged DEV to V3.4-BUG-FIX
         43087: ALF-16474: Records Management groups were not deleted after removing RM site
            - Delete Records Management groups on ASPECT_RECORDS_MANAGEMENT_ROOT delete
      	  - Backport of RM-190 from RM 2.0
      43228: ALF-16266: Merged HEAD to V3.4-BUG-FIX
         32846: Fixes: ALF-10519: Issues with translation of roles.
         31413: Fixes: ALF-10519 - Internationalises the role names for the repo browser's manage permissions page & makes these available to other pages through common.properties
      43229: ALF-16266: Fix  conflict data left in the properties file.
      43624: ALF-11817: Merged PATCHES/V4.0.2 to V3.4-BUG-FIX
         43587: Merged BRANCHES/V4.1-BUG-FIX to PATCHES/V4.0.2
            42363: ALF-16213: renaming versioned file results in file being deleted.
            43478: MNT-181: Now WebDAV will ALWAYS preserve the original metadata and versions of ANY node that is temporarily 'moved out' in ANY kind of 'shuffle' operation
            - To make the source node temporarily invisible to WebDAV the client specific HIDDEN aspect features are used
            - WebDAVHelper.isRenameShuffle() method introduced, to parallel ALF-3856 CIFS fix and using similar system.webdav.renameShufflePattern global property to detect the start of a shuffle
            - WebDAVHelper converted to use proper dependency injection
            - CopyMethod has become a simple subclass of MoveMethod as all the hidden aspect munging is done by it
            - DeleteMethod now preserves hidden nodes
            - PropFindMethod now ignores hidden nodes
            - Listing methods will hide hidden nodes from WebDAV
            43483: MNT-181: Corrected typo
            43523: MNT-181: Corrections
            - WebDAVLockService.unlock() made 'harmless' to call on already-unlocked nodes
            - Delete method hides rather than deletes versioned nodes and working copies in case it is called by OSX Finder during a 'replace' operation
            43524: MNT-181: Correction
            - PutMethod now 'unhides' hidden nodes and behaves as though it created them
            43570: MNT-181: More corrections researched by Valery
            - Don't treat all moves to temporary locations as copies - just those from non-temporary locations. Avoids initial upload leaving lots of hidden files around.
            - Only copy the content, not the whole node including aspects to avoid versioning temporary files!
            - Don't version on changes to sys:clientVisibilityMask - avoids 'double versioning'
            - Recognize Mac .TemporaryItems folder and ._ files as temporary
            43586: MNT-181: Final correction researched by Valery
            - Corrected system.webdav.renameShufflePattern so that it matches .TemporaryItems folder and ._ files as a full match
      43671: ALF-16834: Merged V4.1-BUG-FIX to V3.4-BUG-FIX
         43666: ALF-16833 / MNT-187: Fixed regression in inbound rule firing caused by the fix to ALF-14744
         - Inbound rules were not firing for newly created content nodes that had null content properties (e.g. dataListItems)
         - Now the ALF-14744 fix has been revised so that inbound rules are only not fired for new nodes with zero-length content, as possibly created by the OSX / Windows 7 WebDAV clients during an upload, and only if policy.content.update.ignoreEmpty=true (the default)
         - OnContentUpdateRuleTrigger removed. Now all content property updates are handled by OnPropertyUpdateRuleTrigger so that we can have this subtle treatment of 'empty' content properties.
         - Reverted ALF-14744 changes to RuleServiceCoverageTest and added new tests for 'empty' content and ASPECT_NO_CONTENT
         - Updated RuleTriggerTest in line with changes
      43842: Merged V4.0-BUG-FIX to V3.4-BUG-FIX
          33387: ALF-12492 - Email with empty subject sent to Alfresco by SMTP cause Null pointer Exception
      43843: ALF-16717: Merged V4.1-BUG-FIX to V3.4-BUG-FIX
          43314: ALF-16575 - Email server does not accept email where Subject ends with a period


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@43914 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2012-11-23 16:46:57 +00:00
Dave Ward
973a12155c Merged V4.1-BUG-FIX to HEAD 
43196: Merged DEV to V4.1-BUG-FIX
      39849: ALF-13301: The value of bpm_reassignable is not converted by JBPM to boolean when we use timer.
      Flush session before closing JbpmContext.
   43199: Temp fix for:     ALF-16558 SOLR tracking does not do incremental updates but one single chunk
   43201: Fixed ALF-11457 "Send email to user rule can't be created if the User name starts with number"
   43210: Fixed ALF-16317 "Labels not displaying full text when creating a rule on a folder with IE8"
   43219: Merged DEV to V4.1-BUG-FIX
      43213: ALF-13277: CLONE - IMAP: User home space is opened when browsing through Content Folder URL
      org.alfresco.repo.model.filefolder.FileFolderServiceImpl.getNamePath(NodeRef, NodeRef) method was updated with fix that return an empty list if the root node path is requested.
   43226: ALF-15755: Merged DEV to V4.1-BUG-FIX (modified)
      43088:  If the WebDAV path of a document exceeds 255 characters, documents opened in MSOffice cannot be saved back
         1. parseRequestHeaders() method was overrode in AbstractMoveOrCopyMethod class.
         2. unlockNodeIfLocked() method was added In MoveMethod.
   43232: Fix for ALF-16254 - 'Leave Site' behaviour for group based site membership
   43236: Fix for ALF-15236 - JSF - Edit online of html files does not keep the formatting
   43239: Removed tabs
   43251: ALF-16419: Content uploaded through webdav in win7 adds a write lock, resulting in rules not triggering
   - Use LockUtils.isLockedAndReadOnly in ActionExecuterAbstractBase
   43310: Fix for ALF-16469 ***  Solr Indexing - Index for 5M docs, 2M txns, 2TB content, 50k users, 10k groups grows up to 300GB with FTS disabled. Is it expected?
   - first pass at reducing stored fields in the SOLR index - PATH and secondary parent info
   43314: ALF-16575 - Email server does not accept email where Subject ends with a period
   43357: ALF-16573: LDAP synchronization fails when a child group has more than one parent
   - Because AbstractNodeDAOImpl was wrongly recognizing a deadlock as a DuplicateChildNodeNameException
   - Now it correctly recognizes the PostgreSQL "40P01" SQLSTATE
   43359: Merged DEV to V4.1-BUG-FIX
      43338: ALF-16515: Error 403 when authenticating against an Active Directory
      Transaction type for login Web script has been modified to 'readwrite' to introduce a possibility creating missing people in the context of the regular '/api/login' 'LoginBean'. This is necessary for some authentication mechanisms. For example, for Kerberos authentication without SSO


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@43362 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2012-11-03 12:58:27 +00:00
Dave Ward
b794365eaa Merged V4.1-BUG-FIX to HEAD 
42933: ALF-15328 could we add a sample log4j file in 'extension'? 
   42935: ALF-16455: Merged V3.4-BUG-FIX (3.4.12) to V4.1-BUG-FIX (4.1.2)
      42934: ALF-16454 TransformerDebug id values have gaps 
   42955: ALF-15328 could we add a sample log4j file in 'extension'?
      - missing j in file name
   42982: Merged DEV to V4.1-BUG-FIX
      42873: ALF-16194: Checkout/Checkin leaves Lockable aspect on which disables autoVersionOnUpdateProps
             DoNothingCopyBehaviourCallback policy has been set for lockable aspect (implemented in LockServiceImpl);
             Unit test has been added. 
   43000: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_10_19 to BRANCHES/DEV/V4.1-BUG-FIX:
      42936: ALF-11573: It's impossible to Modify settings for document versions
   43010: ALF-16006 MT: Document Library is absent after upgrade from 3.4.x to 4.1.x (eg. 3.4.10 -> 4.1.1)
      - applied patch suggested in JIRA
   43017: ALF-16457: "CmisObjectNotFoundException: No corresponding type found! Not a CMIS object?" thrown by AlfrescoCmisServiceImpl.getChildren
        - Check CMISNodeInfo for invalid type before processing.
   43019: ALF-14353: Upgrade Activiti dependencies in Maven build
   43022: ALF-14353: Upgrade Activiti dependencies in Maven build
   43027: Merged DEV to V4.1-BUG-FIX
       42426: ALF-15577: " does not support the method HEAD " when opening a MS Access file with "View In Browser"
   43029: Merged DEV to 4.1-BUG-FIX (4.1.2)
      42988: ALF-15791: Custom Types,Aspects defined with prefix using underscore cannot be loaded by API calls like api/classes/<type or aspect>
         Identical logic for old and new ClassDef API was moved to abstract super classes
      42924: ALF-15791: Custom Types,Aspects defined with prefix using underscore cannot be loaded by API calls like api/classes/<type or aspect>
         New set of URL templates for class defenitions were provided to support requests with separated namespace prefixes and names
   43031: ALF-16489: Typo in column-name of newly created index
   43041: Merged DEV to 4.1-BUG-FIX (4.1.2)
      43040: ALF-16425: API call to return all classes, returns wrong properties in classes
         Propertydefs and assocdefs are reordered to corelate with classdefs. Unit test was added for issue.
   43052: ALF-16194: Checkout/Checkin leaves Lockable aspect on which disables autoVersionOnUpdateProps
      - Fix failing test
   43055: Probable fix for ALF-15813. Replaced the 'skipCount' with the one in the query request, rather than query result.
   The Lucene query result does not support the reporting of the skipCount.
   43065: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      42958: ALF-14421: Inconsistencies when applying Versionable Aspect 
      - We think the most preferable fix that will result in the best consistency between Share and old Explorer behaviour is to make the adding of the versionable aspect always result in an initial MAJOR version, if a version type has not been specified. Major/minor versions can still be controlled explicitly by checkout/checkin the versionable aspect properties and the version service API.
      42998: ALF-14421: Fixed version label unit test fallout - back to what it used to be.
      42999: Fix for ALF-16261 - IE script error occurs when email space users providing there are no users in this space
      43006: Removed dependency on Apache Commons StringUtils. See ALF-12541, ALF-14254, AMZNSSS-17
      43028: ALF-14722: Merged V4.1-BUG-FIX to V3.4-BUG-FIX
         42902: Merged DEV to V4.1-BUG-FIX
            42519: ALF-13588: Google Doc failed to authenticate after incorrect password being entered for google account 
               Add ability to unregister class behaviours.
               Unregister googledocs behaviours when subsystem stops.
   43066: ALF-16502: Merged PATCHES/V4.0.2 to V4.1-BUG-FIX
      42969: Merged DEV to PATCHES/V4.0.2
         42967: MNT-158: SharePoint Protocol Opening Documents in Read-Only for Site Consumer with Collaborator Privileges
            Remove manual throwing of AccessDeniedException is user has "consumer" or "contributor" role.
            Create "links" container from system user.
   43067: Merged PATCHES/V4.1.1 to V4.1-BUG-FIX
      42470: ALF-16503 / ALF-16256: Upgrade 3.4.6 HF to 4.1.1 - DuplicateChildNodeNameException: Duplicate child name not allowed: surf-config 
      42591: ALF-16504 / ALF-16332: Fixed synchronization around org.alfresco.repo.dictionary.NamespaceDAOImpl.namespaceRegistryCache
      - There was no 'double checking' after releasing the write lock, meaning that under high concurrency lots of threads would queue up to continuously re-initialize the registry. 
      42705: ALF-16504/ ALF-16332, ALF-16377: Revisited synchronization and initialization of mutually-dependent DictionaryDAO and NamespaceDAO to prevent deadlock and simultaneous re-initialization in more than one thread
   43068: Merged DEV to V4.1-BUG-FIX
      - TODO: Update DB2 DDL in activiti
      42388: ALF-15828: DB2: unexpected index found in database.
      Modify activity create script for db2 to create normal name for ACT_HI_PROCINST.PROC_INST_ID_ index.
      Introduce patch that will rename autogenerated name to normal name for ACT_HI_PROCINST.PROC_INST_ID_ index.
      Update schema reference file for DB2.
      42429: ALF-15828: DB2: unexpected index found in database.
      Fix scripts from ALF-14983 and ALF-16038 to drop/recreate tables in DB2.
   43069: ALF-11214: IMAP subsystem is not successfully restarted after incorrect modification of IMAP properties via Admin Console
      Stopped ChildApplicationContextFactory from caching a stale application context that didn't successfully refresh.
   43071: ALF-13660: When using kerberos SSO, non domain explorer users requesting a download URL get a login page but after login do not get the requested document
   - Now the Web Client authentication filters use the same mechanism for preserving the request URL through a redirect to the login page
   43076: ALF-15828: Fixed merge issue
   43079: ALF-13602: Incorrect number of documents displayed in Share DocLib when a file is checked out
   - added ability for FileFolderService.list (-> FileFolder GetChildren CQ) to filter by one or more aspects, eg. cm:checkedOut
   43080: ALF-14421: More version label unit test fallout
   43092: Fix ALF-16460: Users may receive activity feed entries (from people they follow) for moderated sites to which they do not belong
   - also add unit test
   43093: Fix for ALF-16091 - Unable to inline edit javascript file.
   43096: Fix for ALF-16283 - When document is checked out, 'Edit Online' and 'Upload New Version' options should not be visible on the original document.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@43103 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2012-10-25 16:38:22 +00:00
Dave Ward
502bb3d954 Merged V4.1-BUG-FIX to HEAD 
42774: ALF-16367: MT fix for "Exporting a tenant from one instance A and importing it to another Alfresco instance B does not work"
   42775: Merged DEV to V4.1-BUG-FIX
      42274: First part of ALF-14341: WQS: SOLR Request failed wit error 500: DTENANT_FILTER_FROM_JSON
             WQS jobs don't execute if repository is in the bootstrapping state.
             RepositoryState class was made thread safe. 
   42781: ALF-15135: Apple Mail always fails when copying folders with nested folders
   - Because FileFolderService.resolveNamePath was not properly honouring mustExist==false for parent folders
   42798: ALF-16384 - checkLicenseForSyncMode exposed via properties files
      code comments changed.
   42799: ALF-16384 - checkLicenseForSyncMode exposed via properties files    properties comments changed.
   42801: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_10_17 to BRANCHES/DEV/V4.1-BUG-FIX:
      42748: ALF-14200: Adding Invalid Aspects Via CMIS ATOM API Results in NullPointerException
   42802: Fix failing NodeServiceTest
   - Moved parentless node validation to correct location to avoid NPEs in indexing
   - Fixed unit test to temporarily disable indexing in order to be able to create a corrupt parentless node


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@42803 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2012-10-18 12:03:53 +00:00
Dave Ward
a1b12e2f0f Merged V4.1-BUG-FIX to HEAD 
42174: ALF-14721: Merged PATCHES/V4.0.2 to V4.1-BUG-FIX
      41782: ALF-15751: Merged DEV to V4.0.2 (4.0.2.14)
         41704: ALF-15751: CLONE - Version History presents versions in wrong order
         'VersionHistoryImpl' now sorts versions by node DB id because version with greater version number can't have id which is lesser than id of version with lesser version number.
         Additionally, this approach should be quicker than sorting by 'Modification date' and 'Version number' label.
         << Did not merge unit test, which was doing things with version branches that we don't normally support >>  
   42179: ALF-16149: Merged PATCHES/V4.0.1 to V4.1-BUG-FIX
      41995: 41911: ALF-14127 User search retrieves all users from the DB regardless of search criteria
         - PeopleServiceImpl.getPeople(...) now calls a new method nonCannedGetPeopleQuery(...) rather than using the canned query which is slow with large numbers of users.
      42011: 41911: ALF-14127 User search retrieves all users from the DB regardless of search criteria
         - Avoid NPE on params
      42059: 41911: ALF-14127 User search retrieves all users from the DB regardless of search criteria
         - Ignore case broke one of the unit tests (now excluded from nonCanned version)
   42188: French installer corrections from Gloria
   42192: ALF-15906 - Share UI does not show the 'edit online' button for Visio documents
   42195: Refactor of imapSpacesTemplates.acp into imapSpacesTemplates.xml and exploded content.
   This work is a necessary precursor to the fix for ALF-15803, which will add new localisations.
   42220: Fix for ALF-16138. AbstractLinksWebScript doesn't cope with Links from deleted users.
   42233: Fix for ALF-16164 Cloud monitoring of SOLR is CPU intensive due to its repeated use of the SOLR stats page
   and related CLOUD-760 Cloud monitoring of SOLR is CPU intensive due to its repeated use of the SOLR stats page
   42259: Fix to issue where multiple concurrent writes to same user preferences would cause exception to appear in Share when changing between old document library views and new views provided by a module.
   42266: ALF-16154 - IE9: script error when click on workflow from document details page
   42268: Fix for ALF-11152 - License Usage information always shows 0 users
   42269: Fix for ALF-15211 - TinyMCE corrupting hyperlinks
   42275: ALF-15993: alfresco log not removed if uninstalled on a different day
   - Fix from Bitrock
   - Also fixed for awe and share logs
   42289: Merged DEV to V4.1-BUG-FIX
      42276: ALF-1907: Check out rule is active for spaces
             - Unit test for checkout via action executer 
      Fixed line endings and split asserts
   42292: ALF-15937: updated the Javadoc of the checkin method to be in sync with what's in doc.alfresco.com
   42307: Fix handling of syncmodeconfig=OFF when running 4.1.X locally without doing full enterprise build.
   42308: Fix ALF-13968: Share DocLib sorting mixes files and folders
   - implicitly sort folders before files (~ pre 4.x) then selected sort option, such as name
   - also allow Alf-specific option with CMIS getChildren (eg. "orderBy=cmis:baseTypeId DESC,cmis:name ASC")
   42310: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_09_24 to BRANCHES/DEV/V4.1-BUG-FIX:
      42309: ALF-15707 (ALF-14691) - Any custom aspect or type (including ootb workflow) is not available for API calls like api/classes/<type or aspect>
   42338: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.1-BUG-FIX
      42337: Fix for ALF-14764 - Moving a folder removes non-site Group permissions set, resets 'Inherit permissions flag'
   42339: Fix for ALF-15151 - Selected group is illegible(black) in Admin console if High contrast theme is selected
   42342: ALF-10362: Activities fail to log "name" changes with more than 1024 chars (eg. via Share "Create Content" form)
   - part I - fix Share config so that default "Create Content" form restricts to 255 chars as per other form config (eg. Edit Properties, inline rename, ...)
   42353: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (RECORD ONLY)
      42281: Fix for ALF-9946 Need a supported solution for switching off content indexing (FTS) -> merge only to 4.1-BUG-FIX
      - remove references to isIndexed property which was removed in the back port
   42360: ALF-16146: Fixed QName of the data list item type.
   42361: ALF-10362: Activities fail to log "name" changes with more than 1024 chars (eg. via Share "Create Content" form) 
   - part II - belts-and-braces (with unit test)
   42362: Merged DEV to V4.1-BUG-FIX
      42336: ALF-16160: office 2010 doesn't notify users of files being locked when using sharepoint protocol
         MS Office (if we enabled notification about document unlocking) periodically sends PROPFIND requests to get info about active locks. This code makes PROPFIND be able to send an info about locks for the MS Office 2010 client if a document was locked for edit offline.
   42363: ALF-16213: renaming versioned file results in file being deleted.
   42368: Record only merge V3.4-BUG-FIX (3.4.12) to V4.1-BUG-FIX (4.1.2)
      42367: Merge V3.4 (3.4.11) to V3.4-BUG-FIX (3.4.12)
         42366: ALF-16137: Merge V4.1 (4.1.1) to V3.4 (3.4.11)
            42048: ALF-16005 Could not transform file size of 0 kb
               - Turns out that it was only doc ppt and xls zero byte files that had the problem.
               - Reverting part of revision 6473 (release 2.1 2007) AR-1251 (Version error when saving new content via CIFS)
                 Dave W tells me that this is no longer an issue due to other changes
   42381: Fixed ALF-16218: Solr GetNodes return status is 500 for Postgresql
    - Read-only webscript was calling through to "qnameDAO.getOrCreateQName",
      which could fail if the QName does not exist.  Issue is not critical because
      it will start working once the QName gets created.
   42384: ALF-15868	RepoTransferReceiverImplTest failing on MySQL
      Checked in a refactor of the transaction handling in the test to remove the suspicion that the current failure iis somehow a test error.  (Still fails on MySQL)
   42395: ALF-14353: Deploy pom files with dependencies to the Maven repo
   42405: ALF-15986: Upgrade to Bitrock 8.5.0 in order to improve font scaling and adaptive layout with Gtk
   - Helps I18N
   42407: Fixed 'state leak' from ActivityServiceImplTest
   42408: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/DEV/V4.1-BUG-FIX:
      42389: CLOUD-796: handle unknown custom content/folder type
      42396: CLOUD-796: handle unknown custom content/folder type
      42397: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC:
           41858: ALF-14444 - CloudSync: Ensure unknown properties when synced to Cloud are ignored properly
      42406: CLOUD-796: handle unknown custom content/folder type
   42409: CloudSync: CLOUD-796 / ALF-16226 -  hide sync props in forms (eg. edit props) for sync'ed custom content type
   42419: Fixes: ALF-11096 - Ensures event edit button is disabled if the event came from Outlook (this is because VTI connector is one directional & changes can't be pushed back).
   42420: Fix for ALF-16003 - Sync mode is incorrectly cached as off if repo hasn't started when the check is made.
   42430: More refactoring of RepoTransferReceiverImplTest.
   42441: Merged V4.1-BUG-FIX to HEAD
      42440: ALF-16247: Thumbnails not rendering for PDFs with standard fonts
      - Because GS_LIB wasn't set on Linux and OSX
   42452: Fix for ALF-15450 Share Lucene tool in admin console works incorrectly
   42457: ALF-14347: Document workspace is incorrectly deleted
      - Check returned status code from delete method before continuing to delete components.
   42458: ALF-15700: 'Imap Attachments' folder is not localized.
      - Added spaces.imap_attachments.childname property that allows the attachments folder to be localized
   42459: ALF-16103: No easy way to specify a timeout for LDAP connections
      - Added ldap-authentication/ldap-ad-authentication property (ldap.authentication.java.naming.read.timeout) to configure the com.sun.jndi.ldap.read.timeout for the initialDirContextEnvironment.
      - ldap.authentication.java.naming.read.timeout property is configured in milliseconds. Defaults to zero (infinite) which is the current behavior.
   42467: Fix for ALF-16275 SOLR include configuration to avoid indexing content
   - done and fixed all configuration to be treated as Java properties
   42472: ALF-16175: Merged PATCHES/V4.0.1 to V4.1-BUG-FIX (Record Only)
      42448: ALF-16096: Repo corruption in MT - clean-up assistance requested
         - Changed RepositoryAuthenticationDAO.getUserFolderLocation() to use getCurrentUserDomain() for its cache key.
   42473: ALF-14838 ALF-14839 Deploy Maven artifacts containing the config and the test-resources, using these as classifiers
   42475: ALF-14180 - CIFS - Cluster - doc and docx files are opened in read-only mode via MS Office 2003 and 2010 appropriately
      missed from check in 34544
   42477: ALF-5051: Define ThumbnailDefinition Beans Outside of ThumbnailRegistry Bean
      - Reverted imgpreview to enterprise 4.1 size of 480
   42504: Reverse Merge 42458 ALF-15700: 'Imap Attachments' folder is not localized. Causes unit test failures.
   42517: ALF-15700: Restoring duff revision 42458 so that we can finish the job and fix it
   42518: ALF-15700: Corrected internationalization of IMAP Attachments folder
   - RepositoryFolderConfigBean must look up paths by QName to be immune to localization and backward compatible
   - Must throw an error rather than using the store root if the path contains unresolved placeholders!
   - QName of attachments folder must remain "cm:Imap Attachments" because that's what it always was!
   42528: ALF-16282: Hybrid Sync: folder unsync - sub-children still have sync indicators
   - fix typo fallout from ALF-15420 (r40782) + add unit/regress test
   42529: ALF-16231: Corrected Imap Attachments English string
   42530: ALF-14838 ALF-14839 Fix enterprise artifacts + deploy jars instead of zips
   42531: ALF-14770 Cut / Paste triggers folder rules
       - Needed to disable rules on nodes being MOVED.
       - Added extra check to RuleTypeImpl when working out if a rule was disabled so that debug would not be misleading.
         No impact on logic, as RuleService does the same check later and discards the rules.
   42546: ALF-15737 Audit trail does not show user login events
       - Also does not show any failed login events
   42568: ALF-16077 CLONE: Incorrect activities if you try to add/edit/remove comment for document (if this document contains any title) 
      The original activity feed comment code would include the title of a document, folder or blog rather than its name if it was available.
      - name is a mandatory field for a document and folder.
      - title is a mandatory field for a blog entry and its name may not be set via Share.
      Changing activity feed comment code so that the:
      - name is always used for documents and folders
      - title is always used for blogs  
   42571: ALF-14838 ALF-14839 Deploy config and test-resoruces artifacts in the same batch as the main artifact, otherwise they get different snapshot versions
   42582: ALF-16255: CopiedFromAspectPatch fails on rules copied with a folder 
     - Checked to make sure that cm:copiedfrom target is a cm:object before attempting a cm:original association. 
     - Remove cm:copiedfrom aspect from source if cm:copiedfrom target is not a cm:object.
   42593: ALF-16255: CopiedFromAspectPatch fails on rules copied with a folder 
      - Corrections to log message and formatting.
   42605: ALF-16231: Fixed broken IMAP unit tests
   42612: Further fix for ALF-16164 Cloud monitoring of SOLR is CPU intensive due to its repeated use of the SOLR stats page 
   - protect from dodgey JSON output
   42624: ALF-14353: switch groupId to org.alfresco.enterprise, to be in sync with actual Maven deployment
   42657: Fix for     ALF-16359 Fix SOLR logging in production and other environments 
   - configure in log4j-solr.properties  anywhere on the solr web app classpath ...
   42671: ALF-14353: fix facebook api dependency
   42679: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      42172: ALF-15262: Correct handling of linked rule deletion
      - When the last rule is removed from a folder and the ASPECT_RULES aspect is removed from its parent, we must cascade this removal to its secondary parents
      42173: ALF-14400: Only site members can Edit Online (sharepoint) although the site is public and permissions allow editing for everybody
      - Rationalized the fix provided by Alex Malinovsky
      - Don't bother checking site memberships - let ACLs handle that and just check for permission to read the document
      42182: Incremented version revision for 3.4.12
      42243: ALF-15262: Further correction by Dmitry: use beforeRemoveAspect because beforeDeleteChildAssociation is not invoked on deletion of primary child associations
      42278: ALF-12999: Correction by Alex M
      42586: BDE-101: make .MD5 files suitable for easy check with md5sum -c
      42627: Merged DEV to V3.4-BUG-FIX
         42537: ALF-16139: Impossible to connect to CMIS via AtomPub and Web Services
            Activation libraries (including all Geronimo versions) have been removed because of a conflict with libraries in JBoss CXF WS installation. Also, 'javax.activation' is part of the JDK 1.6 (http://docs.oracle.com/javase/6/docs/api/javax/activation/DataHandler.html)
      42677: Merged V3.4 to V3.4-BUG-FIX
         42380: ALF-16220: Merged V4.1-BUG-FIX to V3.4
            40590: ALF-15318: It was possible for a user with a disabled / expired account to log in via NTLM/SSO
            40663: Merged DEV to V4.1-BUG-FIX
               40661: ALF-15318 (part 2): It's possible to log in by disabled user (NTLM with SSO in a clustered env)
                  The onValidateFailed() methods were moved to BaseSSOAuthenticationFilter to response with a 401 for a disabled user.
         42556: ALF-15077: Site creation in Share is very very slow with over 15000 sites
         - Probably knock-on impact from us versioning secondary associations properly
         - Found old way of locating a leaf document to be ineffective as it would blow the caches (find all documents with the correct ID, then filter out the containers)
         - Effect was magnified when admin user was previously accessed via the explorer client and thus had an app:configurations child node, thus making admin a container and requiring its paths (e.g. zillions of nested group memberships) to be indexed
         - Instead, we have a new LEAFID field on leaves that we can use to efficiently locate a node to delete without hitting zillions of containers
         - Left backward compatible code to avoid requiring a full reindex
         42557: ALF-16202: Merged V4.1-BUG-FIX to V3.4
            40937: ALF-15702, ALF-15669: mmt-dependencies was messing up the SDK classpath
         42566: ALF-15077: Correction to category-handling logic in container generation to fix failing unit tests
         42608: Merged DEV to V3.4
            42543: ALF-16248 : IE specific: It's impossible to create any event due to script error
               Correction for the fix for ALF-13623 to support IE8, also added clearing of 'allday' checkbox.
         42622: ALF-16339: Group names incorrect in (non-site) "Manage Permissions" page
         - Site name was being used as the display name of all site groups!
         42632: ALF-16354: Merged PATCHES/V3.4.6 to V3.4-BUG-FIX
            42521: ALF-16231: Corrected LockUtils.isLockedOrReadOnly to properly handle the LOCK_EXPIRED status
            - Also fixed CheckOutCheckInService.checkout() to respect LOCK_EXPIRED but still disallow overwrite of unexpired WRITE_LOCKS
            42522: ALF-16231: Further improvements
            - Renamed to isLockedAndReadOnly because that's what it means!
         42644: ALF-16298: Cannot install RM amps on 4.1.1
            - Passed command line arguments from shell script to mmt utility
         42656: ALF-16298: Correction to DOS argument concatenation to allow multiple parameters separated by space
         42664: ALF-16358: NPE detected during benchmark test.
         - Guarding against this in LeafScorer
         42665: ALF-16360: Merged HEAD to V3.4
            42440: ALF-16247: Thumbnails not rendering for PDFs with standard fonts
            - Because GS_LIB wasn't set on Linux and OSX
            42447: ALF-16247: Thumbnails not rendering for PDFs with standard fonts
            - Fixes by Bitrock
      42678: Merged V3.4 to V3.4-BUG-FIX (RECORD ONLY)
         42244: Merged V3.4-BUG-FIX to V3.4
            42172: ALF-15262: Correct handling of linked rule deletion
            - When the last rule is removed from a folder and the ASPECT_RULES aspect is removed from its parent, we must cascade this removal to its secondary parents
            42243: ALF-15262: Further correction by Dmitry: use beforeRemoveAspect because beforeDeleteChildAssociation is not invoked on deletion of primary child associations
         42279: Merged V3.4-BUG-FIX to V3.4
            42278: ALF-12999: Correction by Alex M
         42282: Merged V3.4-BUG-FIX to V3.4
            42281: Fix for ALF-9946 Need a supported solution for switching off content indexing (FTS) -> merge only to 4.1-BUG-FIX
               - remove references to isIndexed property which was removed in the back port


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@42683 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2012-10-16 14:20:20 +00:00
Kevin Roast
4a6e3a5413 Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD 
42431: Fix to initialisation code that can cause patches such as ActivitiesTemplatesUpdatePatch that access beans such as Repository before the spring bean init lifecycle has completed to fail.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@42435 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2012-10-08 14:44:09 +00:00
Dave Ward
82b9aba09a Merged V4.1-BUG-FIX to HEAD 
41597: ALF-1907: Check out rule is active for spaces
    - Merged in fix from DEV
    - Changed List of applicable types to a Set
    - Added quick initial checks against the set before doing the subtype checks
    - Various typo fixes
   41598: Add an additional line of INFO to log the database details
   41599: Fix for ALF-8374 - Simple view: incorrect file type icon for *.page and *.eps files
   41600: Merge DEV to V4.1-BUG-FIX
      41478 : ALF-14078: CLONE - Saving files with apps on Mac OS X Lion in CIFS doesn't invoke rules
   41605: Fix for ALF-14653 - Share - Page link created wrongly in wiki. Solution to split wiki page name and title from Alex Bykov.
   41608: CIFS cluster saving of text file fails. ALF-14179
   The client releases the oplock by closing the file, if a remote oplock break was used then a notification to
   the remote node was missing in this case.
   41616: ALF-13577:modified the delete site REST API to set the status code to 409 if a node is locked.
   41624: MT: ALF-14331 - UserUsageTrackingComponent fails if disabled (in MT config)
   - defensive fix (exact steps do not repeat) - may also fix ALF-15956
   41652: more debug
   41653: Fix for ALF-15965 - IE9 - Script error occurs when manage aspect for a document
   41655: Merged BRANCHES/V4.1 to BRANCHES/DEV/V4.1-BUG-FIX (RECORD ONLY)
      41654: Fix for ALF-15965 - hand merged back from rev 41653
   41658: ALF-14967: Task operations through task-forms now audited
   41664: Reverse-merging change 41616 out of the product due to file formatting irregularities.
   This checkin was a fix for ALF-13577. A subsequent check-in will add the same fix but without the formatting problems.
   41665: ALF-11452: Disabling JBPM now prevents jobexecutor thread from starting and consuming unneeded resources
   41671: Reimplementation of fix for ALF-13577. Slight edit on previous fix.
   It now lets the NodeLockedException out of the Java layer and 'catches' this exception in the JavaScript layer. The API returns a 409 (conflict) if a NodeLockedException makes it to the JavaScript - the previous fix was returning 409 for *any* AlfrescoRuntimeException thrown during a site delete.
   Also this checkin preserves the whitespace/file layout of the preceding version.
   41688: ALF-15867 WikiServiceImplTest failing on SQL Server
      - Switched WikiService_transaction bean over to using RetryingTransactionInterceptor
   41720: ALF-15967: Using START_USER_ID_ instead of "initiator" property to query process instances started by user X to prevent extra joins
   41730: Fix for ALF-15995 NodeRef is missing in log on "Problem converting to Freemarker" error
   41743: ALF-9779	REGRESSION: FTP - Failed to retrieve directory listing for tenant user
   41745: Removed a HomeShareMapper - there were two
   41747: Fix for ALF-15811 SOLR query increases DocBitSet inefficiently
   Part of ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
   41748: Fix for ALF-15950 Solr: throws NPE: org.alfresco.solr.SolrLuceneAnalyser.loadAnalyzer
   - return default analyzer
   41752: Fix for ALF-13634 Re-created category won't show up again on a node in Document Library.
   41779: ALF-11283 - Got the home share mapper up and working after some refactoring.
   41795: Fix for ALF-14361 CMIS object type definition for Document and Folder not spec compliant
   41796: ALF-16008: missing column on clean Alfresco and after upgrade from 3.4.10 (703)
     - Schema-Reference for DB2 referenced a non-existent column.
   41802: Fixed ALF-16029: TransactionCleanupTest throws constraint violations 
    - Fallout from ALF-12358; sys:deleted node types have a mandatory property
    - Before bulk-deleting nodes, we need to delete properties
    - Use overriding DAo for MySQL.  Other DBs can use standard delete with joins
    - NB: Fixed TransactionalCleanupTest to double-check the purge job
   41822: Refactor to both Share Mappers.
   41838: BDE-85: Deploy alfresco-mmt with a proper pom.xml containing dependencies
     Also, refactor Maven deployment to use a macro
   41858: ALF-14444 - CloudSync: Ensure unknown properties when synced to Cloud are ignored properly
   41876: Fix ALF-16067 - Items with cm:versionable aspect [custom aspect added] throw errors in Share UI
   41877: Updated Spring Surf libs (1148) - downgrades module deployment error messages
   41878: ALF-16069 - RU: 'Web Deployed' folder is not localized if Alfresco is installed with Russian locale.
   41879: Fix non-continuous build, trying to call continuous-init from maven-env-prerequisites
   41918: Merged PATCHES/V4.1.1 to V4.1-BUG-FIX
      41657: ALF-15965 - IE9 - Script error occurs when manage aspect for a document (correct 4.1.1 branch this time)
      41834: Merged DEV to V4.1.1 (4.1.1)
         41827: ALF-15983: SPP: Meeting space: all-day event is displayed on the day before specified during creation
         Removing of time zone has been modified to be sensitive to Outlook meeting events which are not requiring special conversion for the start and end dates
      41835: Merged DEV to V4.1.1 (4.1.1)
         41833: ALF-16038 : DB2: Upgrade script needed to remove ALFUSER.ACT_HI_ACTINST.OWNER_
         The patch was created to remove an unnecessary column in DB2.
      41845: Reverse merge: << In attempt to clear 12 new DB2 build errors - don't think it is going to work >> 
         41835: Merged DEV to V4.1.1 (4.1.1)
            41833: ALF-16038 : DB2: Upgrade script needed to remove ALFUSER.ACT_HI_ACTINST.OWNER_
            The patch was created to remove an unnecessary column in DB2.
      Merged V4.1-BUG-FIX (4.1.2) to V4.1.1 (4.1.1)
         41337: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.2)
            41336: TransformerDebug: Use debug rather than trace when there are transformers but they are all unavailable.
      41868: Reverse the reverse merge (back to r41835 state used in build #33 given to QA)
         41845: Reverse merge: << In attempt to clear 12 new DB2 build errors - don't think it is going to work >> 
            41835: Merged DEV to V4.1.1 (4.1.1)
               41833: ALF-16038 : DB2: Upgrade script needed to remove ALFUSER.ACT_HI_ACTINST.OWNER_
               The patch was created to remove an unnecessary column in DB2.
         Merged V4.1-BUG-FIX (4.1.2) to V4.1.1 (4.1.1)
            41337: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.2)
               41336: TransformerDebug: Use debug rather than trace when there are transformers but they are all unavailable.
      41914: Merged DEV to PATCHES/V4.1.1
         41909: ALF-16078 : DB2: it's impossible to upgrade Alfresco from 3.4.10 to 4.1.1 (build 33).
            The remove-column-activiti.sql was marked as optional.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@41919 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2012-09-24 18:03:25 +00:00
Jan Vonka
2b8870c772 Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD: 
41618: MT: ALF-14354 - Repository.getRootHome() is not tenant-safe !!


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@41620 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2012-09-14 15:44:23 +00:00
Harpritt Kalsi
e2e7a4f372 ALF-8574 runas not working as expected 
Cause: Person object set within repo parameters was the runAs user. Fix: getFullyAuthenticatedPerson() added to Repository.  

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@41348 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2012-09-07 08:50:49 +00:00
Dave Ward
dd0ea07bb6 Merged V4.1-BUG-FIX to HEAD 
40713: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_08_15 to BRANCHES/DEV/V4.1-BUG-FIX:
      40604: ALF-15274  "I'm following" filter of "My Activities" dashlet doesn't work (PostgreSQL)
   40727: Fix for ALF-15469 from Alex Malinovsky - Cannot Edit Online files with special characters in names
   40733: Merged DEV (ALF-12358 and ALF-14496) to V4.1-BUG-FIX
      38973: DEV for ALF-12358 (upgrades and build plans)
      38975: Part of refactoring around the handling of deleted nodes.
             - Deleted nodes are now treated as real nodes by the NodeDAO
      38977: Fixed up queries related to bulk-loading
      38978: Fixed up Alfresco side of SOLR tracking APIs to handle removal of alf_node.node_deleted (ALF-12358)
      38979: Removed potential contention on cm:name during random file creation
      38980: Initial setup for patching of ALF-12358
      38981: Merged DEV/BELARUS/ALF-12358-4 to DEV/DEREK/ALF-12358-4
         36052: ALF-12358: Concurrency: Possible to create association references to deleted nodes
                .NodeDeleted. upgrade SQL patch for PostgreSQL is implemented:
                - SQL create scripts are updated to do not create .alf_node.deleted. column and its indexes;
                - schema references associated with .alf_node.deleted. column are updated;
                - Subscriptions DAO and schema reference are updated to use .sys:deleted. type instead of .alf_node.deleted. column;
                - .NodeStatus. receiving template was modified to receive .typeQNameId. for correct .deleted. state determination;
                - some other minor fixes
         36287: ALF-12358: Concurrency: Possible to create association references to deleted nodes
                'NodeDeleted' patch has been implemented for MySQL InnoDB, Alfresco Oracle 9, Alfresco SQL Server and PostgreSQL dialects. Not implemented for DB2 dialect!
                - DB creating scripts are modified in accordance with removal of 'alf_node.node_deleted' column and respective indexes;
                - iBATIS schema references are modified in accordance with removal of 'alf_node.node_deleted' column and respective indexes;
                - the code for handling subscriptions on deleted nodes removed;
                - subscriptions DAO schema reference is corrected respectively
         37284: ALF-12358: Concurrency: Possible to create association references to deleted nodes
                'NodeDeletd' updating patch for 4.0 version has been modified to recreate 'alf_node' table for all supported dialects.
                'SubscriptionServiceImplTest' has been extended to test whether subscriptions are being removed if node is archived.
                The new test creates fake user node and applies a custom aspect with 'archive=true' attribute
         37905: ALF-12358: Concurrency: Possible to create association references to deleted nodes
                Maintenance of the .idx_alf_node_txn_type. index has been added into the patch for all the dialects.
                SQL formatting has been changed to more compact and visually comfortable. Some minor changes for MySQL dialec
         Also:
         - Started move to 4.1 scripts
         - Fixed Schema reference files for alf_node column ordering
      38982: ALF-12358: Concurrency: Possible to create association references to deleted nodes
             - Moving scripts to V4.1 code base
             - Fixed upgrade with sequences for introduction of 'deleted' qname
      38983: Migration to 4.1 fix for ALF-12358
      38995: Fix scripts for ALF-12358
             - Fixed index removal for indexes that could not possibly have existed
             - Fixed ALF schema mappings to reflect new index names
             - Fixed PostgreSQL PK name check
      39027: Added in missing index idx_alf_node_txn_type (ALF-12358)
             - Merge note: Removed redundant index alf_node.fk_alf_node_txn
      39028: Fixed fallout from node deletion strategy (ALF-12358)
      39222: Minor test enhancements for diagnostics
   40738: ALF-11297: resurrect system-build-test (not plugged in yet, still a few failures)
   40740: Follow-up for DB2 upgrade for ALF-12358: New alf_node table ID column autoincrement value set
   40770: Merged DEV (ALF-12358) to V4.1-BUG-FIX
      39223: Merged 3.4.6HF to DEV (ALF-12358)
         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!
      39259: Merged V3.4.6HF to DEV (ALF-12358)
         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
      39271: Added policy invocations for peer association removal when an aspect is removed
      39401: Utility class to walk a node hierarchy (primary) and gather all association data
             - Data gathered has to include secondary association pointing out of the hierarchy
             - Source and target associations gathered as well
             - TODO: Bulk queries for above
      39402: Follow up to ALF-15109: Break node deletion by removing deleteAssocsToAndFrom
             - TODO: Use NodeHierarchyWalker to gather data, fire policies and execute deletes
      39456: NodeHierarchyWalker: tests and fixes
      39457: ALF-12358: Remove in-txn manual recording of deleted and new nodes
      39917: ALF-12358: Use NodeHierarchyWalker to pick up all associations for a node hierarchy, fire policies and perform deletes
             - NOTE: Currently, in-process links back to the hierarchy prevent certain tests from passing.
             - TODO: Add detection for nodes that are about to be deleted
      40000: ALF-12358: Added support for 'beforeDeleteNodeAssociationPolicy'
      40001: ALF-12358: A node hierarchy walker to predetermine data required for deleting a hierarchy
      40002: ALF-12358: Spoof aspect 'sys:pendingDelete' that appears on all nodes within hierarchies being deleted
      40003: ALF-12358: Changes to prevent hierarchy modification during delete
             - The entire hierarchy is read before actual delete starts
             - All policies (including previously-missing assoc policies) are triggered from the recorded information
             - Nodes in the delete record cannot have new associations added / removed
             - All deletes are done on the same information so any underlying data shift causes concurrency violations
             - Archival:
               - Archival is a full copy of the hierarchy but all outbound and secondary associations are removed
               - Archival is followed by a full delete of the original hierarchy
      40128: ALF-12358: Test for linking to deleted nodes now fail even after having tested the recovery code
             - Recovery code shows this when activated: ...ERROR [...NodeDAOImpl] ALF-13066: Orphan child node has been re-homed under lost_found: (49179, ...)
      40129: ALF-12358: Added a more verbose message when association deletes don't find required rows
      40130: ALF-12358: Avoid incidental removal of associations when removing aspects if the associations are already scheduled for deletion
      40131: ALF-12358: Fix fallout for rules linking to avoid multiple deletions of the same association
      40371: ALF-12358: Fire beforeDeleteNode even when archiving
   40772: Merged DEV (ALF-12358) to V4.1-BUG-FIX
      40372: ALF-12358: Fallout in ML code
      40397: Fallout from ALF-12358: IMAP pre-commit handling must check for nodes having been deleted
             - Also fixed some TODOs and line endings for test
      40403: PersonService: Reinstated new getPeopleFilteredByProperty method
             - Also fixed test to rollback transaction after forced catch of exception
      40404: Fixed line endings, updated deprecated calls and removed unused code
      40494: ALF-12358: Fixed missing before- and after-create policy calls for the archive store
      40504: Fixed bug in rev 40494: ALF-12358: Fixed missing before- and after-create policy calls for the archive store
             - Used incorrect child node reference when calling policies and notifying indexer
      40529: ALF-12358: Fixed in-txn holding of nodes pending delete to cater for deletes triggering more deletes
      40530: Fallout from ALF-12358: Actions: Association act:scheduledAction multiplicity was not being enforced
             - act:actionSchedule nodes were not cleaned up when associated actions were deleted
             - Added onDeleteAssociation handling to clean up act:actionSchedule node
             - Fixed tests appropriately
      40556: Fallout from ALF-12358: Split out negative tests for deleteSite, which were absorbing exceptions
      40569: Tagging's beforeCommit behaviour was not checking for nodes having been deleted.
             - Added 'nodeServiceInternal' and used that to double-check that nodes still exist
             - Also removed heavily-used call to check if auditing is on
      40618: ALF-12358 fallout: Fixed policy callback details for associations of archived nodes
             - Also some more details when throwing concurrency violation when deleting associations
      40673: Fixed fallout from ALF-12358: Multilingual behaviours fixed
             - Listen to the association being removed from the ML container to the translation
             - Keep track of containers that must be deleted before committing rather than
               attempting to delete them immediately; this avoids attempts to delete associations
               that are about to be deleted (and the thing that ALF-12358 actually fixes).
      40680: Follow-up to rev 40673 (ALF-12358): Forgot to remove commented-out code
   40781: ALF-15587: Merged PATCHES/V4.0.2 to V4.1-BUG-FIX
      40780: Merged DEV to PATCHES/V4.0.2
         40777: ALF-15385 : Unable to set bpm:assingee and other properties in Activiti task via JS
            Added the initialization of runtimeService property.
   40787: Merge V4.1 (4.1) to V4.1-BUG-FIX (4.1.1)
      40782: Fix ALF-15420: Move: child files/subfolders aren't synced after moving from parent folder and updating in Alfresco on-premise/Cloud
       - Corrected the handling of moving a sub-folder out of its synced parent
      40718: Fixes: ALF-15498: Creates new nodeLock indicator (overrides locked) to cope with differences between content models when a node is locked directly using a nodeLock and when a node is locked due to it being a working copy.
   40790: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      40789: ALF-15598: Merged PATCHES/V3.4.9 to V3.4-BUG-FIX
         40671: Merged DEV to V3.4.9 (3.4.9.6)
            40658: ALF-15505: Build-up of lucene folder segments following CMIS queries (un-closed ResultSet objects?)
            - Close unclosed ResultSet.
            - Remove kind="org.alfresco.cmiskind" parameter from query.get and queries.post webscripts and now they use CMISQueryWebScript as implementation.
   40795: Fixed txn handling in the event of cleanup failure of test
   40797: Fix for ALF-15602 - XSS issue in OpenSearch Explorer webscript - unescaped search terms displayed in page
   40810: ALF-12358: Possible build fix (Derek, Neil and Jan to review)
   - Reinstate invokeBeforeMoveNode which seems to have disappeared in the refactor
   - Due to extra cascaded calls to onDeleteAssociation, SyncChangeMonitor must ignore certain events
   40827: ALF-12358: Possible build fix (Derek, Neil and Jan to review)
   - SyncChangeMonitor must ignore onDeleteAssociation calls on both sides of the association when a node is deleted
   40843: Stop deploying XAM connector to maven repo, it's gone
   40845: ALF-15406 Index Tracker seems not to gracefully stop upon shutdown keeping all other threads in waiting
      - Don't allow Quartz scheduler jobs for the OOoDirect subsystem, checking the connection to backup in a queue.
        Avoids multiple timeouts. Should just get one now. There is no need for multiple threads to be running anyway.
      - ALF-610 changes should stop the OOoDirect subsystem from running any of these Quartz jobs in the first place
        when using the default configuration in an enterprise release. So no timeout?
   40848: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.1-BUG-FIX
      40847: Fix for ALF-15189 - Incorrect trimming of the date on the Advanced search by date range
   40887: ALF-15596: Deadlocks in DescriptorServiceImpl / LicenseComponent threads
   - Problem discovered by Gab
   - The two classes are mutually dependent and can end up deadlocking
   - Removed excessive synchronization from DescriptorServiceImpl
   - Now two key synchronization points - bootstrap and currentRepoDescriptor updates
   - Bootstrap synchronization controlled outside this class - no need to defend against it other than throwing IllegalStateException if accessed before bootstrapped
   - currentRepoDescriptorLock added to regulate currentRepoDescriptor accesses / updates
   - Uncovered problem in bootstrapping order - descriptorComponent must be bootstrapped before multiTenantBootstrap
   40889: ALF-15691: Poor cluster performance in user dashboard due to unnecessary cache replication
   40899: ALF-15691: Corrected duplicate property
   40900: ALF-12358 / ALF-15688: Finish the job! Make SOLR tracking work again and process deletes (Derek, Andy please review)
   - select_Txn_Nodes now uses a COALESCE query to substitute the original node ID when recorded in the PROP_ORIGINAL_ID property
   - NodesGet webscript extended so that it detects deleted nodes in the new way and also includes the noderef
   - CoreTracker avoids trying to retrieve the metadata of deleted nodes (possible because of NodesGet noderef extension)
   - SOLRTrackingComponentImpl doesn't barf when getNodesMetadata called for a cascade deleted node by CoreTracker.updateDescendantAuxDocs()
   40902: ALF-12358 / ALF-15688: Fixed unit test
   - Don't expect meta data for deleted nodes anymore (as this is generated on client side)
   - Also removed stray line of code from CoreTracker
   40917: ALF-13750: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      40915: ALF-15708: Trailing whitespace should be trimmed from properties.
         - Implemented custom properties persister to trim trailing whitespace from properties.
   40925: RUSSIAN: Translation updates based on EN r40357


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@40935 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2012-08-28 13:37:05 +00:00
Dave Ward
b28d894e2a Merged V4.1-BUG-FIX to HEAD 
40690: Removed 'repository-bm' project, which is no longer distributed, referenced or supported
    - Part of ALF-14420: Remove benchmarking tool (alfresco-bm.jar) from installer and Alfresco war installation file
    - Also: ALF-15588
   40692: Removed 'repository-bm' project, which is no longer distributed, referenced or supported
    - Part of ALF-14420: Remove benchmarking tool (alfresco-bm.jar) from installer and Alfresco war installation file
   40695: Fixed ALF-14420: Remove benchmarking tool (alfresco-bm.jar) from installer and Alfresco war installation file
    - Removed all related code as well
   40700: Remove XAM Connector.  Now built as a standalone project
   40707: ALF-14399 Share Calendar changes dates when "All Day" is selected. Event comparator now checks if date strings contain a time zone, previously was failing because we strip time zones from all day events.
   40708: Complete - task : ALF-14399 Share Calendar changes dates when "All Day" is selected. Added the time zone in which the recurrence rule was parsed to the recurrence rule string.
   40711: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      40700: (RECORD ONLY) Remove XAM Connector.  Now built as a standalone project
      40701: (RECORD ONLY) Remove Kofax.  Now built as a standalone integration.
      40703: (RECORD ONLY) Revert Kofax removal.
      40704: (RECORD ONLY) Revert XAM Connector removal for V3.4.
      40709: (RECORD ONLY) ALF-14752 - Collapse Links part at the WCM details page lead to error
      40710: ALF-15592: Merged PATCHES/V3.4.8 to V3.4-BUG-FIX
         40543: ALF-15507: Orphan content URLs when you overwrite a file with identical content in CIFS
         - Removed diffing behaviour that was leaking content URLs

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@40712 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2012-08-22 09:27:02 +00:00
Dave Ward
2b61b88c4c Merged V4.1-BUG-FIX to HEAD 
38869: Merged BRANCHES/DEV/AMILLER/CLOUD1 to BRANCHES/DEV/V4.1-BUG-FIX
      38762: Site can not be created when (site count) quota exceeded
             Refactor core code to return "400 - Bad request," with indicative message, when a duplicate url is submitted.
   38897: ALF-13969: Tomcat shutdown with WARNING: Problem with directory [/opt/alfresco-4.0.1/tomcat/shared/lib], exists: [false], isDirectory: [false], canRead: [false]
   - Removed ${catalina.base}/shared/lib/*.jar from shared.loader definition in catalina.properties
   - Will update Wiki next
   38908: Fix for failing test since createSite change
   38939: Moved schema version up to 5100 (and 5101 for 'patch.show.audit')
   38941: Moved schema version up to 5110 (and 5111 for 'patch.show.audit') ... leave root for V4.1.0.x
   38953: ALF-14766: Ensure that DocLib tree drop targets are correctly set after creating new folders
   38954: Fix for ALF-14475: "CMIS : Wrong cmisra:numItems in folder sites and below with /cmisatom binding url"
   38974: Minor: removed unused code
   38987: ALF-13228 - updated manage permissions to handle custom group settings
   39006: Fix for ALF-14475 part 2: "CMIS : Wrong cmisra:numItems in folder sites and below with /cmisatom binding url"
   39022: Merge solution for ALF-13972
   39038: ALF-14388: Merge V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1)
      39037: ALF-15069 CLONE - Edit Online option is not supported for '.docm', 'dotm', '.xlsm' files
         - Added "Online Edit" support for:
           docx docm dotx dotm - doc and docx were already supported
           pptm ppsx ppsm potx potm ppam sldx sldm - ppt and pptx were already supported
           xltx xlsm xltm xlam xlsb - xls and xlsx were already supported
   39065: ALF-14861 SOLR to scale for non-admin users in 100k sites and a subgroup of each of 1000 independent groupings with 1000 subgroups
   - first round of fixes on the SOLR side
     - ACL lookup improved and reduced the number of Long objects created
     - Specific cache and configuration for PATH queries (with admin reporting)
     - Specfic cache and configuration for AUTHORITY queries (with admin reporting)
     - PATH and AUTHORITY queries cache the LEAF result (and not the AUX result which requires lots of extra work)
       -  cache works better with lucene query implementation
    - AUTHORITY query supports AUTHORITIES separated by "|"
   39135: Fix for ALF-15071 SOLR: Typographical offence in log output
   39152: ALF-13211: Accepted path for preventing NPE when viewing JBPM sub-process which has no start-task
   39175: Merge DEV to V4.1-BUG-FIX (4.1.1)
      39161: ALF-14956 : Folder within a Folder navigation issue.
      Fix for browsing to folders from not first page of a parent folder.
   39191: ALF-14863: no scope is available when ScriptNode is used from within Activiti expression, causes issue when scope is needed (eg. creating javascript-arrays) + fixed typo in activiti-source jars
   39192: Fix for ALF-12209 Incorrect behavior on View Realtionship for the user who has no permissions
   - skip relationships to objects that can not be seen.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@40263 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2012-08-09 16:24:57 +00:00
Dave Ward
efea3399ee Merged V4.0-BUG-FIX to HEAD 
37749: Fix for ALF-14582 SOLR tracking allows incompatible model changed to the current index to be made
   - part 1
   37810: Merge V3.4-BUG-FIX (3.4.11) to V4.0-BUG-FIX
      37809: Merge V3.4 (3.4.10) to V3.4-BUG-FIX (3.4.11)
         37808: ALF-14603: Merge V4.0 (4.0.2) to V3.4 (3.4.10)
            << The original 001-Cover_Cover.pdf file from ALF-9417 also now previews in 3.4.10 >>
            37800: ALF-14145 Flash preview quality is poor
               - Reverting change r30483 V3.4-BUG-FIX Sept 13 2011 for ALF-9417
                     swf.encoder.params=-s zoom=72 -s ppmsubpixels=1 -s poly2bitmap=1 -s bitmapfonts=1
                 being changed back to:
                     swf.encoder.params=-s poly2bitmap,subpixels=72
                 The original 001-Cover_Cover.pdf file from ALF-9417 does now preview in 4.0.2
      37796: Fix for ALF-12609 - refactored Site Finder to no longer an async call to retrieve memberships before the search operation
      37788: Second part of fix from Alex Mukha for ALF-11714
   37811: Merged V4.0 (4.0.2) to V4.0-BUG-FIX
      37766: Fix for ALF-14529 Share Solr admin console page shows "Unavailable: 05120041...
      - fixed admin and JMX console generation to match SOLR SUMMARY report changes
   37863: Fix for ALF-14631 Extraneous Backslash in Solr Configuration File
   37884: First full commit of Chinese (zh_CN) translation bundles
   37885: Spanish and French translation updates (based on EN r37081) - fixes a minor bug related to German strings in the wrong files.
   37896: Fix for ALF-14582 SOLR tracking allows incompatible model changed to the current index to be made
   - reject model changes that will break query support
   37899: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX
      37889: Added additional debugging output for JavaScript Search helper
      37897: Fix from Alex Malinovsky for ALF-13529 - Performing a 'Copy to' from document details results in error. [applied to doclib v2 also for 4.0.X]
   37901: Added support for xpath root node resolution to Repository search - previously only NodeRef based root node was working correctly.
   37904: Fix to ensure the root node is only applied to a search for a Repository search (ALF-13778)
   37913: Set version to 4.1.1
   37917: ALF-14652: Installation: Friendly message about busy Tomcat SSL port should be more exact
   - Updated installer strings for SSL port and JMX port
   - Needs localizing
   37920: ALF-13816: Permission Denied on web-client browsing if parent does not inherit permissions
      - FileFolderService getNamePath() now performs toFileInfo() as SystemUser.
   37969: Fixes for:
   ALF-12772 'Path not found' error in Share if user has no permissions to parent folders in breadcrumb
   ALF-14527 Share - Error to display documents if user has no access to the parent folder
   - Share now correctly supports accessing documents and folders (and details page actions) where the user does not have Read permissions on the parent node.
   37972: Fix for ALF-13343 - Unfriendly popup error messages displayed in Share when a user clicks on a direct folder-details or document-details URL that they don't have the permissions to access. Fixed due to changes in rev 37969 plus an improved error message.
   37992: Fix for ALF-14211 - Topics isn't found if search by content (full text)
   38008: Fix for ALF-14042 Customisable Alfresco contextPath in Alfresco AbstractHttpClient (used e.g. by Solr CoreTracker)
   38010: Fix for ALF-14686 https://localhost:8443/solr/admin/cores?action=CHECK - checks the index - it should check the cache
   38027: Update version to 4.0.3 - although this version should never exist - to differenciate it from 4.1


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@38130 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2012-06-21 16:41:53 +00:00
Steven Glover
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
 2012-05-22 19:52:20 +00:00
Dave Ward
5245ec7316 Merged V4.0-BUG-FIX to HEAD 
36604: ALF-13745: Merged V3.4-BUG-FIX (3.4.10) to V4.0-BUG-FIX (4.0.3)
      36602: ALF-13667 Additional OpenOffice mimetypes to be added to the mime-type maps
         - xls to pdf limit had been commented out
         - failover.transformer.PdfRenderer.PdfToImage and failover.transformer.PdfBox.PdfToImage should not have been
           been registered. Introduced an unregisteredBaseContentTransformer. In the case of these two transforms this would
           not have been a problem, as they were disable anyway due to EXPLICIT setting elsewhere.
   36608: First part of ALF-14209 SOLR - does not support query for all stores
   - dynamic SOLR cores to track a store
   - NEW, DELETE, and change properties and reload
   36635: ALF-13404 for documentlibrary-v2 APIs
   36669: Fix issue with rendering multi-valued properties in JSON from server-side JS (from DaveD)
   36676: Fix for ALF-14216 Solr Exception when you try to sort folders or files by size.
   36692: Fix ALF-12966 - Comments doesn't work on iOS Safari. Anywhere TinyMCE is present does not work correctly e.g. comments, blogs, wiki, HTML content creation.
   36693: ALF-14138: Prevent default Surf CMIS content WebScript clashing with Alfreco version (updated Surf libs r1081)
   36714: ALF-14224: WorkflowTaskDefinition form-key fetching fixed for multi-instance UserTasks
   36721: Fix for ALF-8374 - Simple view: incorrect file type icon for *.page and *.eps files
   36726: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX
      36724: Fix for ALF-14207 - cm:link not correctly handled in Share's doclist when users don't have permission
   36728: Fix for ALF-14002: "No dashlets listed when customizing Site dashboard for the "Web Site Design Project" sample Share Site "
   36732: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
      36637: ALF-6162 Thumbnail is not produced for PDFs encoded with JBIG2Decode
         << Reported problem still exists, but have made improvements see https://issues.alfresco.com/jira/browse/ALF-6162?focusedCommentId=162936&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-162936 >>
         - PDFRenderer now fails with an exception in more cases, rather than just silently continuing. Specific case was not handling JBig2 images.
           previously just resulted in a black box)
         - Handle the font family CIDFontType0 which includes HiddenHorzOCR
      36640: ALF-13769: Merged BELARUS/DEV/V3.4-BUG-FIX-2012_05_04 to V3.4-BUG-FIX (3.4.10)
         36440: ALF-11956: WCM accessibility
            Assignment of TinyMCE accessibility hotkeys only to activated RTE between multiple instances is added.
            Headings and some other related labels within the context of 'Create Web Content Wizard' were shortened and clarified.
            Fixed some issues related to hidden text for accessibility support in context of IE, which doesn't calculate styles and dimensions that are applied to elements before adding to DOM
         36443: ALF-11956: WCM accessibility
            Added some changes missed in r36440
      36645: ALF-13769: Merged DEV/V3.4-BUG-FIX-2012_01_10 to V3.4-BUG-FIX (3.4.10)
         33381: ALF-10162: Web Form validation can be bypassed
            1. New method was introduced to XFormsBean which allows it to validate the last inserted values.
            2. CreateWebContentWizard finds XFormsBean in session and invokes isXformValid. If any validation
               errors exist it goes back and show the JSF error.
            3. xform.js - contains code that removes JSF error as well as the XForms error. This is necessary because we need to clear
               the JSF error on the Javascript actions
            4. container.jsp - includes a div wrapper with the id to be able unambiguously find the JSF error block.
      36700: Merged DEV to V3.4-BUG-FIX (Reviewed by Erik)
         36450: ALF-12261 : IE8 Specific: It's impossible add relationship type "Parent/Child"
            The type of the submit button should be set to 'button' in 'new-rmreference.get.html.ftl'.
      36702: Merged DEV to V3.4-BUG-FIX (Reviewed by Erik)
         36670: ALF-12825: Impossible choose the "Publication Date", the calendar isn't displayed
            The DatePicker component register a validation handler for the date entry field so that the submit button disables when an invalid date is entered. This handler register with the forms runtime instance. We should create this instance in FormUI_consructor, not is onReady method (form.js), because constructors always in order will be invoked. 
      36703: Fix for Mac Office 2011 Powerpoint save fails on CIFS. ALF-13615.
   36733: Merged V4.0 to V4.0-BUG-FIX
      36628: Added ${NOW} variable option for schema bootstrap scripts (see ALF-14174)
      36632: Fix last part of ALF-14174: The patch adding timestamps to acl_change_set breaks SOLR tracking
       - Added ${NOW} to ACL change set timestamp when upgrading: commit_time_ms = ${NOW}
      36647: ALF-14190: FSTR is not working
      - Due to someone updating dependencies without updating the build scripts!
   36734: Merged V4.0 to V4.0-BUG-FIX (RECORD ONLY)
      36605: ALF-13745: Merged V4.0-BUG-FIX (4.0.3) to V4.0 (4.0.2)
         36604: ALF-13745: Merged V3.4-BUG-FIX (3.4.10) to V4.0-BUG-FIX (4.0.3)
            36602: ALF-13667 Additional OpenOffice mimetypes to be added to the mime-type maps
      36678: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/V4.0
          36675: Fix for ALF-14216 Solr Exception when you try to sort folders or files by size.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@36737 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2012-05-22 16:51:44 +00:00
Steven Glover
f71280b165 Merged BRANCHES/DEV/V4.0-BUG-FIX to HEAD: 
35606: Merged BRANCHES/V3.4 to BRANCHES/DEV/V4.0-BUG-FIX:
        35375: Fix for ALF-13711: "Hidden Aspect applied to Mac powepoint files."
             - re-instated previous hidden aspect behaviour
        - also make sure the HiddenAspectTest runs

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@35613 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2012-04-24 11:45:30 +00:00
Dave Ward
556377ea3b Merged V4.0-BUG-FIX to HEAD 
34474: ALF-13169 Tomcat fails to shutdown
   - fix non daemon Timer's
   34475: Part 1: Fix for ALF-13244 SOLR Multi-threaded tracking is required for performance - simultaneous document transformations
   - multi-threaded transaction and node tracking (off by default at the moment)
   - fix index/repo sync check failure if ACLs have been indexed but no transactions
   - minimise data sent back from query responses (not all stored fields)
   - added SOLR side config for HTTPClient pooling, cache sizing and tracker configuration
   - fixed SOLR incremental cache update for merges that end with all deletions in the old index
   - fixed unclosed stream in SolrKeyResourceLoader
   34478: ALF-13050 - CIFS: Disabling account is not respected
   Also contains major rework of logging and exception handling.
   34499: Fix for ALF-13150
   34526: Fix for ALF-13288
   34530: Minor CSS tweaks after changes for ALF-11991
   34539: ALF-13176 - Implement Word for Mac 2011 Cifs Shuffle.
   34541: ALF-13244 SOLR Multi-threaded tracking is required for performance - simultaneous document transformations
   - multi-threaded ACL tracking
   - multi-threaded statistics and reporting control
   - nodes that can not be indexed have an error record added to the index and do not block indexing the transaction (nodes unindexed due to exceptions can be found by ID query and the exception stored in the index)
   - nodes that are not-indexed have a minimal record added to the index for index consistency checking (unindexed nodes can be found by ID query)
   34544: Add support for CIFS Level II shared oplocks. ALF-13138, ALF-13110.
   Fixed CIFS open for attributes only access preventing oplock on the following file open.
   Fixed reporting serialized copies of file access tokens as leaked.
   34576: ALF-12767 - CIFS TextEdit - File has been modified outside TextEdit
   34577: incorrectly checked in copy of network-protocol-context.xml
   34580: ALF-13215: Ensure that permissions for everyone cannot be upgraded on moderated or private site. Fixed inconsistency between permissions shown in properties and in dialog
   34582: ALF-13332: Updated modifier link for correct profile
   34609: ALF-12740: Update to previous fix (only apply to IE8 and below)
   34623: ALF-12767 - CIFS TextEdit - File has been modified outside TextEdit
   34636: Fix for ALF-13365 SOLR: Recently modified docs dashlet sorts incorrectly
   - respect short property names on sort requests @cm:created and not require the full @{uri...}created
   34659: ALF-2550 - added enterprise repo config files.
   34715: Fix for __ShowDetails desktop action returned URL is truncated if hostname too long. ALF-13202.
   34726: ALF-13293: Webdav: Version history lost after editing content in Finder
   34738: ALF-7883: WebDAV: support HEAD method for folder
   - Fix by Pavel
   34743: Fix for ALF-13244 SOLR Multi-threaded tracking is required for performance - simultaneous document transformations
   - batch fetch for nodes in transaction, acls in sets, and acls and readers
   - config for batch fetching
   - Better reporting for ACL set indexing
   34747: ALF-13262: adding missing indexes for new schema's (activiti-schema create) + schema patch for existing schema
   34817: Merged V4.0 to V4.0-BUG-FIX
      34493: SPANISH: translation updates based on EN r34103
      34498: Fixed ALF-12031: WCM: Content cannot be expired: avmExpiredContentTrigger is missing
       - Side-effect of ALF-11644: AVM cleanup jobs run when WCM is not installed
       - WORKAROUND: Get file 'root\projects\installer\wcm-bootstrap-context.xml' and use that
      34525: Fix for ALF-13210:
        - removed "unsupported" from bulk filesystem import web pages
      34531: Fix for ALF-13117 and ALF-13273
      34549: Merged BRANCHES/DEV/BELARUS/HEAD-2012_03_15 to BRANCHES/V4.0:
         34528: ALF-12874:
      34552: ALF-13322: Fixed doc lib reload loop caused by "#" in folder name
      34553: ALF-13311: Ensure images can be linked in TinyMCE create HTML content editor
      34556: Minor: removed unused code
      34557: Merged DEV to V4.0
         34537: ALF-13035: Add "START WITH" parameter to IDENTITY field.
                ALF-13034: Add "optional" parameter for statement that drops index that was generated automatically.
      34567: ALF-11047: Ensure that Explorer linked files and folders (from outside of sites) display correctly
      34578: Fixes: ALF-11744: Dates rendered with the form service date control are rendered on the server, so show server time.
         - I've added the timezone to the display format and the ISO8601 date to the as an attribute on the HTML element to allow client side parsing
         - Adds client side parsing on the Doc Details page, so times are shown in the timezone of the user's browser.
      34583: GERMAN: Translation update, based on EN r34103, Fixes: ALF-13075,
      34584: FRENCH: Translation update based on EN r34103, Fixes: ALF-13002, ALF-13003, ALF-13020
      34585: ITALIAN: Translation update based on EN r34103
      34586: JAPANESE: Translation update based on EN r34103
      34587: DUTCH: Translation update based on EN r34103, Fixes: ALF-12575.
      34626: Fixes: ALF-13375 - Date rendering bug in search results
      34630: Further fix for ALF-13375 that modifies Alfresco.util.formatDate's ISO8601 support for backward compatibility (e.g. passing in non ISO strings).
      34635: ALF-12061: Mac support: Document Connection always throws an error
      - Case sensitivity fix by Pavel
      34653: ALF-12308, ALF-12309, ALF-12554: Stack specific script errors
      34655: Fix for ALF-12723 CMIS: Over-riding cm:autoVersionOnUpdateProps in custom model prevents startup
      34656: Merged HEAD to BRANCHES/V4.0:
         34654: Fixes: ALF-13389: Old element id used when setting event end date.
      34657: Translation updates for all languages except JA.
      34660: Fix to license driven config files to remove erroneous characters
      34669: Merged DEV to V4.0
         34663: ALF-12242: User activation issue
            InviteHelper.acceptNominatedInvitation() method was changed to enable user account in any case(no matter was it enabled/disabled before)
      34681: Merged DEV/THEMIS2 to V4.0
         34472: Document List Customization Refactor
            - SLingshotSiteModuleEvalutaor now has new <applyForNonSite> param that defaults to false for backward compability 
            - Slingshot extension points, surf-doclist.get now uses 2 spring beans:
               * "resolver.doclib.doclistDataUrl" to get the repo doclist data url 
               * "resolver.doclib.actionGroup" to get each item/nodes action group id 
      34692: Fix for ALF-12715 - Incorrect SPP working (mimetype not set on document stored via ADM Remote Store API)
      34708: ALF-13239: Merged V3.4-BUG-FIX (3.4.9) to V4.0 (4.0.1)
         34707: ALF-13239 Share rule to convert to PNG fails on JPG images
            - Issue was showing up in 4.0.1 as a change was made for iPad that introduced an imageOptions.isAutoOrient()
              setting. This forced a concatenation of null with " -auto-orient". However there are also crop and resize
              options that could also do this even in 3.4
              Setting the commandOptions String to "" when null, is fine as this is how property value nulls are handled
              later anyway.
      34718: JAPANESE: Localisation of Company specific contact information & addition of timezone to form control.
      34719: FRENCH: File consistency tweak.
      34746: ALF-12903: Create HTML content fix
      34754: Merged PATCHES/V4.0.0 to V4.0
         34750: Reinstate ${version.label} into version.number property
      34810: Merged DEV to V4.0 (with corrections)
         34807: ALF-13290 : Mac Support: Error appears after collaborator saves changes to the document
            deleteFailedThumbnailChildren method should be run as system user as it may fails with AccesssDenied if collaborator updates document
   34876: Fix fo ALF-13503 Add SOLR client API tests to the SystemBuildTest project
   - SOLR API tests run embedded with SSL
   34984: ALF-13109 - Correction to NTIOCtl.FsCtlCreateOrGetObjectId
   35009: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX:
      35008: Fix for ALF-12817. Fixed as suggested - new method remove().
   35031: Fix for ALF-12309
   35032: Fix fo ALF-13535 using CMIS, on-disk tickets cache can grow unbounded
   - expire tickets based on inactivity by default
   - added job to clean up expired tickets
   - all are configurable
   35033: Fix fo ALF-13535 using CMIS, on-disk tickets cache can grow unbounded
   - avoid NPE for null tickets
   35037: Fix for ALF-13505 SOLR tracking readers does not encode all uids correctly
   - fixed reader encoding
   35049: ALF-13384 - Saving large Word (mac 2011) document via CIFS fails in Mac OS X Lion
   35053: Merged V4.0 (V4.0.1) to V4.0-BUG-FIX (4.0.2)
      34844: Merged V3.4-BUG-FIX (3.4.9) to V4.0 (4.0.1)
         34843: ALF-5830 show_audit.ftl template doesn't work anymore
            - Removed L10n messages that are no longer used (should have been removed in 3.4.6 when this issue was fixed)
      34847: Merged HEAD to BRANCHES/V4.0:
         34804: Fixes: ALF-13309: Issue with over zealous HTML escaping with truncated descriptions in the Calendar Agenda view.
      34861: ALF-13497: Merged PATCHES/V4.0.0 to V4.0
         34813: ALF-13115: No feedback is given to the user when Approve/Reject is clicked for a task when they followed a link to the task in an email.
            - Fix by Pavel, reviewed by Kev
            - Now they get a confirmation message followed by a redirect to their dashboard
      34862: Fix for ALF-10823 "allowGuestLogin=false" and Share then fills the alfresco error log with "Guest authentication not supported"
      Fix for ALF-12678 Errors in log on startup (ts.alfresco.com 4.0)
       - improved handling of 500 errors relating to GuestAuthNotSupported when alfresco.authentication.allowGuestLogin=false
      34867: Merged DEV to V4.0
         34565: ALF-13074: JBPM workflow definitions are not resilient to missing model definitions
            WARN messages have been added if JBPM workflow definitions cannot be loaded in the model definitions.
         34855: ALF-13074: JBPM workflow definitions are not resilient to missing model definitions
            Reimplemented to handle all exceptions during constructing WorkflowInstances WorkflowTasks and WorkflowDefinitions.
         34859: ALF-13074: JBPM workflow definitions are not resilient to missing model definitions
            Logger messages was changed to correspond the logger pattern.
      34893: Translation updates for DE and ES.
      34894: Fixes: ALF-13518; Updates Calendar event object's URL to work out of context.
      34896: FRENCH: Translates new strings.
      34915: Merged DEV to V4.0
         34912: ALF-13267: There should not be a web-client-config-custom.xml in alfresco.war
            Move "modules\quickr\config\alfresco\extension\web-client-config-custom.xml" to "modules\quickr\config\alfresco\module\org.alfresco.module.quickr\ui\web-client-custom.xml".
         34913: ALF-13267: There should not be a web-client-config-custom.xml in alfresco.war
            Delete "modules\quickr\config\alfresco\extension\web-client-config-custom.xml".
      34916: ALF-13267: Merged V3.4 to V4.0 (and reversed previous duplicate fix)
         24828: Merged BRANCHES/DEV/BELARUS/V3.4-2011_01_13 to BRANCHES/V3.4:
            24824: ALF-6361: web-client-config-custom.xml doesn't work in /alfresco/tomcat/shared/classes/alfresco/extension
      34929: ALF-12242: Issues activating users when more than one member in the authentication chain
      - Correction to fix that caused regressions ALF-13494, ALF-13498
      - Need to check for the mutability of a user's authentication before trying to enable it
      - Also chaining of the authentication enabled attribute should assume true until false found, not the other way around
      34930: ALF-12242: Reverted change to this class as it wasn't necessary and wouldn't work!
      34932: ALF-13453: Enable XMLConstants.FEATURE_SECURE_PROCESSING feature on Transformer Factory to prevent remote code execution
      - Now SecureTransformerFactory should be used as a standard
      34965: Merged PATCHES/V4.0.0 to V4.0
         34959: ALF-13550: Fix for ALF-13546 SOLR tracking fails for nodes with content and no auditable aspect - NPE as there is no last modification date to use
         34960: ALF-13551: Merged BRANCHES/DEV/V4.0-BUG-FIX to PATCHES\V4.0.0
         - fix for ALF-13544 When SOLR encounters an error indexing a document, subsequent indexing does not occur
             34541: ALF-13244 SOLR Multi-threaded tracking is required for performance - simultaneous document transformations
                    - nodes that can not be indexed have an error record added to the index and do not block indexing the transaction (nodes unindexed due to exceptions can be found by ID query and the exception stored in the index)
                    - nodes that are not-indexed have a minimal record added to the index for index consistency checking (unindexed nodes can be found by ID query)
      34968: ALF-13453: Reversed XSLTProcessor and XSLTRenderingEngine changes for now as they break http://wiki.alfresco.com/wiki/WCM_Forms_Rendering and model handling via bsf extensions. A more sophisticated approach is required. See bug for more info.
      34972: ALF-13340: Upgrade postgres JDBC driver to tested/supported version!
      34997: ALF-13453, ALF-13565: Fully reverted revision 34932 as it prevents startup on Weblogic
      34998: Merged V4.0-BUG-FIX to V4.0
         34992: DUTCH: translation updates based on EN r34861
         34993: FRENCH: Translation updates based on r34861
         34994: ITALIAN: Translation updates based on r34861
      35013: ALF-13561: Not found error after uploading new version
      - Fix by Pavel
      35034: Fixes ALF-13570: Error loading event info panel.
      35039: ALF-13573: Merged V3.4-BUG-FIX (3.4.9) to V4.0 (4.0.1)
         35022: ALF-13451: Allow modules to configure mimetypes
      35041: ALF-13466: Error is displayed by approve or reject wcm workflow
      - Fixed regression caused by ALF-4098
      - Protected calls to new addNewChildrenIfAny() method with isDirectory() checks
      35042: GERMAN: Translation updates based on r35029, and fixes ALF-12471.
      35043: SPANISH: Translation updates based on r35029, and fixes ALF-12471.
      35044: FRENCH: Translation updates based on r35029, and fixes ALF-12471.
      35045: ITALIAN: Translation updates based on r35029, and fixes ALF-12471.
      35046: JAPANESE: Translation updates based on r35029, and fixes ALF-12471.
      35047: DUTCH: Translation updates based on r35029, and fixes ALF-12471.
   35090: Remove Kofax.  It has been migrated to integrations/kofax
   35097: Added new file server cluster tests.
   Open for attributes only overlapped with open with oplock.
   Open with oplock with break to level II shared oplock.
   35099: JLAN Client updates to support level II oplocks, required by new cluster tests.
   35100: Various oplock related fixes, including problems opening file on second cluster node. ALF-13109.
   35107: remove errant '>'
   35116: ALF-13401 - Mac LION Powerpoint CIFS
   35162: Removed spurious attempt to force a concurrency exception for getNodePair after a node had actually been deleted.    Code would retry 50 times before failing.   Reviewed with Derek, its not the node service's job to second guess that there may be a concurrency problem in a client's cache.
   35164: Fix for ALF-13641 - Negative cases for date value in propertyNegative cases for date value in property. Today button
   35169: ALF-13401, ALF-12393: Added exception translation to AbstractReindexComponent retrying transactions, following change in r35162
   35172: ALF-13626: category.put.json.ftl has wrong bracket
   35173: ALF-12749 - CIFS: Editing of ppt/pptx files fails (MacOSx specific)
   35174: Fix for ALF-13556 - Sorting for custom model fields doesn't work for search results in Share
   35176: Fix for ALF-4281 - Script error at 'Email space users' form
   35186: Merged BRANCHES/DEV/DAM/V4.0-BUG-FIX-34847 to BRANCHES/DEV/V4.0-BUG-FIX:
      34875: Creating new branch from $FROM
      34939: Merged BRANCHES/DEV/DAM/V4.0-BUG-FIX-34397 to BRANCHES/DEV/DAM/V4.0-BUG-FIX-34847:
           34400: Creating new branch from $FROM
           34422: Merged DEV/DAM-0.1 to DEV/DAM/V4.0-BUG-FIX-34397
                 34085: Allow for generateThumbnailUrl to accept a rendition name parameter.
                 34086: Changed simpleView view type switch to integer implementation rather than boolean.
                 34087: Pulled specific rendering code for simple and detail view into separate view renderer objects.
                 34092: If simpleView was stored as a boolean convert it to an integer for ALF-12952.
           34423: Merged DEV/DAM/HEAD-34276 to DEV/DAM/V4.0-BUG-FIX-34397
                 34307: ALF-12952: Change DocumentList simpleView Nav Switch to an Int Implementation
      34957: ALF-12952: Change DocumentList simpleView Nav Switch to an Int Implementation
            - Removed ability to specify index on registerViewRenderer
            - Added firing of setupAdditionalViewRenderers to make it easier for extensions to register themselves at the appropriate time
      35021: ALF-12955: Share Document Library and Repository Browser Should Easily Allow for Additional Views
           - Changed viewRenderers to an object implementation with storage/retrieval via named properties or 'keys'
      35050: ALF-12955: Share Document Library and Repository Browser Should Easily Allow for Additional Views
           - Renamed simpleView preference and option to viewRendererName
           - Reintroduced simpleView boolean preference and option as deprecated to allow deletion of old preference
           - Renamed viewRendererOrder to viewRendererNames
           - Added default viewRendererNames at DocumentList.options level
           - Renamed widgets.simpleDetailed to widgets.viewRendererSelect but did NOT change HTML id for backwards compatibility
           - Renamed onSimpleDetailed to onViewRendererSelect
           - Added deletion of deprecated simpleView preference if it exists
      35056: ALF-12955: Share Document Library and Repository Browser Should Easily Allow for Additional Views
           - Made viewRenderer methods a proper Alfresco.ViewRenderer object which is more easily extended
           - Added name property to ViewRenderer constructor and changed registerViewRenderer to use that as a key
           - With more strictly defined ViewRenderers in place, changed select button to iterate over viewRendererNames rather than explicit list
      35104: ALF-12955: Share Document Library and Repository Browser Should Easily Allow for Additional Views
           - Added markup tag around the document list container
      35126: ALF-12955: Share Document Library and Repository Browser Should Easily Allow for Additional Views
           - Added markup tag documentListConstructorSetOptions around setOptions after DocumentList object constructor
           - Added markup tag documentListViewRendererSelect around view select buttons
           - Added markup tag documentListShowFolders around show folders button
           - Added markup tag documentListSortSelect around sort selection buttons
           - Renamed Alfresco.ViewRenderer to more specific Alfresco.DocumentListViewRenderer and private methods similarly
           - Added default for viewRendererName if it's undefined in options
           - Added check for availability of renderer specified in user preference, if not use default, and consolidated renderer index lookup
      35179: ALF-12955: Share Document Library and Repository Browser Should Easily Allow for Additional Views
           - Removed documentListConstructorSetOptions
   35194: Temp disable cifs text edit test.
   35197: ALF-13097 - IMAP templates have wrong mimetype
   35201: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
      34462: Merged DEV to V3.4-BUG-FIX
         34461: ALF-10759: Advanced search fails for sub-element tags
            UITagSelector component which allows Advanced Search to add new tag option to search
      34479: Merged V3.4 to V3.4-BUG-FIX (RECORD ONLY)
         34477: ALF-13237: Yet another 13th hour Spring Surf Regression
           - Can't afford to pull in all the latest surf goodies so overriding PageImpl.class with one corresponding to Surf revision 1034 in WEB-INF/classes, just for 3.4.8
      34515: ALF-9855: Alfresco side to support standard Adobe-Japan1 PDF fonts in swftools
      - Bitrock binaries provided
      34518: ALF-13266: Ubuntu installation fails in non-obvious way when machine lacks sufficient memory
      - Fix from Bitrock
      - L10N required
      34536: Merged DEV to V3.4-BUG-FIX
         34529: ALF-13135: Impossible to Add new member on Workspace using email address
            NPE fix if AD users don't have e-mail address as a property.
      34538: ALF-12812	Saving files with apps on Mac OS X Lion in CIFS doesn't invoke rules (Update rule fires BEFORE, FileFolderInterceptor recalcs HIDDEN and TEMPORARY )
      34542: Add support for Level II shared oplock. ALF-13093, ALF-12328.
      Fixed CIFS open for attributes only access preventing oplock on the following file open.
      34543: Oplock and open for attributes fixes to the repo/AVM filesystems. ALF-13093, ALF-12328.
      34579: ALF-13284: Removing obselete files
      34603: ALF-10833 Alfresco does not show correct thumbnails for some specific kind of PDFs
         - Patched PDFRenderer-0.9.1 to return a null page if there was an error.
           The code structure did not lend itself to simply throwing the exception.
         - Modified PdfToImageContentTransformer to check for a null page and it then throws an AlfescoRuntimeException
           which causes the failover transformer to use the next transformer in the list: PDBBox which is able to
           transform the pdf and the image that was missing.
      34617: Add missing source Java folder.
      34629: ALF-13188: Content IO Channel not closed
      34697: ALF-13149: Start up performance suffers if the alf_transaction table grows too large.
      34712: ALF-13063: sample settings for DB2
      34803: New installer translations from Gloria
      34809: ALF-11956: Merged BELARUS/V3.4-BUG-FIX-2012_01_26 to V3.4-BUG-FIX (V3.4.9)
         << In addition to the 2 merged revisions, includes the change for ALF-11972 and test all-widgets.xsd >> 
         33715: ALF-11956: WCM accessibility   
         - sandbox name oriented titles were added almost to all action links at 'Browse Website' page view;
         - adding titles to image tags functionality was added to ActionLinkRenderer, UIMenu and UISandboxes (this includes arrow icons for 'Web Forms' and 'Modified Items');
         - titles were added to XForm Date/Time picker controls (text input and arrow buttons);
         - 'Click to edit' functionality via keyboard availability was added to XForms TinyMCE editor control (using 'Tab' key, 'Alt' + 'E' in IE or 'Alt' + 'Shift' + 'E' in FireFox);
         - additional i18n properties for Date/Time picker and action link titles were added
         34625: ALF-11956: WCM accessibility
         Increasing XForms widgets readability by screen reader tools:
         - Tiny MCE 3.2.7 buttons;
         - required fields;
         - inputs labels;
         - VGroup, HGroup and Repeating widgets folding icons/buttons and others
      ALF-11972: Title attributes for the WCM form element xs:anyURI not included to allow multiple xs:anyURI file picker "Select" buttons to be distinguished by screen readers
         - Change defined in JIRA
      34846: Translation updates:
         - FR: Missing Strings
         - DE: Fixes encoding issue
      34881: ALF-13512: Merged PATCHES/V3.4.8 to V3.4-BUG-FIX
         34829: ALF-12621: Sort order of folders including hyphens ( - ) are different in folder-tree and view on folders (in Share)
         - Switched from using JS sort to Java locale-based sort
         34845: ALF-12621: Fixed array typing problems in previous checkin
      34918: Fix for ALF-13385 Access DENIED api does not seem to work
      - changed default behaviour to any-deny-denies
      - config to switch back 
      - needs custom port to 4.0 for SOLR
      - unit tests added
      34919: Fix for ALF-13385 Access DENIED api does not seem to work
      - added property based configuration and default configuration check
      34937: ALF-11956: Merged BELARUS/V3.4-BUG-FIX-2012_01_26 to V3.4-BUG-FIX (V3.4.9)
         34886: ALF-11956: WCM accessibility
         - headings functionality is added. WAI-ARIA markup was used;
         - alert for XForms validation errors is added. WAI-ARIA markup was used;
         - previous accessibility changes tested and fixed against the new functionality
      35003: Merged HEAD to V3.4-BUG-FIX
         34673: Changed from time-based module and component names to GUID-based names.  Not likely to affect anything.
      35057: Fix for ALF-12590 Share - Document library doesn't return subfolders when parent space contains the character "- "
      - updated to the latest version of jaxen (which now includes saxpath)
      - the problem path is now parsed correctly
      35074: ALF-13597: Merged PATCHES/V3.4.6 to V3.4-BUG-FIX
         34978: ALF-13489: Index tracker now has ability to distinguish create/update/rename/link/unlink
         - Will prevent unnecessary cascading PATH regeneration on remote cluster nodes
         - QNames and noderefs of parents in index compared with those in the database
         - Experimental - needs testing
         34983: ALF-13489: Correction to renamed node detection
         34985: ALF-13489: Even more foolproof parent assoc cross-referencing
         - Should handle duplicate QNames, etc.
         - Renames now just an add and a remove
      35075: ALF-13598: Merged PATCHES/V3.4.6 to V3.4-BUG-FIX
         34872: Merged DEV (by Pavel) to PATCHES/V3.4.6 (and refactored)
            34554: ALF-11777 : Persistent lock is left on document in certain use cases when editing online (spp)
               1. From now documents are locked for maximum 24 hours when working through WebDAV/Vti.
               2. Session listeners were added for web-client and vti-module to allow handling session expiration event.
               3. WebDAVLockService class was implemented. It is used by session listeners to perform session cleaning (forcibly unlock all documents that were persistently locked during http session).
               4. LOCK/UNLOCK webdav methods and Get/Checkout/UncheckoutDocumentMethod vti methods where updated to correctly populate session list of locked documents.
            34832: ALF-11777 : Persistent lock is left on document in certain use cases when editing online (spp)
               1. From now documents are locked for maximum 24 hours when working through WebDAV/Vti.
               2. Session listener was added for webdav/vti to allow handling session expiration event.
               3. LOCK/UNLOCK webdav methods and Get/Checkout/UncheckoutDocumentMethod vti methods where updated to use shared code to lock/unlock nodes.
            34833: ALF-11777 : Persistent lock is left on document in certain use cases when editing online (spp)
               1. Remove unnecessary classes after 34554 rev.
            34852: ALF-11777 : Persistent lock is left on document in certain use cases when editing online (spp)
               1. Some changes after David's review of revisions 34832, 34833.
         34874: ALF-11777: Fixed typo
      35078: ALF-12785: BaseDownloadContentServlet could co into an infinite loop if asked to seek past the end of a file
      35079: ALF-12490 "HTTP Status 500 - 00200935 Exception in Transaction" message error with webform
         - ALF-9524 fix assumed there were only switch elements in a form
      35086: ALF-13563: Upgrade to Bitrock 8.1.0 to fix password validation issue
      35095: ALF-12764: New distributable alfresco-enterprise-ear-3.4.9.zip
      - Like war zip, but contains .ear file instead of .wars and also contains WAS shared library
      - Means samples and other bits are finally available to non-Tomcat users
      35103: Merged DEV to V3.4-BUG-FIX
         35098: ALF-12776: if a user requests to join a moderated site, and that request is rejected, the rejection email is sent to the user-id and not the email id.
         Implemented
            Correct WorkflowModelModeratedInvitation.WF_PROP_REVIEW_COMMENTS field in configuration for moderatedInvitationReviewTask
            Person's email into emailAction PARAM_TO
      35114: ALF-12766 Creating Web Content several users - different sandboxes
         - To be consistent with ALF-11440 PM comment 18-Dec-2011 and ALF-8787
           A Manager should only be able to create a file in a sandbox
           if it is NOT locked somewhere else.
         - Not much can be done about the error message as the locked path is useful in other
           situations and it is not possible to issue a different message on create only
      35121: ALF-11956: Merged BELARUS/V3.4-BUG-FIX-2012_04_05 to V3.4-BUG-FIX (V3.4.9)
         35109: ALF-11956: WCM accessibility
         - Date/Time Pickers are made accessible via the keyboard and readable by JAWS (13, demo version). WAI-ARIA standard is used;
         - corrected 'expanded' state determination for Date/Time Pickers;
         - Modified Items and Web Forms arrow buttons are made accessible via the keyboard on the Browse Website page;
         - some changes per the description of the issue and per the comment of the 23-Feb-12 11:33 AM
      35145: ALF-11990: CIFS login with case insensitive username is rejected
      - User name normalization moved to before MD4 hash retrieval
      35151: Port of oplock related changes from v4.x.
      35177: Fix for ALF-11936 - RSS feed from the activities dashlet produces invalid XML
      35178: ALF-12631: removeChild requires delete permissions on the child node, even when it is a secondary association
      - now it doesn't (thanks to Andy's solution)
      - new ACL_PRI_CHILD_ASSOC_ON_CHILD ACL entry only enforces the permission on the child node when it is a primary association
      35181: Merged DEV to V3.4-BUG-FIX
         35165: ALF-13409: Invite to a site throws an error if an instance of invitation-moderated-workflow is started by a user whose account is subsequently deleted
            InvitationServiceImpl listens for person node deletions (it already implements beforeDeleteNode) and cancels invitations within beforeDeleteNode
      35182: ALF-12567 Unable to create thumbnails for certain PDF files
         - The supplied PDF contains an invalid offset in the xref table. This turns out to be a quite common error resulting in
           thousands of Google hits. The offset is set to the string value "4294967295". This number in hex is FFFFFFFF. The value
           of an 4 byte int in C or Java with this value is -1. Neither PDFRenderer nor PDFBox have workarounds for this although
           lots of other systems do, which is why it is possible to view or edit it in other systems.
           Patched both PDFRenderer and PDFBox to handle this common error. 
      35185: ALF-13033: Friendlier error message when you try to delete non existent content from a sandbox
      35191: ALF-13409: Fix build.
      35192: Merged V3.4 to V3.4-BUG-FIX
         35161: ALF-13624: Merged V4.0-BUG-FIX to V3.4
            34474: ALF-13169 Tomcat fails to shut down
               - fix non daemon Timers (and punctuation!)
         35163: ALF-13656: Merged HEAD to V3.4
            31375: Fix for ALF-435 - Unfriendly error occurs when trying to delete renamed category from category page
         35189: Italian translations from Gloria
      35193: Merged V3.4 to V3.4-BUG-FIX (RECORD ONLY)
         35125: Merged V3.4-BUG-FIX to V3.4
         35156: Correction to merge in revision 35125 (a reintegrate merge rather than a selective merge)
   35202: Merged V3.4-BUG-FIX to V4.0-BUG-FIX (RECORD ONLY)
      34532: ALF-13233: Merged HEAD to V3.4-BUG-FIX
         32960: ALF-11008 - Support the WebDAV DELETE method in SPP/VTI, with the special response required by SPP for locked documents
      34559: ALF-13106: Merged HEAD to V3.4-BUG-FIX
         28223: Merged DEV/SWIFT to HEAD (Tika and Poi)
         30589: Upate Tika and add Ogg Vorbis support + tests
         30673: Upgrade POI and Tika for recent fixes
         31009: Bump the Tika version for some recent fixes
         31010: Update the test audio files to include more metadata
         31011: ALF-6170 Add missing audio model (needed in devcon demo)
         31013: Update the MP3 extractor to output audio keys (related to ALF-6170), and refactor the audio extractors to share more common code. Also expands the audio extractor tests to share common code, and test more metadata. (Needed for devcon demo)
         31022: Tika update for custom mimetypes enhancement
         31023: Add @since tags where known, and do a quick coding standards sweep
         31274: ALF-10813 follow-on - make it clearer that we're just creating the one detector, and switch to the new style version
         31289: ALF-10803 - Upgrade Tika to add the extra WordPerfect mimetype
         31553: ALF-10525 ACP mimetype detection fix, unit tests for it, and a NPE fix
         31554: Update Tika to get the fix for TIKA-764
         32105: ALF-11574 Upgrade Tika for the fix to TIKA-784, and add the DITA types to the Alfresco mimetype map
         32138: Bump the Tika version for the updated TIKA-784 fix, and add an Alfresco side unit test for this case
         32153: Update the vorbis jar to one that includes the license info more clearly in META-INF (without needing to read the POM)
         32320: ALF-11650 Upgrade Tika for TIKA-789 (MPP Detection), and add tests that show it is now being correctly handled
         32363: Update POI and Tika for the new code required to solve ALF-10980 (MPP Open/Change detection)
      34560: ALF-13106: Merged V4.0-BUG-FIX to V3.4-BUG-FIX
         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)
         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
         33779: Upgrade Tika for ALF-12714
         33782: ALF-12714 Add 3GPP/3GPP2 video, and MP4 Audio mimetypes
         33783: Update Tika for more MP4/QuickTime support, and enable MP4 audio metadata extraction + "quick" testing
      34561: ALF-13106: Fixed merge errors
      34562: ALF-13106: Merged SWIFT to V3.4-BUG-FIX
         26546: Have one copy of the Tika Config in spring, rather than several places fetching their own copy of the default one (either explicitly or implicitly).
      34563: ALF-13106: Merged HEAD to V3.4-BUG-FIX
         32264: Adding "quick" test resources for MS project.
      34564: ALF-13106: Fix unit test
      34752: GERMAN: Translation updates, based on EN: 34612
      34753: SPANISH: Translation updates, based on EN: 34612
      34755: FRENCH: Translation updates, based on EN: 34612
      34756: ITALIAN: Translation updates, based on EN: 34612
      34967: ALF-13552: Merged V4.0 to V3.4-BUG-FIX
         34932: ALF-13453: Enable XMLConstants.FEATURE_SECURE_PROCESSING feature on Transformer Factory to prevent remote code execution
            - Now SecureTransformerFactory should be used as a standard
      34971: ALF-13552: Merged V4.0 to V3.4-BUG-FIX
         34968: ALF-13453: Reversed XSLTProcessor and XSLTRenderingEngine changes for now as they break http://wiki.alfresco.com/wiki/WCM_Forms_Rendering and model handling via bsf extensions. A more sophisticated approach is required. See bug for more info.
      34982: ALF-13554: Merged V4.0 to V3.4-BUG-FIX
         34972: ALF-13340: Upgrade postgres JDBC driver to tested/supported version!
      34999: ALF-13552: Merged V4.0 to V3.4-BUG-FIX
         34997: ALF-13453, ALF-13565: Fully reverted revision 34932 as it prevents startup on Weblogic
      35000: Translation updates for DE, ES, IT. Based on EN r34846.
      35015: ALF-13451: Merged V4.0-BUG-FIX to V3.4-BUG-FIX
         33864: ALF-10736: JSF - Adding mimetype does not work on 3.4.x
      35020: ALF-13451: Merged V4.0-BUG-FIX to V3.4-BUG-FIX
         33863: ConfigSource for XMLConfigService which uses a ResourceFinder for wildcard-compatible lookups (UrlConfigSource does not support them)
      35029: JAPANESE: Translation updates based on EN r34846
   35212: ALF-13409: Deleting a person can now cancel their invitations. Cancelling invitations can delete inactive persons! So prevent infinite looping with a transaction local resource
   - Also fix up other invite related unit tests
   35217: Merged DEV to V4.0-BUG-FIX
      35214: ALF-12745 : AD-LDAP: alfresco hangs when upload user csv file
         Disable 'Upload User CSV File' button in Share admin console in case of AD-LDAP
   35221: Avoid a NPE if Repository.getPerson() is called when no RunAsUser is active, instead return Null as for users with no defined NodeRef


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@35229 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2012-04-13 14:21:53 +00:00
Derek Hulley
84cfba1371 GUID-based directory names 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34689 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2012-03-22 11:15:43 +00:00
Dave Ward
8521b7d7bd Merged V4.0-BUG-FIX to HEAD 
34060: Merged V4.0 (4.0) to 4.0-BUG-FIX (4.0.1) <<< NOTE ALF-12939 still needs to be done to complete this merge to 4.0.1 >>>
      33056: Fix for ALF-12280: Upgrading from version 3.4.7 to 4.0.0 failed with MS SQL database
       - Added dialect-specific script for SQL Server
      33059: Fix for ALF-12127, ALF-11161, ALF-11988
         Merged BRANCHES/DEV/THOR1 to BRANCHES/V4.0
            33049: Fixed follow issues on THOR-839 & THOR-826
                   - Following webscripts now sets "Content-Type" response header to application/json
                   - which makes people search display follow buttons for people correctly
      Fix for ALF-12077
         Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V4.0
            32999: Fix for ALF-12050 - IE specific handling of Ajax requests does not correctly respect no-cache setting, need to set Expires header also
      33060: Fix for ALF-12208 - group name encoding
      33072: Merge from HEAD to V4.0
         33071: ALF-11843 CLONE - Enterprise unlimited licenses still get invalidated turning the system into read-only mode
            - Fixed build failure in HeartBeat. It had relied on the fact that the previous LicenseComponent kept calling onLicenseChange every time
              the license was checked. It needed the check 1 minute after the initial bootstrap call as there was a memory model sync issue in the
              HeartBeat constructor to do with setting the URL it needed to call.
      33073: Fix for ALF-12295 - CLONE - Upload issue ? - Failed to get content ... (No such file or directory) ... x22
      33083: Merge from HEAD to V4.0
         33082: ALF-11843 CLONE - Enterprise unlimited licenses still get invalidated turning the system into read-only mode
            - Did not refresh Tortoise window, this file was missed in the last commit
         33080: ALF-11843 CLONE - Enterprise unlimited licenses still get invalidated turning the system into read-only mode
               - On reflection decided to call onLicenseChange every time the license is checked.
                 A change of valid license would not have resulted in a call to onLicenseChange
                 Also have been able to make failure and success code more symmetrical.
               - The previous commit also added a RetryingTransaction around the sendData() call to
                 currentRepoDescriptorDAO.getLicenseKey() which I found while making the HeartBeat
                 changes. As a result we should no longer see the error in 4.0 about there not being a
                 transaction.
      33087: Calendar: Permissions updates, fixes: ALF-12179 & makes the permissions flag boolean.
      33088: FIXED : ALF-11862: An error message appears when you open the "edit task", to request to join the "moderated site"
      Now handles null value
      33102: Fix for ACT #15024-37148 (will update with JIRA no. once available) 
      - 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.
      33105: Bitrock license notice file.
      33114: Merged DEV to V4.0
         33067: Fix ALF-12206: CMIS: Error getting association information referencing archived node
      33122: Fix for ALF-12316 Repo -> SOLR query uses HTTPClient that only supports 2 simultaneous connections
      - configurable via spring (default if unconfigured is 40 connections to one host and 40 max connections)
      33142: ALF-12339: Prevents ArrayOutOfBoundsException that can occur with concurrent access of i18n bundle in WebScript
   34065: Fix for ALF-12708 (part 2)
     - Alfresco opencmis extensions library
   34093: ALF-10902 : CIFS: No friendly notification occurs when Editor or Collaborator tries to delete content
   34120: ALF-12767 : CIFS TextEdit - File has been modified outside TextEdit
   34125: Merged BRANCHES\V4.0 to BRANCHES\DEV\V4.0-BUG-FIX
       34094: Fix for ALF-12944 OpenCMIS - CMIS-QL - Range queries for date and datetime properties fail
       34095: Fix for ALF-12944 OpenCMIS - CMIS-QL - Range queries for date and datetime properties fail
              - caught incorrect exception - so much for reading the Java Doc :-)
              - build fix
   34138: ALF-564 : Is network-protocol-context.xml still useful ?
   34149: Removes more server side rendered dates:
   Fixes: ALF-12965, ALF-12984, ALF-12988.
   34158: Fix for ALF-12741 - Steck specific : error on managing groups
   34176: Merged BRANCHES\V4.0 to BRANCHES\DEV\V4.0-BUG-FIX
       34155: Fix for ALF-12979 CLONE - Search - searching in site without any images for *.jpg brings back all the documents
              - note this relies on wildcard/prefix/term/phrase all going through the phrase implementation for wildcard from ALF-12162
   34193: Fix for ALF-12205
   34196: Fix for ALF-12758
   34201: ALF-12892: Ensure that document permissions are refreshed in the dialog after being changed
   34214: Switched off the CIFS Kerberos ticket cracking code by default, added a config value to enable it, latest JVMs do not require this. Part of ALF-12294.
   CIFS Kerberos authentication now works with the IBM JDK. 
   34215: Switched off the CIFS Kerberos ticket cracking code by default, added a property to enable it, latest JVMs do not require this. Part of ALF-12294.
   CIFS Kerberos authentication now works with the IBM JDK (and OpenJDK, Oracle/Sun JVMs) 
   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)
   34226: ALF-12780:	Mac OS X Lion 10.7.2: Editing a document via CIFS and TextEdit removes versionable aspect from this file
   34228: ALF-12689: Fixed character encoding issue with dynamic welcome dashlet
   34237: ALF-12740: Updated XHR requests to include a noCache request parameter to address IE issue where 304 reponse is assumed for XHR request
   34240: ALF-12835: Second click in status box no longer clears status
   34241: ALF-11991: Updated DocLib to support categories
   34245: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/V4.0-BUG-FIX:
      33420: THOR-1000: Solr tracking: NodeContentGet should not create (empty) temp file if there is no transformer (eg. for image node)
   34246: Reverse merge of BRANCHES/DEV/V4.0-BUG-FIX -c 34245
   Due to an 'svn commit' command argument ordering error, I checked in the solrcore.properties files. This reverse merge removes those changes.
   34247: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/V4.0-BUG-FIX:
      33420: THOR-1000: Solr tracking: NodeContentGet should not create (empty) temp file if there is no transformer (eg. for image node)
   34249: ALF-12782 : IMAP - No friendly notification occurs when a user without delete permissions tries to delete content
   34254: Fix for ALF-13090 SOLR - cross tokenisation field matches too much for "*u*a"
   34262: Fixes: ALF-11557: Publishing Balloon popups appearing in wrong locations. Now appears in correct location in Doc Lib & replaced with standard popup message on Channel Admin page.
   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
   - includes merge & extension of "testConcurrentLinkToDeletedNode" (from DEV/DEREK/ALF-12358)
   34298: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
      34068: Fix for ALF-342 - Entering a search containing a double quote displays pop-up 500 error in OpenSearch JSF component
      34069: Fix for ALF-342 - Completed fix with additional encoded of output HTML
      34070: Fix for ALF-12553 - Users are unable to see more than 100 sites under 'My Sites' page. List length now configurable.
      34080: Fix for ALF-10306 - Share Advanced search issue with the Date Range form values
      34107: Added missing jar lib to wcmquickstart and webeditor dependencies
      34114: Fix for ALF-10284 - User should be informed when user provides invalid credentials while opening document using link
      34151: Merged V3.4 (3.4.8) to V3.4-BUG-FIX (3.4.9)
         34121: Merged BELARUS/V3.4-BUG-FIX-2012_01_26 to V3.4 (3.4.8)
            Should have been done in 3.4.7 in ALF-12174 but was not found by Eclipse search
            34100: ALF-12948 : Copyright year on "About Alfresco" page is out of date   
            Updated copyright year to 2012.
         34150: ALF-10976 (relates to ALF-10412)
            - Thumbnail mimetype check should have been >= 0 not > 0.   
      34171: ALF-13016 : TestModel class exits with a return code of 0 even if model fails validation.
      34190: A modifiable map that protects and underlying map from modification
       - When cloning the backing map (in the event of an potentially-modifying operation) keys and values
         are specifically checked for mutability to prevent excessive cloning.
       - Working towards fix for ALF-12855   
      34191: Fix ALF-12855: Improvement for Lucene in memory sorting and improvement for nodeService.getProperty()
       - Use ValueProtectingMap when passing values out of the NodeDAO
       - Solves the problem of map cloning when used internally as well as when calling NodeService.getProperty()
       - If client code retrieves immutable values from the properties, then they will not be cloned
       - TODO: Special handling of entrySet() and keySet() methods (see ALF-12868) to prevent interceptors from
               triggering map cloning
      34230: Fixes: ALF-12520. Adds i18n strings for siteModel
      34253: Fix for ALF-13102 - JBoss: Unathorized responce recieved on a wcs/touch request with clustered alfrescos (ntlm sso enabled).
      34272: ALF-13136 Merged V3.4.7 (3.4.7.5) to V3.4-BUG-FIX (3.4.9)
         34267: ALF-12419 "Garbage collector error" LockAcquisition on the OrphanReaper process
            - Modified OrphanReaper to use newer JobLockRefreshCallback.
              Refresh lock every minute and timeout if it takes longer than an hour.
      34281: ALF-13145: Merged PATCHES/V3.4.7 to V3.4-BUG-FIX
         34273: ALF-13112: Groups are not displayed when 60k sites and 60 groups in the system
            - Timeout adjustment approved by Kev and Erik
      34291: Merged V3.4 to V3.4-BUG-FIX
         34197: ALF-12900 Error occurs in My Documents dashlet
            NodeRef (ScriptNode) passed to the doclist.get.js doesn't have any content. Not sure why yet.
            Investigation continues, so there may be more changes to stop such nodes being passed in the first place.   
            NPE is as a result of having a nodeRef without content. It falls over on new code in 3.4.8 for ALF-10976 and ALF-10412.
            Not too sure what would have happened in 3.4.7, but expect there world have been another exception in the transformer code.   
            - Addition of defensive code around contentData being null and the reader given to the transformer being null.
         34198: ALF-12900 Error occurs in My Documents dashlet
            - File missing from last commit
         34242: ALF-13078 Copyright notice shows Alfresco Software, Inc. © 2005-2011 All rights reserved.... should now be to 2012
            - Should have been done in 3.4.7 in ALF-12174 but was not found by Eclipse search
         34265: Updated installer splash screen for 2012 (thanks Linton!)
         34282: ALF-13059: Windows 7 specific: It's impossible to add documents to DWS
         - Fix by Alex Malinovsky
         34286: ALF-12949: Merged V4.0 to V3.4
            34248: ALF-13102: NTLM on JBoss - Fix problem with Share SSO Authentication Filter corrupting cookie headers
      34292: Merged V3.4 to V3.4-BUG-FIX (RECORD ONLY)
         34284: ALF-12949: Merged V3.4-BUG-FIX to V3.4
            34253: Fix for ALF-13102 - Surf mixing up cookies for different sessions
   34299: Merged V4.0 to V4.0-BUG-FIX
      34067: ALF-12423: Prevent script error on IE9
      34102: SPANISH: Fixes minor encoding error
      34115: Merged BRANCHES/DEV/BELARUS/V4.0-BUG-FIX-2012_01_20 to BRANCHES/V4.0:
         34099: ALF-12710: Stack specific: It's impossible to log into CMIS Workbench through WebServices binding
      34156: Missed from commit for r34154
      34189: Fix for ALF-12822 - Script error when Add translation
      34216: Fixes: ALF-11938 - A distinction needed making between the i18n labels for company address and personal address - I extended this to other company specific fields too.
      34238: ALF-12864: Removed trailing spaces from installed jodconverter defaults
      - Stopped forms from recognising booleans
      34243: NFS, switch from read-only to writeable file if write access required and cached file was opened read-only. ALF-12193.
      Fix I/O error saving from OpenOffice on Linux.
      34263: Merged HEAD to V4.0
         34250: Fixed THOR-1137 "Make Spring Surf enable-auto-deploy-modules by default"
      34264: ALF-12975: alfresco-enterprise-4.0.1-installer-win-x64.exe / x32 installers fail
      - Due to not detecting new stderr file
      34278: ALF-12763: Re-applied change from ALF-7528 after it was lost in r28224 / ALF-5900
         - PutMethod was modified to use only guessed mime type for documents and completely ignore the Content-Type header from client.
   34303: Merged V4.0 to V4.0-BUG-FIX (RECORD ONLY)
      33110: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/V4.0:
         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
      33320: Merged BRANCHES\DEV\V4.0-BUG-FIX to BRANCHESV4.0
          33305: ALF-12463 Error querying database was detected during upgrade process from 3.1 to 4.0.0.
      33326: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V4.0
          33277    ALF-12468 CLONE - Regression. Searches cause database server to thrash CPU - ALF-12426
      33331: Merged BRANCHES\DEV\V3.4-BUG-FIX to BRANCHES\V4.0
          33301: ALF-12464: Merged PATCHES/V3.4.5 to V3.4-BUG-FIX
              33299: ALF-12281: Memory leak in ReferenceCountingReadOnlyIndexReaderFactory
          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()
      33398: Merged V4.0-BUG-FIX to V4.0
         33116: ALF-12517: Allow multiple deferred requests per oplock break, next level of fix for ALF-11935.
         33147: FTP implemented set modification date/time command (MFMT). ALF-12105.
         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.
         33183: Minor fix to exception string in extendBuffer().
      34061: Merged V4.0-BUG-FIX to V4.0 (Start of 4.0.1)
      34062: Merge V4.0-BUG-FIX to V4.0 RECORD ONLY (changes that came from V4.0)
      34109: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/V4.0
         34108: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX
            Added missing jar lib to wcmquickstart and webeditor dependencies
      34154: Merged BRANCHES/DEV/V4.0-BUG-FIX/ to BRANCHES/V4.0:
         34149: Removes more server side rendered dates: Fixes: ALF-12965, ALF-12984, ALF-12988.
      34274: Merged V4.0-BUG-FIX to V4.0
         34237: ALF-12740: Updated XHR requests to include a noCache request parameter to address IE issue where 304 reponse is assumed for XHR request
      34288: Merged V3.4 to V4.0
         34197: ALF-12900 Error occurs in My Documents dashlet
            NodeRef (ScriptNode) passed to the doclist.get.js doesn't have any content. Not sure why yet.
            Investigation continues, so there may be more changes to stop such nodes being passed in the first place.   
            NPE is as a result of having a nodeRef without content. It falls over on new code in 3.4.8 for ALF-10976 and ALF-10412.
            Not too sure what would have happened in 3.4.7, but expect there world have been another exception in the transformer code.
            - Addition of defensive code around contentData being null and the reader given to the transformer being null.
         34198: ALF-12900 Error occurs in My Documents dashlet
            - File missing from last commit
         34242: ALF-13078 Copyright notice shows Alfresco Software, Inc. © 2005-2011 All rights reserved.... should now be to 2012
            - Should have been done in 3.4.7 in ALF-12174 but was not found by Eclipse search
         34265: Updated installer splash screen for 2012 (thanks Linton!)
         34284: ALF-12949: Merged V3.4-BUG-FIX to V3.4
            34253: Fix for ALF-13102 - Surf mixing up cookies for different sessions   
         34286: ALF-12949: Merged V4.0 to V3.4
            34248: ALF-13102: NTLM on JBoss - Fix problem with Share SSO Authentication Filter corrupting cookie headers


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34305 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2012-03-01 11:41:07 +00:00
Dave Ward
811519ae48 Merged V4.0-BUG-FIX to HEAD 
33116: Allow multiple deferred requests per oplock break, next level of fix for ALF-11935.
   33136: Fix for ALF-12200: "Content type is not recognized on creating document from source"
   33137: Activities feed generator: change info log messages to debug log messages
   33139: ALF-12262	View in Source Repository works incorrect if the folder was created on target side at first
   33141: Fix for ALF-12178 "Bulk import - status page shows broken link (Initiate another in-place import)"
   33144: Fixes ALF-11119: The 2 tranformations didn't work - Segmentation fault in ffmpeg - it looks like a bug with ffmpeg and it was decided that compile/bug fixing ffmpeg is not a priority at the moment.  The 2 entries have been commented out.  If they are required, the user should consult the ffmpeg documentation for the correct version & o/s at the time.
   33146: ALF-11345 Patch from Pavel Yurkevich to fix another VTI/SPP problem with site names that start with Alfresco
   33147: FTP implemented set modification date/time command (MFMT). ALF-12105.
   33148: ALF-12063 Pull some of the VTI list type definitions out to a common base class
   33150: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX:
      33076: ALF-12285: Allow dumping of schema to XML via JMX
   33151: Fix problems with FTP and UTF-8. JLAN-81.
   When using the Java6 Normalizer use the NFC form.
   33158: Fix NFS server swallows exceptions. ALF-11667.
   Startup exception details are now saved.
   33160: Improve the Vti/SPP exception message for the case of the Vti port being already in use
   33161: ALF-12063 Additional SPP/Vti list info required for Mac Office 2011 support
   33162: Fixes: ALF-10322: Edit Dialogue gets out of sync if event moved using FullCalendar (extends FullCalendar to provide a callback after an event changes, which enables us to keep our event object up to date).
   33163: Fixes: ALF-10248: Grey Placeholder image for unauthorised channels has now been replaced with yellow one.
   33164: Fixes: ALF-11562; Refactors My Calendar dashlet to use timezone aware ISO8601 dates from updated Calendar API & removes obsolete properties from userevents calendar API
   33165: Fixes: ALF-10645; i18n label doesn't appear in property bundle.
   33167: Fix for ALF-11970
   33168: Fix for ALF-10565 "Category manager in admin console needs query not search"
     - i18n'd the strings
   33178: Publishing: Fixes: ALF-11552; Inline edit icon alignment issue fixed
   33183: Minor fix to exception string in extendBuffer().
   33194: ALF-10545: NodeServicePolicies#onUpdateNodePolicy not adequate for NodeService#setType
      * Added beforeSetNodeType and onSetNodeType policies
      * Both callbacks have old and new types as parameters
   33204: Fixes: ALF-11230, publishing tracking link opens in repository, not Doc Lib. Also fixes a couple of other minor bugs:
      - balloon pop up didn't appear when published from Doc Details page
      - tracking link appears black (on black) when hovered over.
      - adds defensive code to prevent an error if the expected element for the notification balloon isn't there.
   33212: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX:
      33211: ALF-12384: Failed schema dump can cause failure of repository start up
   33217: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
      31840: Fix for ALF-10282 - Web Browser freezes with large xml files Web form transformation
      31987: Proper fix for ALF-11489: 'patch.sitesSpacePermissions' failed on upgrade 2.2.8 -> 3.4.6
         - Just handle missing defined ACLs   
      32341: Fix for ALF-9883 - WCM Forms: Changing 'abstract' type carries previously-added elements
      32911: Add a (currently disabled) unit test for ALF-10466 - The HTML to Text transformer (not Tika based) should take account of the content encoding
      32912: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2011_10_13 to BRANCHES/DEV/V3.4-BUG-FIX with changes + unit testing:
         31742: ALF-10466 - The HTML to Text converter needs to take account of the Encoding set on the Content Property, to be able to correctly index MBCS text in wiki pages (and others)   
      32946: ALF-12161: Merged PATCHES/V3.4.5 to V3.4-BUG-FIX
         32921: Merged DEV/TEMPORARY to PATCHES/V3.4.5
            32913: ALF-11440: Content Manager unable to edit content from another user sandbox
               In order to allow a Content Manager to edit a locked document in other user's sandbox, it is needed to modify the AVMLockingAwareService.grabLock().
               The 'lockState' variable could be set to 'LOCK_OWNER', if a user is ContentManager to bypass the check.   
      32964: Fixes ALF-11054: Sharepoint - Wrong sorting by date
        - incorporated patch from investigation team
      32967: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2011_10_13 to BRANCHES/DEV/V3.4-BUG-FIX:
         31828: Fixes ALF-10720: Webform performance improvement
               Minimize database usage by adding new variable to FormWrapper that holds a form's name.   
      32969: Fixes ALF-10471: Cannot correctly remove users from email notification rule list
      32980: Merged DEV/TEMPORARY to V3.4-BUG-FIX
         32961: ALF-12132: Set "common-placeholder-configurer" as parent for "lotusWSPlaceholderConfigurer" bean.    
      32996: ALF-12184: SchemaBootstrap must use same assumptions as PatchServiceImpl when deciding whether an alternative patch succeeded
      - Fixes regression introduced by r31972 / ALF-11489
      33068: Added suggested fix to commit any current transactions in the NFS file expiry thread. ALF-11827.
      33077: ALF-10142: Allow TinyMCE to accept <meta> element when editing HTML files inline in Share.
      33094: Fix for ACT #15024-37148 (no JIRA yet)
       - issue where in a load balanced Share environment (multiple web-tiers behind a reverse proxy) the modification to the template layout selection for a site or user dashboard would not be reflected in all servers.
      33118: ALF-12278: Prevent the copying over of headers specific to a POST request on to the touch GET request   
      33138: Upgraded SpringSurf to 1.0.0 rev 968
      33140: Added missing json-simple jar to 3rd party eclipse classpath, which bizarrely is used to generate the JUnit cmd line unit test classpath, no really.
      33145: Fix for native FTP timestamps returned in GMT timezone format. ALF-11986.
      33175: ALF-12366: Cope with read committed DB behaviour in AbstractReindexComponent.reindexTransaction()
      33179: ALF-12344 CLONE - Copyright notice shows Alfresco Software, Inc. © 2005-2011 All rights reserved.... should now be to 2012 as that is when we will release 3.4.7
          - Being done in 3.4.8 not 3.4.7
      33190: Latest SpringSurf libs:
       - much improved handling of multiple connections and connection reuse in RemoteClient
       - improves connection reuse generally, but also much more stable under load balancing condition with multiple Share web-tiers behind a reverse proxy
      33193: ALF-12344 CLONE - Copyright notice shows Alfresco Software, Inc. © 2005-2011 All rights reserved.... should now be to 2012 as that is when we will release 3.4.7
          - Found a few more having followed previous date changes and searches
      33203: Fix for HttpClient issue: Error status 500 Unbuffered entity enclosing request can not be repeated.
      33206: Fix to FormUIGet - no need to manually patch up the JSON request since rev 33138 (SpringSurf 1.0.0)
   33218: Fix for ALF-11868 "CMIS: removeAcl() function doesn't work via atompub."
   33220: Merged PATCHES/V3.4.6 to V4.0-BUG-FIX
      32405: Merged V3.4.6 (3.4.6.1) to V3.4.1 (3.4.1.24)
         32404: ALF-11727 CLONE - Pending Invite Search doesn't return anything if there's more than 1000 pending invites across all sites.
            Removed read only transaction from invites.get.desc.xml as it broke InviteServiceTest testRejectInvite
         32397: ALF-11727 CLONE - Pending Invite Search doesn't return anything if there's more than 1000 pending invites across all sites.
            Return first 200 invitations (similar to 4.0 paging)
            Transaction used by the invites.get is now read only so does not force a flush of caches.   
      32503: Merged PATCHES/V3.4.6 to PATCHES/V3.4.1
         32501: ALF-11727: Reinstated read-only transaction around invites.get and prevented it from trying to lazily create persons from rejected invites that had previously been deleted by InviteHelper.cleanUpStaleInviteeResources!   
      32650: ALF-11872: When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
         Put back in cut off at 200 invites (removed in last merge) for UI, unless we know that we need all of them internally
      32775: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
         Even more changes:
         - reduce number of queries required to list pending invites to a site (uses moderated and nominated caches and only looks up IDs if possible)
         - change hibernate cache and flush modes (to avoid cache and the related slow flush), for queries and cancel of workflows
         - modified js which was making a query for each person in order to work out if they were already in a pending invites list
      32838: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
      - JBPMEngine now supports batch cancelWorkflows() method for canceling multiple workflows at the same time (e.g. on deleting a site)
      - Manual flushes only used at two points in the batch to minimize dirty checking overhead and yet avoid FK errors
      - Performance implications still to be checked but at least functionally correct
      - Corrected JPDL source jar
      32857: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
         - Search for Pending invites was slow on sites with > 0 pending invites (it was getting invites for all sites) 
      32861: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
      - JBPMEngine uses an abstract list to 'lazily' convert hibernate objects on demand and avoid batch loading too many objects
      32868: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
      - Rationalization of batch fetching at hibernate layer
      32881: ALF-11872: The saga goes on! Corrected empty list handling in InvitationServiceImpl.searchInvitation().
      32927: ALF-11872: Fix parameter validation in InvitationServiceImpl.getInvitationTasks()
      32936: ALF-11872: A site with 1200 pending invites can now be deleted without the UI timing out
      - Pending invitation workflows are cancelled in an asynchronous action
      - The asynchronous action completes about 3 minutes later, due to the massive number of individual delete statements being run by Hibernate
      - Creating the rows in the first place took 20 minutes!   
      32956: ALF-11872: Corrected filtering in InvitationServiceImpl.getInvitationTasks() to only include start tasks
      - plus recautionary sleep() in InviteServiceTest.tearDown() to ensure asynchronous invite deletions complete
      33169: ALF-12312 'org.hibernate.LazyInitializationException: could not initialize proxy - no Session' when clicking on a Pending Invite workflow task in JSF
         - Follow on from ALF-11872: Only use lazyloaded WorkflowTasks from JBPMEngine.getWorkflowTasks() when we are using the same session (currently
           only done from InvitationService). The fallback is to assume it is not the same session and return a normal list of Workflows.
   33221: Merged V3.4-BUG-FIX to V4.0-BUG-FIX (RECORD ONLY)
      30463: L10N Updates from Gloria (based on r30332): Fixes ALF-8211 and new string updates
      30473: Merged HEAD to V3.4-BUG-FIX
         30468: Fixed ALF-10280: Slow to report ® Duplicate entry ¯ in database.
                - DuplicateChildNodeNameException implements DoNotRetryException   
      30685: Merged HEAD to V3.4-BUG-FIX
         30679: Unit test for ALF-1017 - Non site content in the Sites Space
         30683: ALF-1017 Remove EVERYONE Contributor permissions from /Company Home/Sites/, to avoid misc nodes being created in there by mistake by users, and update the SiteService to runAsSystem when creating the Site node   
      30693: Merged HEAD to V3.4-BUG-FIX
         30692: Fix ALF-1017 specific test following ALF-1017 changes to permissions   
      30808: Fixes: ALF-10485 (minor text update)
      30873: Latest L10N update from Gloria (based on r30698):
         - Adds Web Quick Start translations (back port from 4.0)
         - Adds/updates new or previously missing strings
      31019: Merged HEAD to V3.4-BUG-FIX
         28974: added double-checks for associations when a potential failure is detected
         31018: Fixed ALF-9591: Integrity check: Association source multiplicity checking is incorrect
                - Drop checks for source multiplicity when no associations are pointing to a type/aspect instance   
      31045: Merged HEAD to V3.4-BUG-FIX
         31044: Performance improvements for PATH queries relating to Share dashboard dashlets and document library.
                - tweaks to generation of PATH queries - hugely improves performance when dealing with 1000's site memberships
      31160: Merged HEAD to V3.4-BUG-FIX
         31156: Various Share search related fixes as spotted by Andy:
                - increased resultset size that is used to retrieve raw results from query before Share specific results are filtered - this means sensible results are now shown from large repository wide and sorted queries, previously results would be "missing" if they dropped out of the resultset prefiltering
                - fix to Share Search component to correctly display if more than N results were found in the repository
                - fix to add default TYPE clause to generated Share search if no other TYPE is specified - this reduces masses of potentially matches results from repository wide searches that would otherwise need to be post-filtered
      31345: Merged HEAD to BRANCHES/DEV/V3.4-BUG-FIX:
         31330: Fixed WCM bulkImport's importDirectory
      31442: Merged HEAD to V3.4-BUG-FIX
         31441: Fixed ALF-11014: Content output stream close errors are absorbed silently
                - Found while testing XAMcontentStore
                - Pulled stream copy code into AbstractContentWriter
                - OutputStream closure (write-side) exception is rethrown to allow full rollback, etc   
      31444: Merged HEAD to BRANCHES/DEV/V3.4-BUG-FIX:
         31383: MLPropertyInterceptor performance improvements:
      31758: Merged V3.3 to V3.4-BUG-FIX
         31757: ALF-11279: Fixed RetryingTransactionInterceptor so that it actually behaves like an interceptor and doesn't throw away the rest of the interceptor chain!   
      31798: Merged V3.3 to V3.4-BUG-FIX
         31773: ALF-11279: Further RetryingTransactionInterceptor fixes - must do mark for rollback on propagating transactions   
      32051: ALF-7195: Merge HEAD (4.0) to V3.4-BUG-FIX (3.4.7)
         Merge was simply to take HEAD version to pick up changes made by Derek to DisableAuditableBehaviourInterceptor
         32047: ALF-8882 Edit Online: Modifier and Modified date are changed even no changes were applied
            - needed to turn off ASPECT_AUDITABLE on removeProperty which is called on unlock
            - added code to not enable this aspect early if nested calls were made (this is not done, but is safer this way)
      32088: Merging HEAD to 3.4-BUG-FIX:
      r32063: ALF-10947 Fixed issue where repeating JBPM timer was causing an infinite loop if an exception was thrown within the timer event.
      32475: ALF-11727 Improved performance of pending invites search.
      32512: Incremented version revision for 3.4.8
      32917: ALF-12133: Merged HEAD to V3.4-BUG-FIX
         32906: ALF-12068 - Zimbra desktop - corrected InternalDateAsString.   
      32923: ALF-12133: Merged HEAD to V3.4-BUG-FIX
         32918: ALF-12133 - Attempt 2 to get Imap internal date correct.   
      33021: ALF-9878: Merge V3.4.1 (3.4.1.25) to V3.4-BUG-FIX (3.4.8)
         32956: ALF-11872: Corrected filtering in InvitationServiceImpl.getInvitationTasks() to only include start tasks
         - plus recautionary sleep() in InviteServiceTest.tearDown() to ensure asynchronous invite deletions complete
         32936: ALF-11872: A site with 1200 pending invites can now be deleted without the UI timing out
         - Pending invitation workflows are cancelled in an asynchronous action
         - The asynchronous action completes about 3 minutes later, due to the massive number of individual delete statements being run by Hibernate
         - Creating the rows in the first place took 20 minutes!
         32927: ALF-11872: Fix parameter validation in InvitationServiceImpl.getInvitationTasks()
         32881: ALF-11872: The saga goes on! Corrected empty list handling in InvitationServiceImpl.searchInvitation().
         32868: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
         - Rationalization of batch fetching at hibernate layer
         32861: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
         - JBPMEngine uses an abstract list to 'lazily' convert hibernate objects on demand and avoid batch loading too many objects
         32857: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
            - Search for Pending invites was slow on sites with > 0 pending invites (it was getting invites for all sites) 
         32838: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
         - JBPMEngine now supports batch cancelWorkflows() method for canceling multiple workflows at the same time (e.g. on deleting a site)
         - Manual flushes only used at two points in the batch to minimize dirty checking overhead and yet avoid FK errors
         - Performance implications still to be checked but at least functionally correct
         - Corrected JPDL source jar
         32775: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
            Even more changes:
            - reduce number of queries required to list pending invites to a site (uses moderated and nominated caches and only looks up IDs if possible)
            - change hibernate cache and flush modes (to avoid cache and the related slow flush), for queries and cancel of workflows
            - modified js which was making a query for each person in order to work out if they were already in a pending invites list
         32650: ALF-11872: When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
            Put back in cut off at 200 invites (removed in last merge) for UI, unless we know that we need all of them internally   
      33143: Merged BRANCHES/V3.4-TEAM to BRANCHES/DEV/V3.4-BUG-FIX
         25103: ALF-6613 - SpringSurf improvements to allow easier refactoring of Document Details page
                - removed manual request level caching of remote calls responses in web-tier components - now completely automatic
         25138: Flattening of user preferences remote calls - ensures /preferences hits the RequestCachingConnector - reduces no. of remote calls by 3 for the doclib and by 4 for a site dashboard.
      33216: Merged PATCHES/V3.4.1 to V3.4-BUG-FIX (3.4.8)
         32405: Merged V3.4.6 (3.4.6.1) to V3.4.1 (3.4.1.24)
            32404: ALF-9878 / ALF-11727 CLONE - Pending Invite Search doesn't return anything if there's more than 1000 pending invites across all sites.
               Removed read only transaction from invites.get.desc.xml as it broke InviteServiceTest testRejectInvite
            32397: ALF-9878 / ALF-11727 CLONE - Pending Invite Search doesn't return anything if there's more than 1000 pending invites across all sites.
               Return first 200 invitations (similar to 4.0 paging)
               Transaction used by the invites.get is now read only so does not force a flush of caches.   
         32503: Merged PATCHES/V3.4.6 to PATCHES/V3.4.1
            32501: ALF-9878 / ALF-11727: Reinstated read-only transaction around invites.get and prevented it from trying to lazily create persons from rejected invites that had previously been deleted by InviteHelper.cleanUpStaleInviteeResources!   
         32641: ALF-12387 / ALF-11872: Merged V3.4-BUG-FIX (3.4.8) to V3.4.1 (3.4.1.25)
               32475: ALF-11727 Improved performance of pending invites search.
         	     (N Smith changes to do with only using ONE search value - faster as multiple are taken as ORs rather than ANDs)
         32650: ALF-12387 / ALF-11872: When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
            Put back in cut off at 200 invites (removed in last merge) for UI, unless we know that we need all of them internally
         32775: ALF-12387 / ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
            Even more changes:
            - reduce number of queries required to list pending invites to a site (uses moderated and nominated caches and only looks up IDs if possible)
            - change hibernate cache and flush modes (to avoid cache and the related slow flush), for queries and cancel of workflows
            - modified js which was making a query for each person in order to work out if they were already in a pending invites list
         32838: ALF-12387 / ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
         - JBPMEngine now supports batch cancelWorkflows() method for canceling multiple workflows at the same time (e.g. on deleting a site)
         - Manual flushes only used at two points in the batch to minimize dirty checking overhead and yet avoid FK errors
         - Performance implications still to be checked but at least functionally correct
         - Corrected JPDL source jar
         32857: ALF-12387 / ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
            - Search for Pending invites was slow on sites with > 0 pending invites (it was getting invites for all sites) 
         32861: ALF-12387 / ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
         - JBPMEngine uses an abstract list to 'lazily' convert hibernate objects on demand and avoid batch loading too many objects
         32868: ALF-12387 / ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete
         - Rationalization of batch fetching at hibernate layer
         32881: ALF-12387 / ALF-11872: The saga goes on! Corrected empty list handling in InvitationServiceImpl.searchInvitation().
         32927: ALF-12387 / ALF-11872: Fix parameter validation in InvitationServiceImpl.getInvitationTasks()
         32936: ALF-12387 / ALF-11872: A site with 1200 pending invites can now be deleted without the UI timing out
         - Pending invitation workflows are cancelled in an asynchronous action
         - The asynchronous action completes about 3 minutes later, due to the massive number of individual delete statements being run by Hibernate
         - Creating the rows in the first place took 20 minutes!   
         32956: ALF-12387 / ALF-11872: Corrected filtering in InvitationServiceImpl.getInvitationTasks() to only include start tasks
         - plus recautionary sleep() in InviteServiceTest.tearDown() to ensure asynchronous invite deletions complete
         33169: ALF-12382 / ALF-12312 'org.hibernate.LazyInitializationException: could not initialize proxy - no Session' when clicking on a Pending Invite workflow task in JSF
            - Follow on from ALF-11872: Only use lazyloaded WorkflowTasks from JBPMEngine.getWorkflowTasks() when we are using the same session (currently
              only done from InvitationService). The fallback is to assume it is not the same session and return a normal list of Workflows.   
   33224: Fix for ALF-12230 "Bootstrap re-encryption failed"
   33225: Fix for ALF-12349 Transformations need to handle failures due to server being busy.
     Change to system behaviour:
       We want to support transient failures of thumbnail creations. Primary example now is the Polymorph Transformation Server which
       can fail transformations because it is under load and wishes to decline transform requests.
       Prior to this check-in, such failures would be interpreted by Alfresco as 'real' failures and the content node would be marked
       as FailedToTransform. The transformers' state data would also be affected by the failure.
       We need to allow transformers to fail and NOT trigger any negative consequences such as above.
     Changes in code:
     New exception type ActionServiceTransientException when thrown from an ActionExecuter will NOT trigger any compensating action that has been configured.
       This allows actions to fail 'normally' or due to some transient condition with the implication that if rerun later the action may succeed.
     Additional end-state for Actions in the ActionTrackingService: ActionStatus.Declined. The ActionExecuter has declined to execute the action at this time.
     New exception type ContentServiceTransientException which means that a content operation (currently only a transformation) has failed due to a transient condition.
       CreateThumbnailActionExecuter catches this exception type and throws the ActionServiceTransientException.
     Tests at the ActionServiceImpl, ActionTrackingServiceImpl and ThumbnailServiceImpl APIs & various test config & other changes.   
   33231: ALF-10581 - MySQLIntegrityConstraintViolationException: Cannot add or update a child row: a foreign key constraint fails ... fk_alf_cass_cnode
   - unexpected non-null child node id when creating a new node (see also THOR-906)
   - for now genericise ALF-10153 (to include at least MySQL in addition to MS SQL Server)
   33237: Fixing JUnit jar's src attachment.
   33238: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX:
      33222: ALF-12351: Separate schema descriptor files for table prefixes: alf_, avm_, JBPM_, act_
      33235: ALF-12351: Separate schema descriptor files for table prefixes: alf_, avm_, JBPM_, act_
   33239: partial fix for: ALF-10446 - Upgraded FullCalendar to support ISO8601 Zulu timezone & told it not to ignore the timezone information.
   33240: Implementation of improvement ALF-12404.
     This fix has been OK'd by Andy Hind.
   33246: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX:
      33244: ALF-12352: Add JMX support to trigger a schema check manually
   33252: Merged V3.4-BUG-FIX to V4.0-BUG-FIX (RECORD ONLY)
      33245: ALF-12366: Delete a node by deleting its row and inserting a new one with the deleted flag set
         - Forces a new ID to be generated for the deleted node
         - Makes it impossible to simultaneously delete a node and add new children in two concurrent transactions
         - Can't be merged to 4.0 due to SOLR - needs something more clever!
      33250: ALF-12366: Derek code review
   33254: Merge V3.4-BUG-FIX to V4.0 BUG-FIX
     33249 - ALF-12342 Excel 2003 Patterns.
   33256: ALF-12386 Change the simpler projects to use explicit dependencies, rather than blindly importing all of 3rd-party, to make generating downstream Maven POMs easier
   33266: ALF-12163 - mail.parameters.from does not use the from address provided
   33283: ALF-12185 SPP/Vti Mac Office checkin correction for Collaborators (Patch from Pavel Yurkevich)
   33295: Fix to SMTP authentication implementation.
   33296: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX
      33285: Fix for ALF-12336 - Share loses performance if noncachableObjectTypes are defined (page & component)
             - New and improved mechanism for dealing with cache invalidation in Share load balancing and clustering based on the Hazelcast messaging system
             - See http://www.hazelcast.com/docs.jsp - and specifically http://www.hazelcast.com/docs/1.9.4/manual/single_html/#SpringIntegration
             - Sample per node cluster config provided in custom-slingshot-application-context.xml.sample
             - Tested with an Alfresco cluster plus a Share cluster both balanced via Apache server instances
             - Significantly improved Share stability with latest SpringSurf libs and individual node performance back up to non-clustered node speed
   Modified Alfresco JLan build to use newer hazelcast JAR and also modified existing build file references to use new jar location.
   33297: Merge V3.4-BUG-FIX (3.4.8) to V4.0-BUG-FIX (4.0.1) (RECORD ONLY)
      33292: ALF-12457: Merge V3.4.4 (3.4.4.8) to V3.4-BUG-FIX (3.4.8)
         33287: ALF-12400: Merged DEV/BELARUS/V3.4-BUG-FIX-2012_01_10 to V3.4.4 (3.4.4.8)
            33284: ALF-12400 CLONE - Security risk in Web View dashlet
            The check for user role was added to Web View and Site Links dashlets to disallow to configure Web View for Consumer, Contributor, and Collaborator roles and disallow to add Site Links for Consumer role.
      33286: ALF-9514 I18N: Model constraint values need localized display names
         - Applied diff file attached to JIRA issue (with a minor compiler error correction).
           It appeared to be a merge of: DEV/SWIFT r27643, r27645, r27692, r27846 and HEAD r28405, r29364
   33298: ALF-12461 If the OOXML file contains a thumbnail image, use this for the document thumbnail, plus improve the iWorks analoguous transformer
   33305: Fix for ALF-12463 Error querying database was detected during upgrade process from 3.1 to 4.0.0.
   33306: Experiment - adding an sdk-extras target for the enterprise specific bits of the SDK.
   33308: Merged V3.4-BUG-FIX (3.4.8) to V4.0-BUG-FIX (4.0.1)
      33242: ALF-5830 show_audit.ftl template doesn't work anymore
         - ISO9075 encode the node path
      33271: ALF-9659 In auditing, nodeNameValue extractor never works on a deletion event.
         - As pre call audit is not discarded on transaction rollback, we need to be able to have access to pre call values in the post call audit application.
           One such value is the nodeName for the post call of NodeService.deleteNode()
      33274: Merged DEV to V3.4-BUG-FIX
         33273: ALF-12314: Failed to create content due to error: lockOwner is a mandatory parameter
            It is necessary to pass the correct 'lockOwner' of a rendition, for example, to use 'rr.getLockOwner()' instead of 'lockOwner'
      33277: ALF-12436: Merged PATCHES/V3.4.6 to V3.4-BUG-FIX
         33275: ALF-12426: Correction to joins in select_ContentDataByNodeIds
            - inner join to alf_node_properties first
      33279: ALF-12366: Merged PATCHES/V3.4.6 to V3.4-BUG-FIX
         33278: ALF-12393: Another indexing race condition when MySQL read committed is enabled, this time in the debug diagnostics!
      33282: Merged V3.4 to V3.4-BUG-FIX
         32979: ALF-12114: Reverse merged ALF-10282 and related changes from V3.4-BUG-FIX, which have caused serious regressions
            31840: Fix for ALF-10282 - Web Browser freezes with large xml files Web form transformation
            32341: Fix for ALF-9883 - WCM Forms: Changing 'abstract' type carries previously-added elements   
         32998: (RECORD ONLY) Merged V3.4-BUG-FIX to V3.4
            32996: ALF-12184: SchemaBootstrap must use same assumptions as PatchServiceImpl when deciding whether an alternative patch succeeded
               - Fixes regression introduced by r31972 / ALF-11489
         33084: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2011_12_06 to V3.4 (3.4.7)
            33069: ALF-12266 NPE creating content using the web form
            Locale language can be passed not only as lang_country but as only country code as well.
         33257: ALF-10340: patch.db-V2.2-CleanNodeStatuses must now have patch.db-V2.2-Upgrade-From-2.2SP1 as an alternative to allow upgrade from 2.2.8
         - That's because patch.db-V2.2-Upgrade-From-2.2SP1 exists in 2.2.8 and once run it's too late to run patch.db-V2.2-CleanNodeStatuses
         33260: Set failonany=true on distribute-installers parallel task so that the build actually fails if an installer fails to build
      33301: ALF-12464: Merged PATCHES/V3.4.5 to V3.4-BUG-FIX
         33299: ALF-12281: Memory leak in ReferenceCountingReadOnlyIndexReaderFactory
            - The diagnostic code I added to track memory leaks was actually causing some!
            - For some reason I was recording a new reference when the index reader was dereferenced rather than clearing it
            - Would affect scenarios where the main index is long-lived and there are no writes to it and lots of searches
            - Spotted by Pavel
            - Too much late night coding!
      33303: ALF-12464: Merged PATCHES/V3.4.5 to V3.4-BUG-FIX
         33302: ALF-12281: Correction to previous checkin - deal with the initial reference created by the constructor and cleared by closeIfRequired()
   33315: ALF-11214 - IMAP subsystem is not successfully restarted after incorrect modification of IMAP properties via Admin Console
   33321: Remove /hazelcast lib dir include which is no longer required as libs are now at lib root folder
   33322: ALF-2550 - Enterprise SDK files do not contain enterprise repository project.
   33323: SDK - Added Enterprise third party libs.
   33327: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/V4.0-BUG-FIX:
      33324: Fix for THOR-941. Some MIME types appear as Unknown in metadata form.
   The inconsistencies in the edit mimetype form were slightly different on V4.0.1 so I tidied them up.
   33330: ALF-12487 In Mimetype Detection, if Tika detects a generic type of text/plain or XML, defer to the Alfresco filename based type (as we already do for octet stream)
   33335: Quick build fix - comment out SDK enterprise docs while I work out what's wrong.
   33353: Added more projects to Enterprise Generate Docs.
   33357: When installing a module the tool reads the war's version.properties file and will not install if the war version is outside the repoVersionMin or repoVersionMax
   33361: Merged DEV/GETHIN/FINDBUGS to V4.0-BUG-FIX
      32962: Findbugs fix: Suspicious comparison of Integer references
      32963: Findbugs fix: Call to equals() compares different types
      32968: hashcode should be hashCode
      32970: Findbugs fix: Suspicious comparison of Integer references
      32972: Findbugs fix: Suspicious comparison of Integer or Long references
      32976: Findbugs fix: .remove() incompatible with expected argument type String 
      32977: Findbugs fix:  String is incompatible with expected argument type 
      32978: Findbugs fix: Call to equals() compares different types
      I prefer this fix to the previous one I did
      32982: Findbugs fix: Call to equals() compares different types
      classDefinition.getName().equals instead of classDefinition.equals 
      32983: Findbugs fix:  String is incompatible with expected argument type java.util.Locale
      32984: Findbugs fix: An apparent infinite loop
      32985: Findbugs fix: bad month value of 12 passed to new java.util.GregorianCalendar
      This code passes a constant month value outside the expected range of 0..11 to a method.
      32986: Findbugs fix: authenticationComponent masks field from superclass
      32987: Findbugs fix: Invocation of toString on Array
      Now uses Arrays.toString()
      32988: Findbugs fix: Incorrect lazy initialization of static field
      Now uses static initialization block
      32989: Findbugs fix: Dead code: A null pointer would have been thrown before these lines
      32990: Findbugs fix: possible null pointer dereference
      Just made the code a little clearer
      32991: Findbugs fix: class defines a clone() method but the class doesn't implement Cloneable.
      32992: Findbugs fix: All equals() methods should return false if passed a null value.
      32993: Findbugs fix: Invocation of toString on Array
      Now uses Arrays.toString()
      32994: Findbugs fix: If the multiplication is done using long arithmetic, you can avoid the possibility that the result will overflow.
      33006: Findbugs fix: possible null
      Just made the code a little clearer
      33007: Findbugs fix: Invocation of toString on Array
      Now uses Arrays.toString()
      33008: Findbugs fix:  Call to String.equals(Character)
      Explicitly using String
      33009: Findbugs fix:  int converted to long and passed as absolute time to new java.util.Date(long)
      Now works after the year 2037!
      33014: Findbugs fix: Invocation of toString on Array
      Now uses Arrays.toString()
      33023: Findbugs fix: There is an apparent infinite recursive loop
      No longer
      33025: Findbugs fix: possible null
      Just made the code a little clearer
      33026: Findbugs fix: impossible null check
      Changed && to ||
      33029: Findbugs fix: Minor change to Integer.valueOf
      33126: Findbugs fix: Comparison of String objects using ==
      now used .equals
      33127: Findbugs fix: Unwritten field.  All reads of it will return the default value. 
      Now sets values in the constructor
      33128: Findbugs fix: Removed try/catch
      33129: Findbugs fix: Added an assertTrue to the unit test
      33130: Findbugs fix: Passes null for nonnull parameter
      Mocked the serviceReg and now the tests work!
      33131: Findbugs fix: Call to a collection method contains an argument with an incompatible class from that of the collection's parameter   
      33133: Findbugs fix: Deadly embrace between inner class and thread local - not eligible for garbage collection.
      Made inner class static
      33182: Findbugs fix: possible null
      Now intialises documentPaths correctly
      33184: Findbugs fix: possible null pointer (no more)
      33185: Findbugs fix: Comparison of itself
      Changed variable name to fixedValue
      33186: Findbugs fix: Possible null pointer dereference of nodePair
      Now continues
      33187: Findbugs fix: This code seems to be using non-short-circuit logic
      33188: Findbugs fix: Possible null pointer dereference of entry
      Discussed with Andy. If there's no entry then throw the exception, we can't continue
      33189: Findbugs fix: Call to a collection method contains an argument with an incompatible class from that of the collection's parameter
      It must want to remove the user
      33199: Modified the end of line character
      33209: Changed tabs for spaces
      33210: I removed the "if" because it was never called, however Brian suggested moving it to a place where it would be called!
   33363: Fix for ALF-12374 - Share sample 'share-config-custom.xml' is missing an endpoint 'activiti-admin'
   33364: Merge V3.4-BUG-FIX to V4.0-BUG-FIX
     33362 : ALF-12448 - Missing jars in enterprise SDK
   33376: Merged (RECORD ONLY) V3.4-BUG-FIX (3.4.8) to V4.0-BUG-FIX (4.0.1)
      33375: ALF-12154: Merged HEAD to V3.4-BUG-FIX (3.4.8)
         Requested to RECORD ONLY this change when merging back to HEAD/V4.0-BUG-FIX etc.
         - Removed duplicate 'List constraint display labels' values from bpm-messages*.properties and dictionarydaotest_model.properties.
           May have been introduced by ALF-9514 changes in the same area, which was also RECORD ONLY
         - Manual merge of JSON propertyLabels that exist in HEAD back into 3.4.8
         32724: OPEN : ALF-11176: Untranslated strings in Group Review and Approve Task form
         Activiti has one default transition "Next".  If there is no transition then the model builder was not finding a translation for the task outcome (and just using the english word, e.g. "Approve").  Now it looks up the translation workflowtask.outcome.[wf:outcome property]
         32943: FIXED : ALF-11176: Untranslated stings in Group Review and Approve Task form
         I've changed the way task descriptions are retrieved. You can now enter translations for them.
   33377: ALF-12509: ibooks Format
   Added quick.ibooks file
   33378: ALF-12207	IMAP: Empty file is not opened/downloaded (using IMAP Content Links) if it was uploaded to Share via fileserver
   33379: Add the TIFF mimetype
   33380: Improve the stream to Tika conversion code, following review for THOR-952
   33385: Upgrade to the latest Tika and POI, for recent bug fixes
   33387: ALF-12492 - Email with empty subject sent to Alfresco by SMTP cause Null pointer Exception
   33396: ALF-12497 - Opening and closing (not save) MS Exel 2003 file via CIFS adds new version
   33397: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX:
      33259: ALF-12354: DB2 reference files.
      33261: ALF-12354: MySQL reference files.
      33268: ALF-12354: Oracle reference files
      33310: ALF-12354: Create schema reference files for MySQL, PostgreSQL, Oracle, DB2
      33349: ALF-12354: Create schema reference files for MySQL, PostgreSQL, Oracle, DB2
      33366: ALF-12412: Schema reference files should contain schema version number
      33367: ALF-12412: Schema reference files should contain schema version number
      33373: ALF-12354: Added comment to DB2 file regarding intermittent comparison failures.
      33389: ALF-12516: Produce XML schema definition file (XSD) for schemacomp reference files.
      33390: ALF-12516: added missing file (the actual XSD!)
      33392: ALF-7260 RINF 03: Automate DB schema validation
   33401: FindFindbugs fix: Maybe Derek expected null after all
   33406: Latest SpringSurf libs - fixed use of java.util.UUID which blocks
   33407: Merged BRANCHES\DEV\V3.4-BUG-FIX to BRANCHES\DEV\V4.0-BUG-FIX
       33399: Fix for ALF-11962 Lucene queries searching on metadata (not on cm:content) with stopwords returns wrong results
   33414: ALF-11746 Webscript to expose the repository mimetypes, along with their user facing display names and their extensions
   33415: ALF-11746 Mimetype information can be available to all
   33442: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX
      33441: Latest SpringSurf libs - performance and thread safety improvements.
   33447: Fix to email test - query error exposed by recent change.
   33451: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX:
      33446: ALF-12354: fixed DB2 intermittent unique index creation problems.
      33448: ALF-7260: removed redundant code.
   33454: Merged (RECORD ONLY) V3.4-BUG-FIX (3.4.8) to V4.0-BUG-FIX (4.0.1)
      33388: Removed L10N that no longer have a default. 
      33437: ALF-9514 I18N: Model constraint values need localized display names
          - Undo changes to webclient_ja.properties that were made by r33286 for this issue.
            There were no changes in webclient.properties that did not already exist in webclient_ja.properties
            This should simplify translations.
      33453: ALF-9514 I18N: Model constraint values need localized display names
         - Tidy up mess to do with the initial r33286 revision for this issue. Lots of L10N property changes.
           I think some of my trial merges from 4.0 did not get reverted before I applied the diff file.
           Reverse merged r33437 and r33286. Note r33388 and r33375 (for ALF-12154) already included changes to try and fix the initial revision.
   33456: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX:
      33455: ALF-12410: JMX Dumps taking very long to finish
   33457: SDK build fix
   33463: Add in Enterprise Docs to SDK (again)
   33464: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
      33312: ALF-12448: Merged HEAD to V3.4-BUG-FIX (3.4.8)
         33304: ALF-7542 SDK is missing spring-test.jar
            - ant script modified to copy org.springframework.test*.jar files into root\build\assemble\sdk\lib\server\dependencies   
      33382: ALF-10239 Form validation bug when content becomes invalid after XSD change
         - override isValidForSubmit function in alfresco.xforms.TextField as alfresco.xforms.Widget version does not check the max length
      33383: Fix for ALF-11791 - Multiple search on category in Share Advanced Search return no result
         Merged HEAD to BRANCHES/DEV/V3.4-BUG-FIX
            29710: SVC15: Contribution: Alfresco Share Adv Search Enhancement: Allow advanced search on category to include sub-categories in query by checking a checkbox as in Alfresco Explorer (ALF-7157)
                   A new "showSubCategoriesOption" has been added to the "category.ftl" form control, that when set to true (as shown in the example config snippet below) will display a checkbox allowing the user to request all sub categories be searched as well as the selected ones.
                     <field id="cm:categories">
                        <control>
                           <control-param name="compactMode">true</control-param>
                           <control-param name="showSubCategoriesOption">true</control-param>
                        </control>
                     </field>
            30572: Fix for ALF-7008 - Double category in Share Advanced Search return no result
      33384: Fix for ALF-12469 - Change method BaseAssociationEditor.generateFormSubmit to protected
      33400: ALF-12366: Merged PATCHES/V3.4.6 to V3.4-BUG-FIX
         33354: ALF-12393: Parent assocs must be cached with a txn ID, even when a node has no parents
            - Use left outer join in parent assocs query
         33355: ALF-12393: Fixed typo in SQL + allowed assocIndex to be null
      33413: ALF-12219: Fix CommandServlet to not mess up Document List and My Spaces List dashlets on Websphere
      33416: ALF-12411: Merged DEV to V3.4-BUG-FIX (with corrections)
         33404: Fix that introduces full Unicode character support into jBPM 3.3.1:
            - new patch that alters columns of the jBPM 3.3.1 tables to change 'TEXT' datatype to 'NVARCHAR(MAX)' (SQL Server and Generic dialects);
            - 'jbpm-upgrade.sql' patch modified to alter as in the new patch;
            - 'AlfrescoSQLServerDialect' fixed to allow create tables with 'CLOB' columns as 'NVARCHAR(MAX)' columns
            - devious chain of alternatives (suggested by Derek) introduced to make sure the right patch executes under the right circumstances
      33418: ALF-9507: Fixed possible LDAP security hole
         Now we force RFC 2254 escaping of the user DN resolution query using argument substitution, as described here   
      http://docs.oracle.com/javase/jndi/tutorial/ldap/search/search.html
      33419: ALF-9658: Corrected AFTER_INACTIVITY cache update behaviour in InMemoryTicketComponentImpl
      - Now the key is preserved on entry update and not accidentally regenerated
      33421: Merged DEV to V3.4-BUG-FIX
         32042: ALF-11448: ArrayIndexOutOfBoundsException caused by unsynchronized call in org.alfresco.repo.webdav.WebDAV.formatModifiedDate
            Creation of SimpleDateFormatter was moved to a method.
      33422: ALF-12302: /api/tags API returns badly-formed JSON
      - Resolved as suggested by MH
      33423: ALF-10312: Parameter Based Redirection
      - Now we validate that the Explorer login page redirect URL is within the context path of the application (/alfresco)
      33424: Merged DEV to V3.4-BUG-FIX
         33358: ALF-11719: Webscript fails due to colon in password
            Split basic authentication header by first colon. Remaining part is user's password.
      33425: Merged DEV to V3.4-BUG-FIX
         33359: ALF-12071: Windows 7 cannot open files stored on Alfresco mounted as a webdav network drive if the filename contains + (plus) character
            For Windows 7 we SHOULD decode the file name gotten from GET request taking into account that "+" is not encoded as "%2B" for GET request.
      33426: Merged DEV to V3.4-BUG-FIX (with corrections)
         33374: ALF-10713: Remaining dependencies repo.remote.url from outboundSMTP-context.xml and activities-feed-context.xml was removed and SysAdminParams bean was injected instead. 
            - MailActionExecuter.URLHelper returns url to alfresco using SysAdminParams.
      33427: ALF-10713: repo.remote.url no longer used in 3.4.8 so removed altogether
      33429: Merged HEAD to BRANCHES\DEV\V3.4-BUG-FIX
          31191: First fix for ALF-10741 TAG field does not support wildcard, prefix, fuzzy queries etc -> wildcard searches entered by users will fail (for ALF-12162)
      33433: ALF-12411: Fixed postUpdateScriptPatches declaration
      33435: ALF-11719: Fix Authorization and AuthorizationTest
      33436: ALF-12411: Fixed patch script paths
      33445: Fixes: ALF-12389; internationalises the tool tip strings for changing the data list sort order.
      33449: ALF-12411: Fixes from Dmitry
      - Corrected ID of patch.db-V3.4-Upgrade-JBPM
      - dependsOn property has no effect on a SchemaUpgradeScriptPatch - order controlled by schemaBootstrap.postUpdateScriptPatches   
      33459: ALF-9811: SSOAuthenticationFilter now supports basic auth as well.
   33471: ALF-12297	Emailing to document via inbound SMTP causes integrity violation
   33473: Reference schema files moved on from 5025 to 5026
   33478: Fix for ALF-12515
   33479: Fix for ALF-11116
   33481: Fix for ALF-12099
   33487: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX:
      33485: ALF-12598: Incorrect column order on indexes and primary keys must be reported to user
   33496: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX:
      33494: ALF-12412: Schema reference files should contain schema version number
   33508: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX:
      33507: ALF-12412: Added missing files
   33515: Merge (Record Only) V3.4-BUG-FIX to V4.0-BUG-FIX
     33495 : SDK Build fix - do not merge to V4.0
   33517: V4.0 version of the fix for ALF-12393
    - The node caching structure in 4.0 is version-based and there was already a check to
      ensure that in-memory vs database versions matched for all calls to get parent associations.
    - Added an additional version check for cases where the node returns no parent associations
    - Removed right outer joins associated with the 3.4 fixes (minor complexity that is no longer required)
   33555: Merged (RECORD ONLY) V3.4-BUG-FIX (3.4.8) to V4.0-BUG-FIX (4.0.1)
      33554: Merged V3.4 (3.4.8) to V3.4-BUG-FIX (3.4.9)
         33512: GERMAN: L10N Updates, fixes: ALF-12154, ALF-9514, ALF-12389
         33513: SPANISH: L10N Updates, fixes: ALF-12154, ALF-9514, ALF-12389
         33514: FRENCH: L10N Updates, fixes: ALF-12154, ALF-9514, ALF-12389
         33516: ITALIAN: L10N Updates, fixes: ALF-12154, ALF-9514, ALF-12389
         33526: JAPANESE: L10N Updates, fixes: ALF-12154, ALF-9514, ALF-12389
         33544: SPANISH: Fixes additional Spanish translation bugs
         33552: JAPANESE: Adds previously missing workflow related translations
   33560: Fix the line endings to be consistent
   33561: DOC-335 Provide a commented out example of SPP/Vti SSL Configuration in the Module
   33563: Merge (Record Only) V3.4-Bug-FIX to V4.0-BUG-FIX
     33328 : ALF-12098 Issue ALF-4010 not fully resolved. ftp transfer of a previously moved file copies it to the destination folder of the previous move
   33566: fixed a comment.
   33567: Small change to debug logging
   33568: Removed deleteConfirm flag.   Not neccessary as events are fired postCommit.
   33570: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
      33550: Fixed ALF-10895 "Links, documents and folders: Unable to delete comments"
         - Made sure no "content" is sent when using HTTP DELETE to avoid proxy issues
   33574: Merged (RECORD ONLY) V3.4-BUG-FIX (3.4.8) to V4.0-BUG-FIX (4.0.1)
      33573: Merged V3.4 (3.4.8) to V3.4-BUG-FIX (3.4.9)
         33557: JAPANESE: Removes redundant string
   33576: ALF-12634 When building the edit online link to SPP/Vti, don't assume that the protocol (http/https) is the same as Share, but instead make that a module property (similar to how the port and hostname are set)
   33577: Remove un-used imports
   33584: ALF-12363: Protect against attempt to reference undefined rawPerms variable in folder-permissions WebScript controller
   33586: ALF-12405: Always show delete site icon on My Sites dashlet when viewed on IE7
   33605: Fixes: ALF-12408: Script Error when hovering on a row.
   33616: Merged BRANCHES\DEV\V3.4-BUG-FIX to BRANCHES\DEV\V4.0-BUG-FIX
       33500: Fix for ALF-12162 Searching for words with german umlaut does not show expected results
   33624: ALF-12488 - CIFS error occurs if Hazelcast Config is enabled.
   33637: ALF-11594: Disable comment field on upload dialog after version update
   33643: ALF-12243: Fixed create HTML content via HTML editor
   33649: Minor: tabs
   33650: ALF-12657: We need to set maxSavePostSize for tomcat connectors to support SSL (e.g. ModelsGet from SOLR will truncate JSON to 4096 characters)
   33662: Fix for ALF-12460
   33663: Fix for ALF-12460 (part 2)
   33664: Fix for ALF-12460 (part 2)
   33665: Fix for ALF-12443
   33672: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
      33468: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX
         33467: Enterprise overlay update for MessagesWebScript
      33470: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX
         33469: Revert rev 33467 - not required
      33482: Fixed ALF-12373 "IE7 Specific: incorrect displaying of "Link to Rule Set" window in Alfresco Share"
      - also fixed for ie6 removed javascript error thrown on click
      33580: Minor formatting for easier debug stepping
      33581: Fixed ALF-12638: No username in an audit context after an error
      33589: ALF-12650: Merged V3.4.1 to V3.4-BUG-FIX (3.4.9)
         33588: ALF-12620 Regression. Since 3.4.1.25 / 3.4.6.7 a user can be invited to a site multiple times
            - correction to js contains function. Bug introduced in r32775
      33597: Merge DEV to V3.4-BUG-FIX
        33465 : ALF-11193 - Consumer role cannot Unscribe/subscribe the IMAP folders.
      33602: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2011_12_06 to BRANCHES/DEV/V3.4-BUG-FIX:
         32551: ALF-10133: "Doc folder" for calendar events does not clear/reset itself
      33630: Merge Dev to V3.4-BUG-FIX
         33626 : ALF-4896 - Lock icon displayed for documents with expired lock
      33633: Merge V3.4.7 (3.4.7.1) to V3.4-BUG-FIX (3.4.9)
         33609: ALF-12589 CLONE - Content Manager unable to edit content from another user sandbox - Hot Fix for 3.4.7 needed
            Changed the permissions on the user's 'preview' store so that the group of ContentManagers was granted the ContentManager permission.
            It had been granting the permission to all current users in the group individually. As a result new ContentManagers could not FLATTEN or WRITE to the preview store.
            This had already been done for the main user store a few years back.
            As the managers parameter was no longer needed the was removed.
      33647: Merged DEV to V3.4-BUG-FIX
         33629: ALF-12585: Manage System Users shows "Change Password" icon for LDAP users in search results
            Sets "isMutable" property using addPropertyResolver in UsersDialog.   
      33648: Merged DEV to V3.4-BUG-FIX
         33623: ALF-10586: CMIS: Trying to delete a multilingual document w/o translations via webscript
            There is no need to delete associations in CMISServicesImpl.deleteObject().    
      33659: Merged V3.4 to V3.4-BUG-FIX
         33594: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2011_12_06 to BRANCHES/V3.4:
            32551: ALF-10133: "Doc folder" for calendar events does not clear/reset itself
         33595: Reverse merge of the following. Should have been committed to V3.4-BUG-FIX
            33594: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2011_12_06 to BRANCHES/V3.4:
               32551: ALF-10133: "Doc folder" for calendar events does not clear/reset itself   
         33604: ALF-12597: WCMQS doesn't work out of the box
         33654: Merged DEV to V3.4
            33622: ALF-12655: Configure link isn't presented in Web View dashlet(My Dashboard page)   
               User userIsSiteManager is true by default in webview.get.js. This allows to configure Web View dashlet on user's dashbord.
            33651: ALF-12655: Configure link isn't presented in Web View dashlet(My Dashboard page)   
               Sets userIsSiteManager=false before remote call, so if remote call fails it won't give site manager role to the user.
         33655: ALF-12366: Merged PATCHES/V3.4.6 to V3.4
            33548: ALF-12393: More changes to cope with read committed DB behaviour in AbstractReindexComponent
               - Reverted r33278, 33354, 33355 and introduced more generic solution
               - NodeRefs resolving to deleted nodes in the cache cause cache cleaning and transaction retry if they resolve OK in the database
               - Cached parent assocs are thrown away for non-deleted nodes if they are empty
               - Removes the need for the outer join and special case exception handling all over the place   
            33562: ALF-12393: Further improvments
               - Lookup of NodeRef to a deleted node must always result in cache clearing and transaction retrying (due to possible read committed behaviour half way through transaction)
               - Detection and correction of stale cached negative results (VALUE_NOT_FOUND) in node cache   
            33583: ALF-12393: Rework to getNodePair(NodeRef) to have less impact on existing code but still cope with read committed
               - Look ups of deleted nodes still cause InvalidNodeRefExceptions but these have a retryable cause so that both handlers can handle and retrying transactions can recover
               - Corrections to cached negative results (because the nodesCache remembers negative results) are written straight through and the transaction does not need to be retried
      33660: Merged V3.4 to V3.4-BUG-FIX (RECORD ONLY)
         33634: ALF-12161: Merge V3.4-BUG-FIX (3.4.9) to V3.4 (3.4.8)
            33633: Merge V3.4.7 (3.4.7.1) to V3.4-BUG-FIX (3.4.9)
               33609: ALF-12589 CLONE - Content Manager unable to edit content from another user sandbox - Hot Fix for 3.4.7 needed
                  Changed the permissions on the user's 'preview' store so that the group of ContentManagers was granted the ContentManager permission.
                  It had been granting the permission to all current users in the group individually. As a result new ContentManagers could not FLATTEN or WRITE to the preview store.
                  This had already been done for the main user store a few years back.
                  As the managers parameter was no longer needed the was removed.   
         33657: ALF-12650: Merged PATCHES/V3.4.6 to V3.4
            33590: ALF-12620: Merged V3.4-BUG-FIX (3.4.9) to V3.4.6 (3.4.6.10)
               33589: ALF-12650: Merged V3.4.1 to V3.4-BUG-FIX (3.4.9)
                  33588: ALF-12620 Regression. Since 3.4.1.25 / 3.4.6.7 a user can be invited to a site multiple times
                     - correction to js contains function. Bug introduced in r32775
   33673: Fixed compilation error
   33678: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
      33677: Merged V3.4 to V3.4-BUG-FIX
         33676: ALF-12436: Increase content data cache sizes to match node properties cache sizes to allow bulk loading without overflowing
   33679: Merged V3.4-BUG-FIX to V4.0-BUG-FIX (RECORD ONLY)
      33486: Merge V4.0-BUG-FIX to V3.4-BUG-FIX
        33306 - experiment to add sdk-extras
      33489: Merged V4.0-BUG-FIX to V3.4-BUG-FIX
        33322 : Enterprise SDK
        33323
        33335
        33353
        33457
        33463
      33495: SDK Build fix - do not merge to V4.0.
   33680: Merged DEV to V4.0-BUG-FIX
      33675: ALF-12379: WebLogic: alfresco fails to start: java.lang.NoSuchMethodError: org.apache.commons.lang.mutable.MutableInt.increment()V
         org.apache.commons.* package should be used as application's preferrable for WebLogic.
   33683: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
      33682: Merged V3.4 to V3.4-BUG-FIX
         33681: ALF-12132: Fix Bitrock's copy of the custom lotus context. Yuck!
   33689: Fix for ALF-12437 Switching from Lucene to Solr caused subsystems to be in inconsistent state and repository to hang
   - filter out changes to read only properties when set in bulk - ie they are ignored
   33691: Fix for ALF-12667
   33693: Fix for ALF-12695 SOLR should not appear to work with AVM - it should not silently fail.
   - AVM search and indexing will raise exceptions when used with SOLR
   - removed the AVM site bootstrap associated with Share in older versions of the product.
   33701: Merged DEV to V4.0-BUG-FIX
      33697: ALF-12691: Alfresco Explorer doesn't work: java.lang.NoClassDefFoundError: org/apache/commons/lang/builder/HashCodeBuilder
         Shared library for WAS was fixed. commons-lang-2.6.jar is used.
   33704: ALF-12299 - NFS subsystem enable/disable needs a different attribute name
   33714: ALF-10229: DOS Voodoo to set ALF_HOME to the parent parent directory of the apply_amps script
   - for /D %%D IN (%~dp0..\) do set ALF_HOME=%%~dpD
   - Yuck!
   33721: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX:
      33720: Merged BRANCHES/DEV/BELARUS/V4.0-BUG-FIX-2012_01_20 to BRANCHES/DEV/mward/schemacomp:
           33631: LF-12355 : Create schema reference files for SQL Server
   33727: Test fix - fallout from removing the bootstrap for the "sitestore" AVM store
   33729: Fixes: ALF-12575 - missing i18n strings. (translations pending)
   33738: SPANISH: Translation updates based on EN r33523
   33739: Merged DEV to V4.0-BUG-FIX
      33723: ALF-10229: apply_amps.bat doesn't work properly from alfresco-enterprise-4.0.0a.zip
         Fix for apply_amps.sh to set ALF_HOME to the parent parent directory of the apply_amps script
   33746: ALF-10656 SOLR: Patches execute search during bootstrap causing deadlock 
   - Part 1: 
     - SOLR query use during bootstrap will throw an exception
     - tidy up some patch beans
     - ignore unused AVM "sitestore" in WCMPostPermissionSnapshotPatch
   33753: Remove upgrade installers from build targets


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@33758 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2012-02-08 11:06:09 +00:00
Steven Glover
067faf5fdf Cascade hidden aspect for remame, copy, move 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@33096 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2012-01-08 10:19:24 +00:00
Steven Glover
dffba21ddf ALF-10826: 
- beefed up unit tests
- hide nodes only in enhanced mode
- fixes relating to ftp hiding of nodes
- remove index control aspect if a node becomes visible

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32934 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2011-12-21 20:02:34 +00:00
Steven Glover
78ba4f6498 ALF-10826: tidy up, added to comments/javadocs 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32804 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2011-12-16 09:38:26 +00:00
Steven Glover
bf7181452c Fix for ALF-10826 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32797 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2011-12-15 18:09:53 +00:00
Dave Ward
90a78359bd Merged V3.4-BUG-FIX to HEAD 
31682: Fix for ALF-9504 - Upload non-flash fallback fails
      Merged HEAD to V3.4-BUG-FIX
         31065: Fixed ALF-10407 "Share HTML uploader broken in Swift"
   31738: merged DEV to V3.4_BUG_FIX
     31681 : ALF-7859 - Deployment fails for *.xml content with wcm-xml-metadata-extracter-context.xml enabled
   31755: Fix for ALF-9257: merged in and optimised Belarus fix.
   31775: Fixed ALF-10667: WCM - Validation issue with xf:switch web forms
   31817: Spanish: Updates translations (based on: r31738) & adds new WCM translations.
   31840: Fix for ALF-10282 - Web Browser freezes with large xml files Web form transformation
   31843: ALF-9208 Performance issue, during load tests /share/page/user/user-sites is showing to be the most expensive.
      Modification to AuthorityDAOImpl.findAuthorities(...) to use childAuthorityCache when possible
      Big improvement to 'My Sites'
   31850: Italian: Translation updates, inc. fix for: ALF-11293.
   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
   31906: ALF-9545: Adjust date picker for IE
   31911: Merge PATCHES/V3.3.3 to V3.4-BUG-FIX (3.4.7)
      31905: ALF-10309 CLONE -WebDAV - Cancelling "save as" upload will create 0 byte content
         - Run Timer as the original user
         - Run timer if there is a LOCK timeout (not run if not so not to break standard. MS Office uses a 3 minute timeout)
         - PUT method clears aspect BEFORE it starts processing the content, so that the Timer does not remove the node if the content is very large
         - Delete node faster (than the Timer) if the client issues an UNLOCK, having locked the node but not issued a PUT. 
         - Lots of debug
      31708: ALF-10309 CLONE -WebDAV - Cancelling "save as" upload will create 0 byte content
          'runAsSystem' the 5 minute timer to remove LOCKED but not PUT WebDAV files 
      31698: ALF-10309 CLONE -WebDAV - Cancelling "save as" upload will create 0 byte content
          Added 5 minute timer to remove LOCKED but not PUT WebDAV files 
      31687: ALF-10309 CLONE -WebDAV - Cancelling "save as" upload will create 0 byte content
          Added missing sys:webdavNoContent aspect to system model.
   31913: Merge PATCHES/V3.4.1 (3.4.1.22) to V3.4-BUG-FIX (3.4.7)
      31876: ALF-11381 Enterprise unlimited licenses still get invalidated turning the system into read-only mode
         Use a retrying non-propagating (new) transaction to get the licence key in order to avoid intermittent issues.
   31929: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2011_11_09 to BRANCHES/DEV/V3.4-BUG-FIX
       31903: ALF-9971: RM search doesn't work with NAME:any_text: Check for dublicate template of properties was added. Throws an exception if there is already an entry in the map entry.
   31931: ALF_9678 Fixed null pointer issues in WorkflowManager methods
   31938: Merged DEV to V3.4-BUG-FIX
      31932: ALF-9566: hasMoreItems always false in CMIS query (Web Service binding)
             1. PropertyFilter was fixed to be able to handle OpenCMIS Workbench. Unit test was updated.
             2. hasMoreItems was adopted to indicate whether more itemsa are avliable in the repo based on maxItems and skipCount. Unit test was added.
             3. CMISFolderTypeDefinition was fixed to be fileable according to 2.1.5.1 File-able Objects.
   31965: German: Translation updates and additions based on EN r31738
   31967: French: Translation updates and additions based on EN r31738
   31969: Spanish: : Translation updates and additions based on EN r31738
   31971: Italian: Translation updates and additions based on EN r31738
   31972: Fix for patch 'alternatives': Alternative patch must have executed and not just been marked as successful
   31973: Fixed ALF-11489: 'patch.sitesSpacePermissions' failed on upgrade 2.2.8 -> 3.4.6
    - 'patch.sitesFolder' is an alternative to 'patch.sitesSpacePermissions'
    - Note: Requires rev 31972 for fix to PatchService use of alternatives
   31994: ALF-11495 CLONE - Enterprise unlimited licenses still get invalidated turning the system into read-only mode
      - Replaced DescriptorDAORetryingInterceptor (add in the hotfix) with a RetryingTransactionInterceptor 
   31999: Change the low level CIFS packet reading code to read/process up to 4 requests per thread run. ALF-9540
   Reduces thread blocking when the CIFS client uses overlapped I/O, and also keeps writes in their original sequence.
   32037: Japanese: Translation update, new and modified strings based on EN r31738
   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
   32074: ALF-11522 IMAP: Generic AlfrescoImapFolderException error is a bit misleading
      "Can't create folder - Permission denied" --> "Cannot perform action - permission denied"
   32086: ALF-9971 RM search doesn't work with NAME:any_text
      - fix to test failure to do with upper case defaultFieldName finding nothing
   32093: Merged BELARUS/V3.4-BUG-FIX-2011_10_13 to V3.4-BUG-FIX (3.4.7)
      Plus a little bit of refactoring to remove duplicate code
      31490: ALF-9817: IE strips exe extension on download file when using download url with ticket parameter in code  
         The "filename" part for "Content-Disposition" header in case of "attachment" for IE
   32115: ALF-11569: Merged V3.3 to V3.4-BUG-FIX
      32108: ALF-11571: Fix new deadlock in NIO CIFSRequestHandler
         - Needed to be able to get a thread safe estimate of the number of registered sessions without synchronizing on m_selector.keys() because a lock is held by the selector whilst waiting
         - Now the session count is maintained by the main thread, which is woken by anything wanting a session count.
   32136: ALF-10412 Nonreducing 100% CPU Uploading Large Files to Share Site Document Library
      Reducing the priority of the async thread pool that is used to perform the transformations so that normal activity (and even garbage collection) is not interrupted by transformations. 
   32143: MERGED 2011_11_09 to V3.4-BUG-FIX
     32133 - ALF-11193 Consumer role cannot Unscribe/subscribe the IMAP folders.
     32137
   32152: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2011_10_13 to BRANCHES/DEV/V3.4-BUG-FIX:
      31731: ALF-6275: Discrepancy detected on archived pivot language with EditionService
   32171: ALF-9638: Version2ServiceImpl now freezes aspect specific associations, in line with VersionServiceImpl
   32191: Merged DEV to V3.4-BUG-FIX
      32187: ALF-10884: A file renamed using the web UI still appears in a NFS mount but with NULL stats
             - Timestamp propogation in case of move
             - getPaths() call removed from the NodeMonitor
   32192: Reversed out rev 32143: ALF-11193: Consumer role cannot Unscribe/subscribe the IMAP folders. 
    - Patch is using SearchService
    - Patch doesn't transfer IMAP 'unsubscriptions'
    - Patch will not scale
   32211: Merged V3.4 to V3.4-BUG-FIX
      31914: ALF-10619: Not all container deletions were being honoured during indexing due to deletionsSinceFlushed processing
         - If container B is under container A with a secondary association, and A then B were deleted, then not all of Bs containers were getting masked out - only those in a subtree of A!
         - Now that delete events are fired on every affected node in a cascading delete, we can handle the nodes and containers on an individual basis
      31915: ALF-10619: Prevent possible InvalidNodeRefException during reindexing
         - Handle in childRelationshipEvent() when comparing with 'path generation factor'
   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.
   32327: ALF-11495: Merge V3.4.1 (3.4.1.23) to V3.4-BUG-FIX (3.4.8)
      32326: ALF-11381 Enterprise unlimited licenses still get invalidated turning the system into read-only mode
         MaxUserLicenseException class was not added to SVN in previous commit
      32325: ALF-11381 Enterprise unlimited licenses still get invalidated turning the system into read-only mode
         Remove RetryingTransactionInterceptor from around RepositoryDescriptorDAOImpl - not needed any more and caused extra exception if repo was r/o on boot
      32324: ALF-11381 Enterprise unlimited licenses still get invalidated turning the system into read-only mode
         Addition of message to say temporary problem has gone away
      32323: ALF-11381 Enterprise unlimited licenses still get invalidated turning the system into read-only mode
         Think I have found the reason for the vanishing licenses.
         License Descriptor can be accessed but the file in the content store cannot be read.
         Tidy up of code to remove TODO messages
         Addition of MaxUserLicenseException
         Additional code to handle possible temporary license outages and recovery
         Addition of more specific exception of invalid content store issue
      32326: ALF-11381 Enterprise unlimited licenses still get invalidated turning the system into read-only mode
         MaxUserLicenseException class was not added to SVN in previous commit
      32288: ALF-11381 Enterprise unlimited licenses still get invalidated turning the system into read-only mode
         Fix tests by still failing if we have not loaded a license yet
      32259: ALF-11381 Enterprise unlimited licenses still get invalidated turning the system into read-only mode
         Ignore exceptions from debug after RepositoryDescriptorDAOImpl Throwable
      32252: ALF-11381 Enterprise unlimited licenses still get invalidated turning the system into read-only mode
         Addition of logging and keep license live after error
   32343: FIXED - issue ALF-11617: wma file type is mapped to 'video/x-ms-wma' mimetype instead of audio/x-ms-wma'
   Changed the type audio/x-ms-wma
   32346: Fixed query use-case lookup of assoc namespace entity (i.e. should not lazily create)
    - Does not need merging to 4.0, which contains the fixes already
   32349: Merged V3.3 to V3.4-BUG-FIX
      32347: Prevent possible deadlock during subsystem syncing in a cluster
   32352: ALF-11495: Merge V3.4.1 (3.4.1.23) to V3.4-BUG-FIX (3.4.8)
      PLEASE NOTE that ALF-11381 was also merged into V3.4-BUG-FIX in r32327 
      32350: ALF-11381 Enterprise unlimited licenses still get invalidated turning the system into read-only mode
         Patched version of true license to log RunTimeExceptions and Errors from both ftp and non-ftp LicenseManager verify methods
      32332: ALF-11381 Enterprise unlimited licenses still get invalidated turning the system into read-only mode
         Cannot throw specific Exception for the file reader issue as returning null is required for FTL
   32356: ALF-11495: Merge V3.4.1 (3.4.1.23) to V3.4-BUG-FIX (3.4.8)
      32355: ALF-11381 Enterprise unlimited licenses still get invalidated turning the system into read-only mode
         TrueLicense missing from classpath.unit.test.extension
   32387: ALF-11617 Correct mimetype for WMA audio (with patch)
   32395: ALF-11004 Workflow Interpreter can now handle transitions with spaces in the name when 'signal' is called.
   32398: ALF-11078: Reinstate maxPermissionChecks logging from ALF-7237
   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
   32433: Merged V3.4 to V3.4-BUG-FIX
      32432: ALF-11743: When RM is installed, admin does not have the appropriate permissions to perform any operations in Alfresco Explorer


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32477 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2011-12-02 14:25:48 +00:00
Steven Glover
ea53ffea50 Merged BRANCHES/DEV/V3.4-BUG-FIX to HEAD: 
32244: Fix for ALF-11435:
   32246: Fix for ALF-11435 (part 2)
   32247: Fix for ALF-11435 (part 3)
   plus make sure that hidden files have the noindex aspect applied

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32388 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2011-11-29 14:28:39 +00:00
Derek Hulley
3615b03a74 Fixed NPE when using guest user in webscripts (ALF-10841) 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@31262 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2011-10-17 09:30:24 +00:00
Derek Hulley
2fe2385d2b Fixed ALF-10813: MimetypeMap.guessMimetype consumes 30% of file upload time 
- Only construct the detector once when the configuration is provided
 - Don't guess mimetypes when the mimetype has already been provided
 - All of the above need reviewing or refixing as long as the performance is not lost


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@31222 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2011-10-14 03:51:33 +00:00
Derek Hulley
9e7bb25cc6 Removed index search ('xpath') from FileFolderPerformanceTester 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@31123 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2011-10-11 11:12:16 +00:00
Dave Ward
52c0d4ddca Merged V3.4-BUG-FIX to HEAD 
30947: ALF-10619: Merged PATCHES/V3.1.2 to V3.4-BUG-FIX
      30884: ALF-10588: Another possible race condition resulting in out of sync transactions - found on SQL Server and JBoss in 3.1.2
         - FTS could process updated and deleted nodes in the same transaction before the tracker got to them, leaving behind the correct transaction ID and deleted nodes but undeleted container docs!
         - We now have to validate all deletions have been honoured when index tracking
      30890: ALF-10588: Temporarily disable FTS during IndexCheckServiceImplTest
         - Otherwise can get confused by intermediate FTS state of its own nodes!
      30894: ALF-10588: Correction to deletion checking
         - Only search for deleted nodes, not updated ones too!
   30948: ALF-10619: Fixed merge issue
   30982: - ALF-10503 60k Site Performance: Admin Console | Groups: search with a value that matches all 60 groups: maxClasuesCount=10000
   - ALF-10511 60k Site Performance: Admin Console | Users | Edit User | Group Search with a value that matches all 60 groups: maxClauseCount=10000
   - ALF-10608 60k Site Performance: Searching for a group to add to a site with a value that matches all 60 groups: maxClauseCount=10000
   - ALF-10515 60k Site Performance: Edit Group Display Name: The first time, nothing appears to happen for 10 seconds after pressing [Save]
   - ALF-10514 60k Site Performance: Admin Console | Groups | Search | Delete Group: no feedback to user for 20 seconds after clicking delete icon
   30985: Increases in node, property and aspect caches.
   30987: Merged DEV/TEMPORARY to V3.4-BUG-FIX
      30984: ALF-9880 : ContentGet web script throws NullPointerException for nodes missing cm:modified property
         The check for null was added for cm:modified property (similar to BaseDownloadContentServlet).
   30995: Fix for ALF-9021
   30996: ALF-10324 Cannot disable Home Folder Creation
      - Bug introduced into V3.1 on the 8 March 2010
      - ChainingUserRegistrySynchronizerTest enhanced to check for this
      - Fix to PersonService: Home folder was not being created for 'missing' persons
      - PersonService: Changed autoCreate parameters to more descriptive names (okay long) and updated Javadoc
   30998: ALF-10512 60k Site Performance: Clicking on Sites (left hand side) in the Repository browser causes transactional limit to be reached
     - Changed node, aspect, property and parentAssoc cache sizes (based on Derek's Skype message)
   31006: ALF-10512 60k Site Performance: Clicking on Sites (left hand side) in the Repository browser causes a transactional limit to be reached
     - Having changed cache sizes in previous commit, the nodeOwner and acl transactional caches were then blown with test case for ALF-10512
       Changed to 20k from 10k. Tried 15k but it still had a problem.
   31052: Fix for ALF-10520
   Merged HEAD to V3.4-BUG-FIX
      31051: Performance improvements for Share Repository browser queries.
             DB with ~50,000 nodes under Company Home:
             Before:
             - I'm Editing - 16 secs, Favorites - 17 secs, Tag - 14 secs
             After: 
             - I'm Editing - 1.5 secs, Favorites - 1.2 secs, Tag - 1.25 secs
   31058: ALF-10324 Cannot disable Home Folder Creation
      - ChainingUserRegistrySynchronizerTest check using personService with both eager and non eager home folder creation
   31064: ALF-9360: Merged PATCHES/V3.4.4 to V3.4-BUG-FIX
      30244: Merged DEV/DAVEW/IMAP_NEW to PATCHES/V3.4.4
         29635: Rework of IMAP to use lightweight caching and correctly set UIDVALIDITY, NEXTUID and Marked / Unmarked state
         29668: 1. Changed get AlfrescoImapFolder.getFullNameInternal to be dynamic for cache support
         29692: 1. Reverts changed in AlfrescoImapServer to allow ImapHostManager to be a session key for folder.
         2. getFlags relies on FileInfo.getProperties()
         29741: 1. Changed AbstractMimeMessage.updateMessageId() to follow RFC2822 (3.6.4. Identification fields)
         2. Changed ImapServiceImpl to handle absent folders and return "NO" reply to a client.
         3. Changed ImapServiceImpl that behaviours don't fail when Alfresco is being first time bootstrapped with IMAP enabled.
         4. Cleared AlfrescoImapFolder constructor. 
         5. Fixed SelectCommand's response to adhere RFC3501 (6.3.1.  SELECT Command)
         6. Fixed CommandParser to be able parse the flag which is not surrounded by braces (STORE 2:4 +FLAGS \Deleted)
         30235: Completion of IMAP rework
         - Scalable caching
           - Proper transactional cache for assembled messages
           - No more assumption that EHcache will always hold entire folder set at once (and perhaps it can't)
           - Per session (TCP connection) cache of accessed folders
           - Session cache validation via a 'change token' that is incremented on all significant events
           - Folder status attributes evaluated once and reused until the change token changes
           - Now only changed folders need to be queried on an IMAP sync and the server doesn't have to hold all folders in memory
           - User's view is consistent with their security permissions
         - Simplification / overhaul of ImapServiceImpl including efficient recursive path building and matching
         - AlfrescoImapFolder immutable as it should be
         - Greenmail fixes
            - Fixed quoting of mailbox names
            - Fixed hanging problem in ImapRequestLineReader - regression caused by our 8 bit encoding fix. Avoid using an InputStreamReader to read ISO-8859-1 bytes as it has an internal buffer.
      30275: Fix failing IMAP tests broken by my recent refactor!
      - Fixed greenmail conversion of ISO-8859-1 bytes to chars
      - Transaction read write attributes on service
      - Read only commands on AbstractImapFolder
      - Imap aspect properties must be managed as SYSTEM user
      - Restored persistence of new mail messages
      - Avoid unit test txn rollback woes by making it possible to check for existence of a path with FileFolderService
      30487: ALF-10268: Merged V3.4-BUG-FIX to PATCHES/V3.4.4
         30264: ALF-10187: Merged V3.3 to V3.4-BUG-FIX
            30003: ALF-9898: More defensive exception handling to avoid packet pool leaks and extra logging on packet pool exhaustion
      30540: ALF-10257: Fixed logic error introduced into Greenmail ImapRequestLineReader
      30988: ALF-9361: Merged DEV/DAVEW/IMAP_NEW to PATCHES/V3.4.4 (by Arseny)
         30419: Remote test for generic client request sequence.
         30547: 1. A bug with FetchCommand particularly with FETCH (BODY.PEEK[1]) with an error 
            1315912197.789640 1.5 NO FETCH failed. java.lang.String cannot be cast to javax.mail.internet.MimeMultipart
            This happened while message content is being proceeded like MimeMultipart mp = (MimeMultipart) mimeMessage.getContent();, but javadoc of mimeMessage.getContent() says that this content can be a String in case of non-multipart message. Fixed FetchCommand accordingly to mimeMessage.getContent() javadoc. 
         2. A bug with RFC822MetadataExtracter 
            When mimeMessage.getHeader("received"); is used with the message with following header 
            Received: with ECARTIS (v1.0.0; list dovecot); Tue, 06 Aug 2002 13:01:17 +0300 (EEST) 
            It doesn't extract a date, because it uses lastReceived.indexOf(';') which returns the position IN the ECARTIS (v1.0.0; list dovecot) after v1.0.0, 
            So it should use lastReceived.lastIndexOf(';') to get the position after ECARTIS (v1.0.0; list dovecot). 
      31025: ALF-9361: IMAP Performance
      - Introduced folder status MRU cache
      - Keyed by user ID and change token so no need to cluster
      - Now means we should get reuse across IMAP sessions
      - Also fixed isMarked() implementation to only return true if there are recent or unseen mails
      31038: ALF-9361: Prevent the starting of unnecessary transactions in AlfrescoImapFolder interface
      - getFolderStatus regulates its own transaction
      - Dropped all those *Internal methods from the abstract class
      - getUnqualifiedMailboxPattern moved to AlfrescoImapHostManager
      - Fixes to session folder cache validation / reuse
      31039: ALF-9361: Repository tuning for IMAP performance
      - Backed out ALF-5575 60 second timeout on node caches - Should be covered by ALF-8607 fix
      - Also made TransactionalCache.NewCacheBucket save new values to the shared cache for 'mutable' caches. Previously it was only possibly to load into the node caches in a read only transaction!
      - Also added fix to make AbstractNodeDAOImpl bulk load empty node aspect sets
      - Result is a drastic speedup of full sync times as most items can be served from the cache`
      31042: ALF-9361: Fix ImapServiceImplTest
      31048: ALF-9361: Make ConcurrentNodeServiceTest work again, after relaxation of 'mutable' transactional caches
      - aspect and property caches validated by node transaction ID, as per parent assocs in ALF-8607
      31050: ALF-9361: Caching correction
         Always use the cached mailbox reference if it is equivalent (because the session remembers the last selected mailbox)
      31060: ALF-9361: Fix CacheTest, following back out of ALF-5575 behaviour
      31061: ALF-9361: More caching fixes
      31062: ALF-9361: Undo accidental changes to ConcurrentNodeServiceTest
      31063: ALF-9361: Build fix: replaced assertSame with assertEquals


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@31079 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2011-10-10 12:07:32 +00:00
Derek Hulley
513358e20a Fixed ALF-10602: FileFolderService methods not registered in MLTranslationInterceptor 
- Added exists() and listDeepFolders() methods to interceptor lists


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30915 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2011-10-03 13:21:42 +00:00