171 Commits

Author SHA1 Message Date
Alan Davis
85eae4b91b Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57087: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      56572: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
         56395: MNT-9724: ImageMagick convert.exe: unable to create temporary file
             Added setup of MAGICK_TMPDIR to the ImageMagickContentTransformerWorker executer


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61716 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 19:24:29 +00:00
Alan Davis
543eb16c2c MNT-7158: Investigating adding priorities to transformers
- addition of methods to support the admin ui such as list of test file extensions,
     property names for custom properties and 'uses'
   - NPE if on removeProperties(...) if no value is supplied
   - Allow * transformer name to be used in a pipeline property in a setProperties(...) call

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55771 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-20 20:08:01 +00:00
Alan Davis
8de8c548e8 ALF-19700 BM-0013: Soak: V420b227_03: Transformation server overloaded
- Modified the way content.transformer.<transformer name>.extensions.<source>.<target>*.*.supported=[true|false] work
     so they are still backward compatible AND one can define if unmatched mimetypes are supported or not. For example:
     content.transformer.remoteServer.extensions.*.*.supported=false
   - Added properties to transformers.properties so that the Transformation server ONLY supports the transformations
     it did in 4.1.5 AND allows customers to change just one property to allow the Transformation Server to do all 
     transformations that it can with the exception of those that go to text, as generally the default transformers do
     a better job and are faster.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55704 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-19 18:53:29 +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
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
Alan Davis
6358e05cc9 Merged V4.1-BUG-FIX (4.1.5) to HEAD (4.2)
47769: Merged V4.1.4 (4.1.4) to V4.1-BUG-FIX (4.1.5)
      47768: ALF-17444 transformation of Outlook files (.msg) doesn't work ootb
         - Downgrade ERROR to debug
         - Complex transformer correctly checks all transformations between intermediate mimetypes.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@47773 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-03-07 18:01:39 +00:00
Jamal Kaabi-Mofrad
4cf6146ada ALF-17900: Added temporary file names to the OOoContentTransformerHelper logging.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@47771 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-03-07 17:20:51 +00:00
Alan Davis
fcadb0db97 Merged V4.1-BUg-FIX (4.1.4) to HEAD (4.2)
47218: ALF-15526 (Incorrect behaviour on filtering by tag)
   47220: ALF-17174 pdf2swf supports converting N first pages but alfresco does not support it via the pageLimit
      - Possible unit test fix. Not sure why the test fail given they don't when the same command is run on the build m/c
        from the command line.
      - Changed the command so that the new -p parameter is not there is there are no page restrictions and moved
        it to before the source file.
   47241: Calendar tagging bug fixes:
      - Fixes ALF-10533 - Tags don't reload after event create/edit
      - Merges & modifies fix for ALF-16998
      - clean up of unused code and comments.
   47243: Fix for ALF-18194 - Bad performance with multiple contentstores browsing files on the slower store
    - removed the need to acquire an InputStream for the content just to avoid thumbnail generation for the edge case of nodes with missing content...
   Also fixed issue with display of content size for nodes with missing content - now displays "0 bytes" rather than "NaN GB"
   47248: V4.1-BUG-FIX (4.1.4)
      - Use "-p 0-" rather than "-p ''"
      - Reverse Merge the previous attrempt. On Linux this resulted in an extra argument to the command. Was not a problem on Windows.
        47220: ALF-17174 pdf2swf supports converting N first pages but alfresco does not support it via the pageLimit
           - Possible unit test fix. Not sure why the test fail given they don't when the same command is run on the build m/c
             from the command line.
           - Changed the command so that the new -p parameter is not there is there are no page restrictions and moved
             it to before the source file.
   47251: Fix for ALF-17395 - server error if session expires when a tenant is logged into Share


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@47255 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-02-27 21:22:13 +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
Alan Davis
b031ba0ded ALF-14306 Add priorities to transformers
- properties with .mimtypes. in their name win over those with .extensions (for Ray)
   - extension and minetype expressions now only support the * wildcard

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@46950 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-02-22 00:51:25 +00:00
Alan Davis
3207aa4603 ALF-14306 Add priorities to transformers
- Fix build failures

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@46909 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-02-21 11:10:08 +00:00
Alan Davis
2b1d9fc813 ALF-14306 Add priorities to transformers
- Fix problems with ".mimetypes." properties

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@46893 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-02-21 00:27:55 +00:00
Alan Davis
66bd490bb6 ALF-14306 Add priorities to transformers
- Refactor to use ".mimetypes." and ".extensions." in all properties
   - TransformerDebug to include priorities

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@46889 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-02-20 21:55:49 +00:00
Ray Gauss
df3c1b89e2 ALF-14306: Add priorities to transformers
- Added TransformerConfigSupported isMimetype and isMimetypeSubtypeWildcard methods which check a given string
   - Added TransformerConfigSupported getMatchingMimetypes which gets all matching mime types from the mimetypeService if wildcards are present, otherwise passes the given mimetype on
   - Modified TransformerConfigSupported setSupported to check for mimetypes and call getMatchingMimetypes in addition to existing support for extensions

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@46807 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-02-19 17:31:21 +00:00
Alan Davis
f5bd27c36c ALF-14306: Merged DEV to HEAD (4.2)
Add priorities to transformers
   - Addition of a separate Transformers subsystem (holds configuration to allow JMX to be used to reset it on the fly)
   - Moved supported, unsupported and explicit transformation configuration from spring into transformers.properties in the subsystem
   - Moved all transformer limits configuration from spring and into transformers.properties with the exception of some added for thumbnails
     and the rendering service - not done as this code is known to be changing.
   - Added priority, errorTimes and thresholdCount to enable selection of transformers by priority.
   - Removed the concept of 'Explicit' transformation and replaced with priority and unsupported.
   - Added logging to aid in the creation of global properties and removal of spring configuration.
   - Implementation of spring pluggable transformation selector that uses priority.
   - Merging current state of code changes to allow other work in this area to take place.



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@46719 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-02-16 07:40:55 +00:00
Kevin Roast
db49919005 Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD
45144: Fix for ALF-16790 - upload ignores additional aspects for updateNodes
   45174: Merged V4.1-BUG-FIX-2012_11_22 to V4.1-BUG-FIX
   43940: ALF-15209: Add Dashlet to User or Site Dashboard not working when IE8 is operating in Compatibility Mode. 
             Fix check p_el.attributes["id"] to avoid errors for "IE8 compatibility mode
   45175: Fix for ALF-17260 - Tags list not updated after moving/copying an high number of nodes with taggable aspect but no tags 
   45188: ALF-16254 ("Leave Site" behaviour for group based site membership)
   45204: Fix for ALF-17335 - OnCreateNodePolicy not fired when custom type is used in the Share flash upload
   45218: ALF-17248 BaseAssociationEditor.java does not return any results when the query filter consists of "firstname + lastname" 
   45221: Merged V4.1.3 (4.1.3) to V4.1-BUG-FIX (4.1.4) RECORD ONLY
             45220: Merged: V4.1-BUG-FIX (4.1.4) to V4.1.3 (4.1.3)
                44054: Fix for ALF-16337. Datalist assignee not searchable by full name.
                45218: ALF-17248 BaseAssociationEditor.java does not return any results when the query filter consists of "firstname + lastname"
   45245: ALF-17089 (Displaying Url Name instead of site Name in Select form)
   45257: ALF-17318 Unnecessary Canned Query in .getPeople(String,...) on startup.
          - Just one extra query on each run of the FeedNotifier was being made at the end.
            The sequence of queries are necessary.
   45336: Merged DEV to V4.1-BUG-FIX (4.1.4)
             45318: ALF-14086: CLONE - Sort order of folders including hyphens ( - ) are different in folder-tree and view on folders (in Share)
             Sort groups and users on the Java server side using collators.
             - Deprecated a few methods not deprecated in DEV and removed one which had just been added to 4.1.4
   45362: Merged V3.4-BUG-FIX (3.4.13) to V4.1-BUG-FIX <<RECORD ONLY>>
             45361: Merged V3.4 (3.4.12) to V3.4-BUG-FIX (3.4.13)
                45360: ALF-17431: Merged V4.1 (4.1.2) to V3.4 (3.4.12)
                   43622: ALF-16757: Sharepoint doesn't work correct with SSO
                   - Fix by Pavel
   45385: Merged V4.1.3 (4.1.3) to V4.1-BUG-FIX (4.1.4)
             45384: ALF-17097 60k Site Performance: Admin Console | Groups | Browse Groups (include sys groups): Results isn't appeared.
                - Error in authorities comparator causing test failure of ALF 14086 in 4.1.4 only.
                  4.1.3 was okay as ALF 14086 now uses the change made for ALF-17097 but only in 4.1.4
   45452: Corrected config check for ALF-16413 - Share asks for Basic-Auth while not needed trying to access RSS feeds (thus breaking SSO).
   45467: Fix for ALF-17509 - patches the FreeMarker built-in ?js_string to correctly encode the "/" character.
   45468: ALF-17492 - WebScript errors must contain useful information
          - SpringSurf libs 1217 provide additional INFO log information on the HTTP method, URL+params that caused the exception.
   45475: Fix for ALF-17510 - Upgrade of htmlparser from 1.6 to 2.1
   45566: Fixed ALF-17530
          - Refactored "successCallback" & "successScope" parameters for multipart uploads to be simply "success" (same for failure)
   45574: Fixed ALF-17528
          - Asserting that request is made using application/json
   45662: Merged HEAD to BRANCHES/DEV/V4.1-BUG-FIX:
             45660: Fixes: ALF-17539 - The server was failing to parse the date. It shouldn't have been trying to parse it at all.
   45849: Merged HEAD to BRANCHES/DEV/V4.1-BUG-FIX:
             45824: Fixes: ALF-13676: Event edit times are now presented using the date-format.shortTime setting & may be entered in either 24h or 12hr formats.
   45876: ALF-17642: Fix broken HtmlParserContentTransformerTest after upgrade of htmlparser to 2.1
          - Since the upgrade slightly changed the behaviour of the transformer, I added some explanatory comments to the test and to the transformer class.
   45927: Fix for ALF-17302  DocLib sort is determined by server locale rather than browser locale 
          - GetChildrenCannedQuery was not using locale based collation
   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.
   46186: Fix for ALF-17786 - Site dashboard page issues too many requests (Site Members dashlet issues avatar requests when it doesn't need too)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@46287 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-02-06 11:00:59 +00:00
Ray Gauss
7bfed4b0c3 ALF-17766: ImageCropOptions Should be Refactored as TransformationSourceOptions
- Moved code in ImageCropOptions to CropSourceOptions
   - Moved crop rendition parameters to CropSourceOptionsSerializer
   - Removed notion of crop options from ImageRenderingEnding as its now handled by the source options processing of AbstractTransformationRenderingEngine and CropSourceOptionsSerializer
   - Removed notion of crop options from ImageTransformationOptions as its now handled by the source options in TransformationOptions
   - Changed ImageMagickContentTransformerWorker to get crop options from the TransformationOptions source options
   - Added CropSourceOptions to imageRenderingEngine's sourceOptionsSerializers in rendition-services-context.xml
   - Deprecated ImageCropOptions
   - Removed unused imports and log declaration in TransformationOptions


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@46218 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-02-05 01:13:53 +00:00
Ray Gauss
1c928e4c9f Merged BRANCHES/DEV/RGAUSS/HEAD-SOURCE-TARGET-TRANS-OPTIONS to HEAD:
45449: ALF-13254: TransformationOptions Should Have Separate Source and Target Options
        - Added SerializedTransformationOptionsAccessor interface which defines the methods used in the protected AbstractRenderingEngine.RenderContext class in a public manner
        - Changed AbstractRenderingEngine.RenderContext to implement SerializedTransformationOptionsAccessor
        - Added TransformationSourceOptions interface which also contains TransformationSourceOptionsSerializer interface which uses SerializedTransformationOptionsAccessor for deserialization
        - Added base AbstractTransformationSourceOptions class
        - Added PagedSourceOptions class which extends TransformationSourceOptions for start and end page options
        - Added TemporalSourceOptions class which extends TransformationSourceOptions for time-based offset and duration options
        - Changed TransformationOptions to contain TransformationSourceOptions held as a map with class as key
        - Changed ImageTransformationOptions to extend copyFrom
        - Changed ImageMagickContentTransformerWorker.getSourcePageRange to check for paged source options in the TransformationOptions passed in
        - Added ImageMagickContentTransformerTest.testPageSourceOptions to test null, default, page 2, and invalid options
        - Changed ThumbnailRenditionConvertor to iterate the transformationOptions.sourceOptionsList and use each serializer to add to the parameters
        - Changed AbstractTransformationRenderingEngine to iterate a list of TransformationSourceOptionsSerializers and use each to deserialize the RenderContext parameters and construct a TransformationSourceOptions object
        - Changed rendition-services-context.xml to set imageRenderingEngine's list of known sourceOptionsSerializers
        - Changed ThumbnailServiceImplParameterTest to test paged and temporal options
        - Added ThumbanailServiceImplTest.testCreateRenditionThumbnailFromPdfPage2 which tests grabbing the second page of a PDF


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@46062 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-01-30 20:32:55 +00:00
Ray Gauss
83f6e938a3 Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD:
45342: ALF-17215: Convert multi page PDF Document to image fails with convert.exe: Improper image header
        - Changed MIMETYPE_APPLICATION_PHOTOSHOP constant in MimetypeMap to newer image/vnd.adobe.photoshop
        - Added source and target mimetype parameters to AbstractImageMagickContentTransformerWorker.transformInternal and ImageMagickContentTransformerWorker.transformInternal methods
        - Added ImageMagickContentTransformerWorker.isSourcePageRangeRequired method which checks source and target mimetypes
        - Moved determination of source page range in ImageMagickContentTransformerWorker to its own getSourcePageRange method
        - Added checks for length of resulting file as it should always exist
        - Changed ImageMagickContentTransformerTest to use transformer.ImageMagick bean from Spring rather than hard coded imconvert.exe
        - Added MockMimetypeService to ImageMagickContentTransformerTest which will iterate through a limited set of mimetypes during testAllConversions
        - Added a second page to quick.pdf
   45343: ALF-17215: Convert multi page PDF Document to image fails with convert.exe: Improper image header
        - Added check for TIFF source as well which can be multi-paged
   45345: ALF-17215: Convert multi page PDF Document to image fails with convert.exe: Improper image header
        - Added multi-page quick.tiff file
        - Added check for target type of EPS or Photoshop in isSourcePageRangeRequired


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@45364 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-01-14 14:26:12 +00:00
Ray Gauss
ff9a4ba6cc ALF-16841: Converting files without a title to HTML generates invalid HTML
- Added unit test which confirms the issue
   - Wrapped the html content handler in Tika's new ExpandedTitleContentHandler


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@44819 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-12-18 19:13:57 +00:00
Dave Ward
a794361ac2 Merged V4.1-BUG-FIX to HEAD
43944: Fixes: ALF-16090: fixes view mode for control param showTime.
   43964: Fixes: ALF-14758. Adds distinct styling for menus nested 4 levels or deeper to prevent confusion if there's an overlap.
   44029: MNT-180 - Clone for Hotfix: Word document on Windows via CIFS becomes locked (Read Only) when network drops temporarily
   44040: Merged V3.4-BUF-GIX (3.4.12) to V4.1-BUG-FIX (4.1.3)
      44039: Minor changes to TransformerDebug to make output more readable when there are exceptions.
         - NPE when there is no exception message
   44046: MERGE DEV to V4.1-BUG-FIX
     ALF-16562 : CIFS: Excel document version history lost after saving content in Excel:mac 2011 on Mac Mountain Lion
   44115: Changes to standalone file state cache access mode checks to bring them into line with the clustered file state cache.
   44160: Fix for ALF-13129, checks to see if the child association already exists on the versioned node.  If it exists it doesn't add it again.
   44239: ALF-16977: InstallerBuilder 8.5.1 2012-11-29 with layout fix from Bitrock
   44319: Latest installer translations from Gloria
   44343: Merged V4.1 (4.1.2) to V4.1-BUG-FIX (4.1.3)
      44339: ALF-17070: Merged to V4.1 (4.1.2) from V4.1-BUG-FIX (3.4.12)
         << Regression introduced into 4.0.2 on 12/4/12 r35201 >>
         44337: Merged DEV to V3.4-BUG-FIX (3.4.12)
            44297: ALF-16935: wcm/avm file picker fails to render selection from folders navigation only works with 127.0.0.1 url
            - Fix for regression from ALF-11956, connected with setting titles for file picker controls
      44316: Merged DEV to V4.1
         44094: ALF-16794: CLONE - Webdav: Version history lost after editing content with Mac Word 2011 in Finder
            Add WebDAV MOVE handling for case when backup is enabled in Mac 2011 Word
         44285: ALF-16794: CLONE - Webdav: Version history lost after editing content with Mac Word 2011 in Finder
            Handle Mac 2011 Word backup in scope of RenameShuffle
      44312: Part 3 for ALF-16895 SOLR: Cannot find files after restart and reindex solr 
      - fix incremental cache state to cope with duplicate leaf/aux doc entries.
      44283: Encoding fix by David Webster
      44275: Part 2 for ALF-16895 SOLR: Cannot find files after restart and reindex solr 
      - fix initial cache state to cope with duplicate leaf/aux doc entries.
      44252: Russian fix from Gloria
      44200: Probable fix for     ALF-16895 SOLR: Cannot find files after restart and reindex solr 
      - still difficult to reproduce
      44149: Merged HEAD to V4.1
         44037: ALF-16947: prevent dependency to web-framework-commons war to be transitive: this artifact is not generated in Ant build
         44039: Version in parent-pom was not changed properly when deploying to Maven repo
      44142: ITALIAN: Translation update based on EN r43623, fixes ALF-16609
      44107: ALF-16016, ALF-15991, ALF-16180: Russian fixes by Gloria
      44078: ALF-16620: Out of memory Error applying CopiedFromAspectPatch
      - CopiedFromAspectPatch.WorkProvider.getNextWork() was fetching discrete managable chunks
      - and then blowing up as it continually fetched into the same in-memory HashSet!
   44404: Merged DEV to V4.1-BUG-FIX
      44378: ALF-16791 : resource bundle deployement for localization does not work with the dynamic approach
      1. Split out MessageService message lookup methods into new interface MessageLookup that lives in DataModel
      2. Added a simple implementation for SOLR to use
      3. Made M2Label look up model labels via a supplied MessageLookup argument
      4. Make DictionaryService extend MessageLookup so that it's easy to find a MessageLookup if you've got a DictionaryService
      5. Accounted for interface changes throughout. 
   44421: ALF-17114: Merged V3.4-BUG-FIX (3.4.12) to V4.1-BUG-FIX (4.1.3)
      44419: ALF-17045 If GhostScript is not installed, deletion of content is not working
         - Not just Ghostscript but any thumbnail failure
   44422: ALF-16123: "CheckOutCheckInService.checkout fails with DuplicateChildNodeNameException if no working copy label message found in current locale"
   44424: Merged V4.1 (4.1.2) to V4.1-BUG-FIX (4.1.3) RECORD ONLY
      44423: ALF-17114: Merged V4.1-BUG-FIX (4.1.3) to V4.1 (4.1.2)
         - got the wrong branch
         44421: ALF-17114: Merged V3.4-BUG-FIX (3.4.12) to V4.1-BUG-FIX (4.1.3)
            44419: ALF-17045 If GhostScript is not installed, deletion of content is not working
               - Not just Ghostscript but any thumbnail failure
   44447: Merged V4.0.2 (4.0.0.22) to V4.1-BUG-FIX (4.1.3) RECORD ONLY
      << Recording this as RECORD ONLY as it turns out the DEV code came form V4.1-BUG-FIX r42431 >>
      44435: Merged DEV to V4.0.2 (4.0.2.22)
         44429: MNT-232: Upgrade from 3.4.9 to 4.0.2 - FAILED
         - Initialize rootRefs in the property definition to prevent NPE.
   44468: Merged V3.4-PATCHES to V4.1-BUG-FIX
     MNT-211 (Still needs implementing on 4.1)
   44470: Fixes: ALF-16878 - don't use IE8's native JSON stringify method.
   44511: ALF-16791: Added missing class.
   44519: ALF-16791: Fixed broken unit tests
   44541: Fix for     ALF-17151   SOLR - add support to disable permission checks
   44542: MNT-211  Re-implement on 4.1
   44548: ALF-16791: Fixed broken SOLR
   44559: ALF-17075: "Exporting and importing null MLText values does not work."
   44577: Final part for     ALF-16558 SOLR tracking does not do incremental updates but one single chunk 
   - fixed code so SolrSearchers are held for as little time as possible
   44590: ALF-14523 (Share - Metadata constraint on workflow creation)
   44594: ALF-16310: "Calling CancelCheckout() on the original document deletes the document."
   44596: ALF-17075: "Exporting and importing null MLText values does not work." - change test name to something more meaningful
   44599: ALF-16310: "Calling CancelCheckout() on the original document deletes the document."
   44600: ALF-16791: Another omission not covered by unit tests
   44603: ALF-14201: upgrade activiti to 5.7-20121211
   44605: Added missing vti.server.url.path.prefix property required by commit 43471
   Missing due to cherry picked commit, this is implemented as part of 39309 on HEAD.
   44606: ALF-14201: upgrade activiti to 5.7-20121211 in Maven poms
   44613: ALF-13690 (Share - It's possible to delete site groups via the UI)
   44618: ALF-16939: "Error "importStatus.batchWeight is undefined" is thrown when Bulk Importer status webscript is run for XML format"
   44621: Merged PATCHES/V4.1.1 to V4.1-BUG-FIX
      44620: MNT-247: Merged DEV to PATCHES/V4.1.1 with corrections
         44526: ALF-16964: Share alfrescoCookie connector fails when alfresco.authentication.allowGuestLogin=false, use case proxy between share and alfresco
            Check if external authentication is active in BaseServlet
   44628: Solution for ALF-3780 - Dashboard settings not deleted for deleted user.
   Initial implementation by Dmitry Velichkevich.
   Surf user config folder and user Surf dynamic component references are removed when user node is deleted via a Delete Node policy.
   44632: addition of validation of NetworkFile isClosed property.
   44648: Merge V3.4-BUG-FIX to V4.1-BUG-FIX (4.1.3)
      44566: ALF-17164: Add SVN revision in version.properties when building in continuous mode
      44602: ALF-17164: adding the SCM revision in version.build so that it is displayed
         also, sneak in the SVN path, so that tracability is complete
   44650: BDE-111: Stop creating installers in parallel, it fails on pbld02. Also, revert to zip compression to gain build time
   44651: ALF-14348 (Unable to update external blog configuration details)
   44654: Merged DEV to V4.1-BUG-FIX
      44614: ALF-17119: Possible UI bug - "$$" chars added to permissions for IMAP Attachments folder
      Added a message bundles for FullControll access role.
   44655: Merged DEV to V4.1-BUG-FIX
      44593: ALF-14154: Encoding problem when open a file via webdav on Windows XP
      Ignore user credentials for the OPTIONS request.
      44612: ALF-14154 : Encoding problem when open a file via webdav on Windows XP
      Ignore user credentials for the OPTIONS request.
   44666: ALF-12001: Privacy: blog activities - activity is seen for draft blogs
   - Wrong node was being used for access checks
   - Fix by Andrey Chernov
   44671: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      43939: ALF-17197 / ALF-16917: Merged PATCHES/V3.4.11 to V3.4-BUG-FIX
         43896: MNT-198: Activity feeds get not generated in private sites for added files if username in LDAP-AD contains uppercase letters
         - Now we can cope with a runAs where the username is in the wrong case
      44296: ALF-17203 / ALF-17201 / MNT-216 : error saving versionable word documents


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@44675 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-12-13 14:16:40 +00:00
Kevin Roast
f651abe34a Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD
43598: Merged HEAD to BRANCHES/DEV/V4.1-BUG-FIX *RECORD ONLY*
             41906: ALF-11378: REST API has been modified to return extra information about a user whether s/he belongs to a group or not.
   44003: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_11_22 to BRANCHES/DEV/V4.1-BUG-FIX:
            ALF-15210: Inconsistency in the '?' icon over the dashlets projects\slingshot\source\web\js\share.js DashletTitleBarActions_onReady() function was updated. Fix initialize the style for actionsNode elements into the DOM for IE.
   44004: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_11_22 to V4.1-BUG-FIX:
            ALF-15793: edit offline hides version history projects\slingshot\source\web\components\document-details\document-actions.js onActionUploadNewVersion function was updated. Fix sets version variable correctly now using asset.workingCopy property instead asset.custom property, which is undefined.
   44018: ALF-16540 : CMIS: createDocument with VersioningState.CHECKEDOUT causes NodeLockedException for types with mandatory versionable aspect
            The ckeck for lock was disabled when beforeCreateVersion policy is handled.
            Version could be created for a locked node. 
   44054: Fix for ALF-16337. Datalist assignee not searchable by full name.
   44056: Trivial change. Fixing some compiler warnings under org.alfresco.repo.content.metadata including a noisy Tika one.
   44143: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_10_19 to BRANCHES/DEV/V4.1-BUG-FIX:
            42989: ALF-16331: Wrong user for "completed by" information provided in Group Review And Approve workflow
   44147: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.1-BUG-FIX:
   44146: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2012_05_22 to BRANCHES/DEV/V3.4-BUG-FIX:
            37733: ALF-12051: Webdav - Cannot open files containing "?" character in the filename in WinXP
   44152: ALF-17009 : Merged V3.4-BUG-FIX (3.4.12) to V4.1-BUG-FIX (4.1.3)
            44151: ALF-14035 Tiny HTML file that causes Jodconverter to launch a 100% CPU soffice instance
               - HTML to PDF is now done via ODT as the direct transform hangs if there are <sub> tags in the HTML.
               - Added in 'unsupportedTransformations' to stop a bare transformer.JodConverter from doing HTML to PDF 
               - TransformerDebug test file debugTransformers.txt no longer needs to be 18 bytes, as it made it too fiddly.
               - Modified debug from RuntimeExec so less editing is required to running from the command line
            - Removed tabs that had been added to enterprise/content-services-context.xml in 4.1-BUG-FIX
   44192: ALF-16560 - CIFS: Word document version history lost after saving content in Word:mac 2011 on Mac Mountain Lion
   44224: ALF-16896 Exception with TIKA meta data extractor.
            - Patch POI to handle parsing of Unicode properties that starts on a 4 byte boundary
              rather than the specified offset. Example file was created using http://www.aspose.com/
   44241: Merged DEV to V4.1-BUG-FIX
            44208: ALF-14591 : Ordering not supported for IMAP properties defining IMAP sort fields in Share
                   Make properties from imap:imapContent aspect indexable for SOLR. 
   44253: Merged BRANCHES/DEV/AMILLER/CLOUD1 to BRANCHES/DEV/V4.1-BUG-FIX:
            38927: CLOUD-128 - Update rules works incorrectly
          This is a partial fix for ALF-14568. The rest is coming in a separate check-in.
          I made some minor adjustments to this change - trivial spelling fix and whitespace changes.
   44257: ALF-16563 - CIFS: Image document version history lost after saving content in Preview on Mac Mountain Lion
   44260: Fix for ALF-16430 - List of values shown in alphabetical order in Share Forms. Values now only sorted if the Forms config 'field' element has the sorted='true' attribute.
   44269: Completion of fix for ALF-14568 - Update rule works incorrectly.
   44318: Fix for ALF-17055 - remoteadm webscript set a Last-Modified HTTP header whose date format does not conform to RFC 2616 hence breaking proxy caching
   44320: Fix for ALF-16463 - documentLibrary RSS feed does not pass the w3c validator, in particular pubDate breaks RFC-822, date not displayed when using non English locale
   44352: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_11_12 to BRANCHES/DEV/V4.1-BUG-FIX
            43860: ALF-16263: Search using a "Stop Word" not displaying any result

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@44459 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-12-07 14:04:23 +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
366aa0f57f ALF-3536: An ancient parked customer issue. Make most unit tests work when there is a space in the classpath.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@43767 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-11-21 10:35:24 +00:00
Dave Ward
8fd64e42ec Merged V4.1-BUG-FIX to HEAD
43114: ALF-15986: ALF-15986: Upgrade to Bitrock 8.5.1 in order to improve font scaling and adaptive layout with Gtk
   - Helps I18N
   43131: Fix for ALF-16510 (webview link incorrect style in High Constrast theme) and also corrected background color class in Activities title in High Contrast them.
   43147: ALF-14395: AccessDeniedException Thrown When Adding ch:contentHits Aspect from CustomAspect SDK Project
      Now sets a runAs user in the execution thread (using the correct tenant)
      Also fixes a bug where the read list was being used as the write list!
   43154: Merged BRANCHES/DEV/FEATURES/CLOUD1_DISCUSSIONS to BRANCHES/DEV/V4.1-BUG-FIX:
      43145: CLOUD-889: Fix noderefs to use base name for nested replies. Convert integration test to run all tests within a tenant (ALF-16498)
   43172: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      43166: ALF-14306 Add priorities to transformers
         << incomplete - initial steps >>
         - Addition of a TransformerSelector with the same logic as was there before.
           Makes changing the selection transformers simpler in future.
         - Addition of TransformerLog that logs a single DEBUG line for each top level transformer attempt (includes no transformers available).
           Records: sourceMimetype, targetMimetype, INFO/WARN/ERROR, FileName, FileSize, TransformerName, FailureMessage, TimeTaken
           Makes adding a true transformer log in future simpler.
      43169: Merged V3.4 to V3.4-BUG-FIX
         43167: ALF-16379: Performance degradation detected in benchmark test
            - Contention found in concurrent searches
            - Due to a correction in path generation behaviour in ALF-15171, there were a lot more 'container' (path) documents in the index. This meant that searches by node ID would hit a lot of path documents as well as the node document with ISNODE=T. This meant that whatever caches were in the indexreaders would be exhausted so concurrent searches would contend with each other on cache loading.
            - Using the ALF-15077 solution, LeafScorer now directly locates 'leaf' nodes using LEAFID=<noderef> (when possible) and avoids exhausting the caches and hitting container documents.
      43171: Merged V3.4 to V3.4-BUG-FIX (RECORD ONLY)
         43168: ALF-16379: Merged PATCHES/V4.1.1 to V3.4
            42592: ALF-16332: Alternative version of AbstractWebScriptViewResolver that uses a ConcurrentHashMap and thus allows multiple views to be resolved at the same time!
   43173: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (RECORD ONLY)
      43170: Merged V4.1-BUG-FIX to V3.4-BUG-FIX
         42741: Fix for ALF-16332 - Alternative version of AbstractWebScriptViewResolver that uses a ConcurrentHashMap and thus allows multiple views to be resolved at the same time!


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@43175 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-10-28 11:02:01 +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
ee8081b663 Merged V4.1-BUG-FIX to HEAD
41035: Fix for ALF-15225 - qt.length not performing as expected in search.lib.js
   41047: RUSSIAN: Translation updates based on EN r40961
   41049: GERMAN: Translation updates based on EN r41033. Fixes ALF-15749 and ALF-15720.
   41050: SPANISH: Translation updates based on EN r41033. Fixes ALF-15749 and ALF-15720.
   41051: FRENCH: Translation updates based on EN r41033. Fixes ALF-15749 and ALF-15720.
   41052: ITALIAN: Translation updates based on EN r41033. Fixes ALF-15749 and ALF-15720.
   41053: JAPANESE: Translation updates based on EN r41033. Fixes ALF-15749 and ALF-15720.
   41054: DUTCH: Translation updates based on EN r41033. Fixes ALF-15749 and ALF-15720.
   41055: RUSSIAN: Translation updates based on EN r41033. Fixes ALF-15749 and ALF-15720.
   41061: ALF-11214 - IMAP subsystem is not successfully restarted after incorrect modification of IMAP properties via Admin Console
   41063: RUSSIAN: Translation updates based on EN r41033 (encoding fixes)
   41064: CHINESE: Translation updates based on EN r41033
   41073: ALF-15760: Merged V4.0 to V4.1-BUG-FIX (another lost meta-inf revision)
      34416: ALF-12992: Updated weblogic DD for SOLR
   41074: ALF-15419 / ALF-14438: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (PARTIAL)
      37373: Merged PATCHES/V3.4.6 to V3.4-BUG-FIX
         36821: ALF-13827 / ALF-14402: Make replicated caches recover from temporary comms failures by flushing when a change in peers is detected
         - We do not flush caches who replicate via copy (e.g. tickets cache) as these may not be recoverable
         37122: ALF-13919 / ALF-14403: Merged DEV to PATCHES/V3.4.6
         - Rework of Dmitry's implementation
         - Uses dynamic HQL query to retrieve JBPM workflow instances by specified query criteria
         - WorkflowInstancesGet web script no longer has to iterate over every workflow instance in the database!
         - DB index added to enable efficient querying by string variable
         - Hibernate tastic!
         37188: ALF-13919 / ALF-14403: Worked around HQL polymorphism issues by using explicit variable subclass names in from clause
         37204: ALF-13919 / ALF-14403: Fix to date range handling by Dmitry
   41077: ALF-10730: Fixed object finder drop-down tree to show parent icon type when icon type not available
   41089: ALF-13998: 'No items' error is highlighted in red, even that is not sever error.
   41109: Part fix for ALF-11297 Disabled test: test-system-build-test has been removed from the test target dependency list
   41118: Fixes: ALF-15765 and related issue ALF-15476: 
      - Corrects merge of r34405 and r40159
      - Adds people api to cloud proxy config
      - Cloud/Global Folder picker sites list now universally shows only those sites the user is a member of.
   41119: ALF-15419 / ALF-14438: Merged DEV to V4.1-BUG-FIX
      41117: ALF-15419 : CLONE Remove JBPM indexes present from upgrades
         The schema reference files were updated to contain JBPM_VARIABLEINSTANCE.IDX_VARINST_STRVAL index.
   41130: ALF-15590: FSTR transfer of custom content type with parent cm:content fails
   - Fix by Dmitry
   41131: ALF-15714: Bitrock Uninstaller: Uninstaller doesn't remove all files and folders in *nix
   - Fix provided by Bitrock
   41132: Fix for ALF-14388 - Edit Online option is not supported for '.docm', 'dotm', '.xlsm' files
    - corrected mimetypes to be lower-case
   41150: ALF-13287 Added the handling of UTC represented by "Z" within comparator
   41154: Check for authentication errors when validating a ticket, if an error occurs re-authenticate. ALF-15394
   41155: ALF-15569: User with '@' symbol in username cannot invite
   - note: since Ent 4.0.2(+) by default MT is pre-configured but not enabled
   41173: Merged V4.1 to V4.1-BUG-FIX
      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
   41176: Attempt to debug unit test failure
   41181: Store leak in AVMServiceTest.test_ETWOTWO_570() causing unit test failure
   41184: ALF-15610: Copy Thai analyzer settings to its many SOLR locations
   41194: ALF-11297: re-enable system build tests
   41195: ALF-11297 ALF-15807: update activities system build tests after correction of ALF-4832
   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
   - check it makes any difference
   41204: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_08_15 to BRANCHES/DEV/V4.1-BUG-FIX: (note: merging as-is ... refactor + unit test fix to follow in next commit)
      40926: ALF-12586: Admin Console shows usage as zero - if user is deleted and then re-created (eg. re-synchronized via LDAP or manually)
      40974: ALF-12586: Admin Console shows usage as zero - if user is deleted and then re-created (eg. re-synchronized via LDAP or manually)
   41205: ALF-12586: Admin Console shows usage as zero - if user is deleted and then re-created (eg. re-synchronized via LDAP or manually)
   - review and refactor the proposed/merged fix (see previous commit)
   - fix unit test so that it accounts for previous content (as per the original issue)
   - also: add missing test to suite and fix that test to work with the new fix (ie. cleanup previous content, else need to account for it)
   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
   - do not expand authorities for thoses with the ADMINISTRATOR_ROLE as they can read all anyway
   41216: ALF-11297: system build tests need a database cleanup before running
   41222: ALF-15740, ALF-14744: Update rule firing broken for content created in Explorer
   - Old code lurking around that used to use the inline editable aspect to detect events handled by the CreateNodeRuleTrigger was removed from OnContentUpdateRuleTrigger and replaced with a check for ASPECT_NO_CONTENT
   41223: Added missing swf.languagedir setting to enterprise alfresco-global.properties
   41230: GERMAN: Translation updates based on EN rev41099.
   41232: SPANISH: Translation updates based on EN rev41099.
   41233: FRENCH: Translation updates based on EN rev41099.
   41234: ITALIAN: Translation updates based on EN rev41099.
   41235: JAPANESE: Translation updates based on EN rev41099.
   41236: DUTCH: Translation updates based on EN rev41099.
   41237: RUSSIAN: Translation updates based on EN rev41099.
   41239: CHINESE: Translation updates based on EN rev41099.
   41254: ALF-15628: Avoid edit online (SPP, WRITE_LOCK) clashing with edit offline (CheckOutCheckInService, READ_ONLY_LOCK)
   - Rationalization of work by Alex Malinovsky
   - WebDAVMethod.checkNode() now properly checks whether nodes without WebDAV lock info are writeable
   - CheckOutCheckInService won't allow checkout of a node with an existing WRITE_LOCK by the same user - they must unlock first
   - Propagation of correct status codes
   41264: ALF-15628: Fix CheckOutCheckInService test failures
   41265: ALF-15699: Reverse merged the following, thus downgrading us back to swftools 0.9.1
      40208: ALF-12831: Upgrade to swftools 0.9.2
   41266: Rush'n in some translation updates from Gloria
   41267: ALF-15628: Fix compilation problem
   41269: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (RECORD ONLY)
      41224: ALF-14856: Merged V4.1-BUG-FIX to V3.4-BUG-FIX
      41268: ALF-15459: Merged PATCHES/V4.0.2 to V3.4-BUG-FIX
         Merged V4.1-BUG-FIX to V3.4-BUG-FIX
   41274: ALF-15608: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      41272: ALF-15567: Allow links to be followed through WebDAV on port 80 using basic auth on XP
   41277: ALF-12586: Admin Console shows usage as zero - if user is deleted and then re-created (eg. re-synchronized via LDAP or manually) 
   - fix test fallout after merge/fix (note: failed for PostgreSQL but not MySQL - although fix was not DB-specific)
   41278: ALF-15840 Error logged when "No thumbnail present in file" even though this is normal 
   41284: ALF-14875: Serialize direct permissions after inherited permissions so that they take precedence in any lookups in permission dialogs
   41290: JAPANESE: Translation updates based on EN r41099 Fixes: ALF-14565
   41296: ALF-15251	CIFS: Checked out document is not marked as locked in CIFS
   41299: ALF-15714: Bitrock Uninstaller: Uninstaller doesn't remove all files and folders in *nix
   - Additional fix provided by Bitrock
   41303: Fix for ALF-15799 Under high concurrency load balanced Solr throws an Antlr related NPE
   - do not skip IO Exceptions
   41306: Incremented version revision for 4.1.2
   41309: ALF-15827: Added FORMACTION, FORMMETHOD and ACTION  HTML attributes to grey list to close security hole (updated Surf libs r1136)
   41318: ALF-15857: Lucene FTS indexer opens streams to all documents to be indexed in a transaction simultaneously
   - Now stream opening is delayed until the point where the document is being written to the index
   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
   41326: ALF-15234: IE 8 or IE9 Download .pps as .ppt 
      -Switched the order of the filename headers to better support non-conforming browsers (rfc 5987).
   41330: ALF-14875: Reversed r41284 because it didn't solve the problem in the UI. Kev reviewing.
   41332: ALF-10688: Can't deactivate an account when alfrescoNtlm follows another authentication subsystem in the authentication chain
   - Now, if a account is known to be 'mutable' then the enabled flag is read from the mutable authentication service
   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.
   41339: ALF-15840 Error logged when "No thumbnail present in file" even though this is normal
      - Found some more cases where this is logged as an ERROR
   41342: ALF-11087 (Missing icon file: components\images\filetypes\generic-tag-32.png)
   41344: ALF-15863 (* search values): Merged HEAD to V4.1-BUG-FIX (4.1.2)
      40849: ALF-12839 "Share - Inconsistency in adding a user or a group into a group" part 2
      - Making the users console stop "*" searches, just like the groups console when the min search length is set to larger than 0.
   41346: ALF-15237 - REST API Group children lists username for fullName and displayName
   41350: Merge V3.4-BUG-FIX to V4.1-BUG-FIX:
   41065: Disconnect existing CIFS sessions from the same client when a virtual circuit zero session is opened. ALF-13815
   41280: Moved session cleanup config into the base authenticator, added support to passthru/base authentication. ALF-13815
   41351: Ported database filesystem changes to fix session disconnect, from V3.4.
   41352: Merge V3.4-BUG-FIX to V4.1-BUG-FIX:
   41067: Added session disconnect support to the Alfresco CIFS authenticator. ALF-13815.
   41281: Added session cleanup support to passthru authenticator, session cleanup config moved to base class. ALF-13815 
   41353: Update svn:mergeinfo
   41355: Fix for ALF-15869 - "Site Content" dashlet shows all documents from all the sites in Alfresco Share
    - mistakenly did a record-only merge of this from 4.1->4.1.1
   41363: Fix for ALF-14875 - Manage permissions shows the permission 'No privileges' for All Other Users
    - reworked the permissions dialog and permissions panels to correctly handle multiple permissions on a special permissions group such as GROUP_EVERYONE
    - now correctly gets/sets permissions for GROUP_EVERYONE
    - this also fixes ALF-12014 - in that it allows custom SiteXYZ permissions to work correctly again also (will need manual backport for 3.4.X though)
    - removed hacks related to previous attempts to fix the above issue
    - added lots of comments around relevant sections to add in future refactoring or understanding
   41371: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.1-BUG-FIX (RECORD ONLY)
      41370: Fix for ALF-12014 - Share - Custom role causes incorrect display of permissions
   Manual merge of changes to 4.1.2
   41399: ALF-13438: java.lang.OutOfMemoryError appears in alfresco log when trying to create few thousands of sites consistently. 
   - The v4.0 parent assocs cache used to store every verion of every node's parent assocs, so as we added a node to 60,000 sites, we retained all previous versions of the user's parent association map
   - After creating 10,000 sites, the cache size was about 4GB, containing about 2 million parents
   - Now we use a specialized class that allows an upper limit to be set on the total number of cached parents as well as children.
   - Because the cache is keyed by node transaction ID, the cache can be non-clustered and non-transactional
   - Once the average number of parents is more than 8, the cache will drop its oldest entries
   - ParentAssocsInfo also now uses a compact TreeMap instead of a HashMap
   41401: ALF-13438: Small correction
   41406: ALF-13438: Fix failing unit tests
   - Removed unused node.parentAssocsSharedCache and corrected node.childByNameCache not to reference it!
   - Because parent assocs are cached by transaction ID, we must always invalidate them on an in-transaction version increment
   41409: Logging of unexepected errors on FTP
   41411: Fix possible FTP data session leak if client mixes PORT and PASV commands. ALF-15126
   41412: ALF-15845 : Clone for Hotfix: Word document on Windows via CIFS becomes locked (Read Only) when network drops temporarily
   41415: Fixes: ALF-15649: Removes country locale from files with it hard coded.
   41419: ALF-14599: Removed ftp.ipv6.enabled from enterprise overlay and bundles
   41426: ALF-15845 Clone for Hotfix: Word document on Windows via CIFS becomes locked (Read Only) when network drops temporarily
     Roll back changes to DiskDriver interface in favour of hacking NetworkFile.
   41440: JAPANESE: Translation update based on EN r41099
   41446: ALF-13091: Remove unecessary bean post processors from sub ssytem context and remove CXF's Jsr250BeanPostProcessor.
   41458: RUSSIAN: Further translation updates following linguistic review.
   41459: ALF-15897: Revert revision 41446, an attempted fix for ALF-13091
   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
   41506: Merged DEV to V4.1-BUG-FIX
      41505: ALF-15879: PostgreSQL: upgrade 2.2.8 (577) -> 3.4.10 (703) -> 4.1.1 (159) failed.
             - Make dropping "store_id" index and "alf_node_store_id_key" constraint optional in 4.1.1 upgrade script
               because clean 3.4 has "store_id" index and doesn't have "alf_node_store_id_key" constraint,
               but 3.4 upgraded from 2.2  has "alf_node_store_id_key" constraint and doesn't have "store_id" index.
   41531: Fixed ALF-15687, so that any user (except for Admin) won’t be able to retrieve any other user’s preferences via REST API. Also, updated the preferences controllers for the Post and Delete.
   41539: ALF-15899: Inbound email does not support multiple recipient folders
   - Fix by Dmitry Vaserin
   41540: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      40794: Merged DEV to V3.4-BUG-FIX
         40793: ALF-13752 Saving Word (mac 2011) documents via CIFS into a folder with Versionable rules on Mac OS X Lion (Fix for 3.4)
            In ContentDiskDriver.renameFile() was added a check whether a node in the archive.
      40806: Fix for ALF-9787 - Hiding sites in Share with permissionsDefinitions.xml [creates a permissions error in the blog portion of the site]
      40922: Merged DEV to V3.4-BUG-FIX (reviewed by Frederik)
         40488: ALF-13357 : Empty outcome when a timer is invoked
            A check for transitionName was added to AlfrescoTimer to support custom transitions.
      40940: ALF-15696: Remove svnkit.jar - makes the build fail if the version of installed command line svn is 1.7. Using commandline binding for <svn> Ant task to be consistent with other parts of the build.
      41066: Various fixes to the database filesystem for session disconnect cleanup.
      41068: Updates to the Alfresco filesystem for session cleanup. ALF-13815
      41301: Merged PATCHES/V3.4.9 to V3.4-BUG-FIX
         40966: ALF-15846 / ALF-15709: OOM on cascading reindex
         - Avoid buffering of all the affected PATH documents in memory - used the set of 'visited' paths to delay generation to the final flush.
         41044: ALF-15847 / ALF-15748: Lucene indexer can make sub-optimal cascade reindex decisions during an LDAP sync.
         - When a user in 6 groups was removed from a massive group, the massive group was getting cascade reindexed rather than the user
         - Logic adjusted as follows:
            For nodes with 5 or less parents, we always cascade reindex the child node. For nodes with more than 5 parents, we cascade reindex the parent node if it has less children than the child has parents.
      41395: ALF-15715: Unable to edit properties whilst transformation in progress
         - Delayed all changes that would potentially lock the parent node row while the thumbnail is generating.
         - Reorganized RenditionContext to lazily instantiate its destination node.
         - Changed render destination to use temporary ContentWriter until render is complete.
      41396: ALF-15715: Fix for failing unit tests.
      41413: Fix for issue where user calendar remote api was generating invalid date searches for user dashlet calendar.
      41509: Merged DEV to V3.4-BUG-FIX
         41507: ALF-12833: Issues installing Alfresco on WebSphere when the server doesn't have internet access
            Context-param which Sets "http://apache.org/xml/features/nonvalidating/load-external-dtd" feature on the SAXParser to false if this parameter is false 
      41510: ALF-15171: After addition of a secondary parent association to a container, not all index paths were being regenerated due to a logic error
      41512: ALF-15919: Merged PATCHES/V3.4.10 to V3.4-BUG-FIX
         41091: ALF-15723:  Merged DEV to PATCHES/V3.4.10
            26579: Switch the transformer to use Tika


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@41543 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-09-12 19:10:54 +00:00
Jamal Kaabi-Mofrad
ed0425319f Fix for ALF-7523: Share Preview for RFC822 messages
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@40549 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-08-17 10:57:45 +00:00
Dave Ward
cf2e12eebc Merged V4.1-BUG-FIX to HEAD
40170: Fix compile error following merge from 4.1.0 to 4.1.1
   40175: ALF-14002 (5108), ALF-14220 (5109), ALF-15419 (5110) patch versions for 4.1.1 that came from commits made to V4.0-BUG-FIX after 4.0.2 was released.
   40203: Fix 4.1 -> 4.1.1 merge error that was stopping start up of Share.
   Required change to extra config in 4.1.1 added for ALF-12524.
   There are other differences in the file for ALF-14812 and ALF-14813 but were not impacted.
   40206: ALF-15281 - FTP/FTPS: With preserve timestamps turned off, the modification date does not change.
   40208: ALF-12831: Upgrade to swftools 0.9.2
   40210: ALF-13933: First attempt at installing LibreOffice 3.5
   - Installed to a subdirectory called libreoffice
   - OpenOffice, Openoffice and OpenOffice.org replaced in all display strings
   40229: ALF-7278: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1)
      40227: ALF-15436 CLONE Alfresco 3.4c + Share + TIFF preview only shows the first page
   40237: Fix for ALF-14663 from Vadim Danilchenko - the 'edit online' button in Share fails but we do not send any error message
   40258: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_07_09 to BRANCHES/DEV/V4.1-BUG-FIX:
      39668: ALF-15214 patch.fixBpmPackages performs unnecessary work
   40261: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      38592: Fixed ALF-14929: NodeDAO might not be last node write to the database
       - Regression introduced when Hibernate was removed
       - Fix validated by unit test
      38596: Merged DEV to V3.4-BUG-FIX
         38594: ALF-14744: Documents uploaded via WebDAV mount from Windows 7, and copied by a jscript rule are zero-length
            Change CreateNodeRuleTrigger.onCreateNode() method:
            Search for property of "d:content" type in node TypeDefinition, AspectDefinitions of node aspects and don't fire rules if found.
      38781: Fixed ALF-14979: Long running AVM XPath queries on startup
       - Basic XPath was always fetching all siblings
      38896: ALF-14744: Fix rule-firing regressions plus unit test
      - CreateNodeRuleTrigger must remember new nodes, regardless of whether it fires to avoid an update being fired on a node created in the same transaction
      - Tests should not assume that inbound rule will be fired on a content-less node (when the node's type or aspects have content properties)
      38909: Merged DEV to V3.4-BUG-FIX (3.4.11)
         << Fix for issued identified by QA on 20/6/12 after verification of customer issues >>
         38849: ALF-11956: WCM accessibility
         Navigation between the fields with erroneous data has been modified to allow navigation between elements of composite widgets such as Date/Time pickers etc...
         - the fix for ALF-10804 is backported (required for the current fix);
         - ability of cancelling and reactivating the strict navigation sequence has been added (pressing the Escape key for cancelling and focusing the alert link for reactivating);
         - generation of duplicate ids for comboboxes of the 'MonthDayPicker' widget has been fixed
         38544: ALF-11956: WCM accessibility
         Draft implementation of 'FocusResolver' which introduces functionality of strict sequence for navigation between fields of the XForms widgets with erroneous data detected during validation
      38934: Fix for ALF-13658/ALF-14849
      38990: ALF-13048 Configuration of temp directories for converters (Openoffice and JOD)
         More general approach taken for JOD :
         - Allow an OpenOffice user template profile to be used by the JOD started OpenOffice process via
           the alfresco global property jodconverter.templateProfileDir
         - Among other settings, the profile contains values set in Tools|Options via the UI
           This includes the temporary directory: Tools|Options|openOffice.org|Temporary Files
         - If blank, a default profile is created. The user profile is recreated on each restart from the template.
           May be set to an existing user's profile such as: C:\Users\<username>\AppData\Roaming\OpenOffice.org\3
      39115: Merged V3.4 to V3.4-BUG-FIX
         38593: Merged DEV to V3.4
            38572: ALF-13578: CIFS: AlfJLANWorker threads (concurrency) - server not responding
               Add nodeServices.exists(nodeRef) check to errorHandler in ContentDiskDriver.closeFile() to hide InvalidNodeRefException here.
            38591: ALF-13578: CIFS: AlfJLANWorker threads (concurrency) - server not responding
               Replace "catch (AlfrescoRuntimeException e)"  with "catch (RuntimeException e)" in ContentDiskDriver.
               Add "catch (InvalidNodeRefException ex)" to ContentDiskDriver.renameFile() method and throw java.io.FileNotFoundException here.
         39063: Process the async packet queue at the end of CIFS NIO socket processing, before re-enabling socket events. ALF-13578.
      39117: Merged V3.4 to V3.4-BUG-FIX (RECORD ONLY)
         39116: ALF-13578: Reversed r39063 due to QA time constraints. Fix will be made limited availability and in next service pack.
      39179: Merged DEV to V3.4-BUG-FIX (3.4.11)
         38911: ALF-14827: Cannot see metrics data to Alfresco Enterprise Content Store in Hyperic HQ
            The attribute "TotalSize" is no longer exists in the Alfresco 3.4.x 
            SpaceFree and SpaceTotal are added to the alfresco enterprise plugin.
         38910: ALF-15016: Cannot see services to FTP, NFS Server in Hyperic HQ
            Alfresco enterrprise plugin fixed so that FTP and NFS Server resources now available in resources tab.
      39230: ALF-15048 - Create Rule 'Execute Script'- 'Append Copyright to file'
         - Script that added the copyright was hidden in a .acp file (a zip file).
           .acp is normally used by wireshark so was not found in searches.
      39294: Merged V3.4 to V3.4-BUG-FIX
         39293: ALF-14698: Merged PATCHES/V3.4.6 to V3.4
            38786: Merged V4.0-BUG-FIX to PATCHES/V3.4.6 (partial rework)
               34279: NodeDAO: re-parent "lost & found" orphan child nodes (see ALF-12358 & ALF-13066 / SYS-301)
               - if orphaned nodes are identified (eg. via getPath(s)) then attempt partial recovery by placing them in (temp) lost_found
               - ... ALF-12358 ('child' node has deleted parent(s))
               - ... ALF-13066 (non-root 'child' node has no parent(s))
               - for internal use only - allows index tracking (eg. Solr) to continue
               - precursor to fixing underlying root causes
               34338: NodeDAO: re-parent "lost & found" orphan child nodes (see ALF-12358 & ALF-13066 / SYS-301)
               - test fix (follow-on to r34279)
               34341: NodeDAO: re-parent "lost & found" orphan child nodes (see ALF-12358 & ALF-13066 / SYS-301)
               - ano test fix (once more with feeling)
               34434: ALF-13066: Fix for intermittent failure (testConcurrentLinkToDeletedNode)
            38959: ALF-15136: Merged HEAD to PATCHES/V3.4.6
               32659: Fixed ALF-11946: Lucene index recovery startup can cause full table scans and file sorts
                - Made the backward timestepping work in bounded segments, whereas previously there
                  was no lower bound causing the database to creak under load and the whole process
                  to take a long time.
                - Seen during benchmark testing as well
            39211: ALF-15109: 'Touch' nodes in every case where we add / remove secondary parent associations. Causing group membership fallout at SAP.
            39218: ALF-15109: Improved fix - must fire cascaded secondary association deletions at DbNodeServiceImpl level to ensure appropriate index events are fired and prevent out of sync indexes!
            39240: ALF-15109: Another attempt. Now we are firing all the right events on cascade removal of secondary associations a lot of things are coming out in the wash!
               - Cascade delete secondary associations in a first recursive pass
               - Use a List of Pairs rather than a Map to avoid missing multiple associations to the same child
      39295: Fixed merge issue
      39381: ALF-12781 - Unable to set email contributors authority
      39595: Fix for ALF-12506 - utils.setLocale() override the value to a lower case.
      39932: ALF-9540: copy from drive to CIFS is slower than direct drive to drive copy by a factor of ~ 15
      39935: ALF-9606: JSF, WebDav + Kerberos - Browser goes to a previous visited page when done/cancel edit online document
         - User is now redirected to logon when session expires.
      39961: ALF-9540: Fix some broken unit tests caused by missing policies.
      40026: Return success status for CIFS set security descriptor call even when the SecurityDescriptorInterface is not implemented. ALF-15357
      Attempt to fix slow MS Office docx file save, unable to reproduce locally.
      40090: ALF-15388: Merged V4.1-BUG-FIX to V3.4-BUG-FIX
         40022: Fix for ALF-15144 - Slow Share doclib high-level folder browsing due to version history retrieval
      Revision: 40159 
      Author: taksoy
      Date: Tuesday, August 07, 2012 1:44:29 PM
      Message:
      ALF-13636: ReferenceError: "containerId" is not defined - Exception thrown during folder rule creation
      ----
      Modified : /alfresco/BRANCHES/DEV/V3.4-BUG-FIX/root/projects/slingshot/source/web/modules/documentlibrary/global-folder.js
      40231: ALF-13575: Merged DEV to V3.4-BUG-FIX
         39879: Use of NetBIOS name versus DNS name in links accessed through CIFS
            - hostname is now determined from the path used to mount the drive on the client
      40251: Merged DEV to V3.4-BUG-FIX
         39667: ALF-4832: Incorrect behaviour of user's activities information in Moderated sites
            Introduce new method to ActivityPostService that accept userName.
            Post activity using new method when user is joined to site.
      40252: Merged PATCHES/V3.4.6 to V3.4-BUG-FIX
         39437: ALF-15458 / ALF-15184: ADMLuceneIndexerImpl debug can cause indexing to fail
         - Don't try to print the path of a deleted node!
         39520: Merged DEV to PATCHES/V3.4.6
            38728: ALF-15459 / ALF-14714 : A user can overwrite a "WRITE_LOCK" on a document created by a different user
               -The document owner is not considered to be the lock owner now.
               -ALF-12081 was backported.
         39581: ALF-15460 / ALF-15216: Need predefined JGroups configuration for FILE_PING
         - Now FILE_PING can be selected using alfresco.jgroups.defaultProtocol=TCP-FPING
         - New parameter alfresco.fping.shared.dir specifies its shared directory and defaults to ${dir.contentstore}
         39662: ALF-15461 / ALF-15243: "Failed to initialise config service" after a node comes back into the cluster
         - Nested writable transaction in a read only transaction 
         - Removed old school transaction management
         39768: ALF-15462 / ALF-10725: Account for local index impact of reparenting orphaned nodes
         - Unfortunately this means AbstractNodeDAOImpl now must talk to NodeIndexer but this may be revisited
         39770: ALF-15462 / ALF-10725: Fix test failure - an orphaned node WITH the root aspect must still have parents or it is unindexable!
         39816: ALF-15462 / ALF-10725: Revisit orphans once more
         - delete_ChildAssocsToAndFrom removed because it's evil and could orphan a node that's just shown up (read committed) from another transaction
         - Now only parent assocs of the deleted node are removed automatically and children are handled through normal cascading operations
         - The foreign keys will now block the deletion of a node with a new child created mid-transaction
         39846: ALF-15461 / ALF-15243: Fix unit test failures
      40253: Merged PATCHES/V3.4.9 to V3.4.-BUG-FIX
         39703: ALF-15463: More synchronization, TRACE logging and test for ALF-15215: Missing synchronization in RepositoryContainer.getRegistry()
         39885: ALF-15464 / ALF-15311: JGroups resends incorrect message for XMIT_REQ
            - Added new configuration files for heartbeat channel that removes NAKACK protocol as guaranteed delivery is not necessary for heartbeat.
   40262: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (RECORD ONLY)
      36853: Merge DEV to V3.4-BUG-FIX
        31272 : ALF-8588 - IMAP Cannot attach two attachments with the same name.
      38923: Merged HEAD to BRANCHES/DEV/V3.4-BUG-FIX
         32757: Fix for ALF-9365
      Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/V3.4-BUG-FIX
         35693: Fix for ALF-13806 - Get content webscript incorrectly returns text/plain mimetype for HTML files, not text/html
      Merged BRANCHES/V4.0 to BRANCHES/DEV/V3.4-BUG-FIX
         36560: Correctly size content length header after HTML stripping process (ALF-9365)
      39015: Merged in upgrade of truezip to 7.5.5 see ALF-14247
      39056: Merged V4.1-BUG-FIX to V3.4-BUG-FIX:
         ALF-15053: Ensure that sub-folders of "res" can be accessed in the DocLib
      39361: Added truezip-swing jar.  It seems that Truezip needs Swing :(


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@40274 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-08-10 08:35:06 +00:00
Dave Ward
27f6cb89b8 Merged V4.1-BUG-FIX to HEAD
40031: Fix from Dave Ward for ALF-15353 - Lock status is not showning on document details page for a document which is being edited online.
   40037: ALF-13609: Merged PATCHES/4.0.2 to V4.1-BUG-FIX (4.1.1)
      40032: ALF-13609: listSites() causes an exception for non-privileged users when no sites are present.    
         - Add catch for AccessDeniedException on getAllSetPermissions() call. Assumes private site for this condition.
   40075: ALF-13194: Make Share work again when guest authentication is disabled in the authentication chain
   - When share makes a call to the restrictions API with guest=true it must get a 401 response if there is no guest
   - Fix by Alex Mukha
   40112: ALF-9254: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1)
      40111: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration
         - Patched jooconverter to handle non western characters in text files, by using the same properties that JOD uses.
      40073: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration
         - Refactored JodContentTransformer and OpenOfficeContentTransformerWorker. Moved common code into OOoContentTransformerHelper,
           including fixes that existed on only one or the other.
         - For text files, change file encoding from SHIT JIS (and others) to UFT-8, as OpenOffice/LibreOffice do not support this as
           an input. They do support it in other file types but not text. JOD now works, but OOo still has problems.
   40146: ALF-15030: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1)
      40145: ALF-15411 CLONE pdf2swf ID Table overflow / This file is too complex to render- SWF only supports 65536 shapes at once
         - split swf.encoder.params into two parts rather than a comma separated list.
           Have tested against a number of Mike's test files. Quality appears the same.
   40151: ALF-15402: Upgrade yuicompressor used to compress JavaScript to 2.4.7, using the same version as the one we package
   40153: ALF-13998: 'No items' error is highlighted in red, even that is not sever error.
   40158: Merge DEV to V4.1-BUG-FIX
     ALF-14323 - CLONE - IMAP: Cannot attach two attachments with the same name.
   40162: Merged V4.1 (4.1.0) to V4.1-BUG-FIX (4.1.1) MORE TO FOLLOW
      39493: CloudSync: ALF-15203 - when creating a folder sync, do not setup sync for existing "working copy" nodes (only the original ones)
      39490: Changing the icon for creating a new folder in the cloud
      39486: Chinese translation update from Gloria, based on EN rev38987
      39485: Dutch translation update from Gloria, based on EN rev38987
      39483: Japanese translation update from Gloria, based on EN rev38987
      39482: German translation update from Gloria, based on EN rev38987
      39478: (ALF-15197) CloudSync: SyncAdminServiceImplTest.lockSSD failing - causing other tests and
      39470: CloudSync: ALF-15188 - Regress' in Unsync
      - further fallout (this time from ALF-14373 - moved syncTime to syncSetMemberNodeAspect)
      39465: ALF-15141 If a push takes a network over quota, a ContentQuotaException will be raised. Catch this on cloud, and return QUOTA_LIMIT_VIOLATION to the client
      39464: ALF-14847 Remove the obsolete old style audit token code
      39462: Remove unused imports, and improve log message/exception wrapping, for when the catch-all is enabled
      39461: The actions panel in the folder details page didn't receive the metadateRefresh event
      39454: CloudSync: ALF-15188 - Regress' in Unsync
      - fallout from ALF-14872
      - wip - fixes blocker but needs further investigation as to why remote Unsync is failing with "Content no longer exists on the remote system"
      - TODO: ALF-14655 + ALF-14712
      39452: Avoid NPE due to unboxing a null java.lang.Boolean
      39446: SyncTrackerComponent - rework code to set and reset remote system status.
      39445: Cloud Sync UI Updates:
         - Sync Status now shows transient Errors
         - Sync Status "More info" link has been removed
         - Text updates
      39444: removed a "hot" trace message.
      39443: ALF-14975 - Error if some files are locked while multi sync
      39442: ALF-14908: Update Sync status dialogue to include the local root folder for indirectly synced nodes.
      39441: Use SyncNodeException.wrapUnhandledException, so that the cause details are available for transport
      39440: ALF-15155 Have SyncNodeExceptions of type UNKNOWN transport back the causing exception's message, class and stacktraces, and have CloudSyncMemberNodeTransportImpl print a WARN for this when recevied
      39439: missed check in - just a message key
      39438: Interceptors on the CloudConnectorService will wrap raw exceptions, so ensure downstream code expects this
      39436: Fixes the problem when the default tenant is not enabled for sync and there are no secondary tenants
      39434: ALF-14980 - Services: auth errors on a per node basis
      39431: More - work around code for SyncTrackerComponent.
      39430: ALF-14531: F22 sub-task: Add create folder button to folder picker
      39428: ALF-15113 Remove the stubbed CloudSync subsystem.
      Although the subsystem config was gone, there was still some spring config which attempted to import it during bootstrap.
      39426: ALF-14598. This change should ensure that the syncOwner is correctly set on nodes pushed to cloud.
      39425: Put set and reset of sync failed attribute into its own transaction.
      39420: ALF-15167 - Version history sync status message displaying US date format
      39419: Work around for syncSetDefinitionTransport.pullChangedSSDs not returning RemoteSystemUnavailableException
      39418: Test code improvements. Using my new TemporaryMockOverride rule to clean up spring beans.
      39414: CloudSync: change annoying debug message to trace ...
      - ... we should not pollute the sync "debug" log with continuous stream of unhelpful messages ;-)
      39413: CloudSync: ALF-15130 - for checkout, copy sync aspect and properties to "Working Copy" (but not for non-checkout "Copy")
      - additional fix for directly synced node (issue raised by DW)
      39411: Updated the properties for cloud sync related messages
      39410: Fixes api mapping for POST cloud passthrough.
      39407: ALF-14906: Makes sync status dialogue working copy aware & provides link to original document.
      39400: some code was in an log if statement.
      39399: ALF-14980 - Services: Add {stuff} needed to display comms and auth errors on a per node basis.
      39397: Merged HEAD to BRANCHES/V4.1:
         39395: Adding a new JUnit rule to help with cleaning up spring singleton beans whose backend services have been mocked out.
      39386: ALF-14901: Fxx sub-task: UI - tgt folder picker should allow drill-down for sync-enabled Networks only
      39385: CloudSync: F24 - fix add "sub-folder" on target (when sync'ing sub-folders)
      - raised by MF
      39384: Rename the parent declarative webscript to AbstractCloudSyncDeclarativeWebScript, and add a new AbstractCloudSyncAbstractWebScript parent for the few sync related webscripts that need to be AbstractWebScript rather than DeclarativeWebScript
      39382: I like code that compiles. This code compiles.
      39380: Test code refactor. We've now got a green bar for AllSyncServiceTests.
      39378: More test refactoring in an attempt to get AllSyncServiceTests passing.
      Extracted common code and state from two REST API tests.
      39377: ALF-14901: Fxx sub-task: UI - tgt folder picker should allow drill-down for sync-enabled Networks only
      39376: Changes to tests. I'm trying to get AllSyncServiceTests to pass as a suite.
      This check-in fixes a few failures, now two remaining.
      39371: CloudSync: fix cloud fallout from new lic/key (ALF-14846) - pt 1
      39368: Italian translation update from Gloria, based on EN rev38987
      39367: French translation update from Gloria, based on EN rev38987
      39366: Spanish translation update from Gloria, based on EN rev38987
      39356: ALF-14906: "Sync Pending" status is shown immediately following a "Request Sync" action.
      39348: ALF-14530 Complete the implementation, and add a REST level unit test
      39347: ALF-14889: Adds proxy passthrough config for create folder webscript.
      39344: ALF-14373 Moved syncTime to syncSetMemberNodeAspect.
      There may be a little more to do in this task.
      39343: Hide the sync filters in the dashlets if the sync is disabled.
      39342: CloudSync: stop push looping due to unknown (non-transient) error !
      - related to ALF-14872 - eg. in this case ALF-15141 which is not yet explicitly handled ...
      - TODO: SyncNodeExceptionType.UNKNOWN should handle error message (+ stacktrace ?) - for push or pull (for latter, needs to be transported)
      39339: Unsync confirmation text for document/folder changed. The user will be informed that deleting a folder will also delete any content under this folder.
      39338: ALF-14909: Update Share delete confirmation dialogue to show extra confirmation text if the node is synced
      39337: Add example request JSON to the webscript description
      39335: ALF-14530 Webscript to create folders
      39328: stress that a cloud network is: FREE 10GB
      39322: ALF-14921: CloudSync - F63 / F64 - Recently Modified Dashlet Updates
      39320: ALF-14501 - allow UI to determine if sync has been requested on a node
      39316: ALF-14920: CloudSync - F61 / F62 - Synced content display on My Documents Dashlet
      39312: Debug messages.
      39308: Adds folder specific lock messages.
      39306: CloudSync: ALF-15130 - for checkout, copy sync aspect and properties to "Working Copy" (but not for non-checkout "Copy")
      39305: Turns off sync panel when sync is disabled.
      39304: CloudSync: minor: turn down log level
      39303: Updates the text to use the correct term for the cloud instance (Alfresco in the cloud).
      39300: Cloud Sync Evaluator config & Doc Lib banner updates:
         - ALF-14981: Adds support for sync:transientError aspect
         - ALF-14981: Adds Doc Lib banner for transient errors
         - ALF-15128: Corrects behaviours on working copies (WIP)
      39296: ALF-15025 - Always enable the sync change monitor policies - even when off.
      39292: ALF-15091 Add unit test covering the case of auditing and transporting MLText properties
      39291: ALF-15025 - Cloud Sync now depends upon the key in the license.   No key - no sync.
      39283: When fetching the properties to be transfered, mark us as being ML-aware as we want to transfer the full MLText object (and not just the current locale)
      39279: Adds back in property that went awol in r39265
      39275: ALF-15104 Switch the tenant information webscript to be an AbstractWebScript, to make extensions of the JSON (eg for Cloud) easier and cleaner
      39273: Switches off Sync filters if sync is off.
      39272: Adds support for evaluators to Doc Lib filters.
      39265: Merged /integrations/GoogleDocs/BRANCHES/THOR1_SPRINTS_GOOGLEDOCS to BRANCHES/V4.1
         36307 Fixed THOR-1402 "Need a callback option for Create Content menu"
            - Will be revisited to add better comments
         36350 Fixed THOR-1402 "Need a callback option for Create Content menu" part 2
            - Changed callback obj to match action object better: { nodeRef, node, jsNode }
            - Better code documentation
            - Removed dev/test code
            - Improved error config handling
         36358 THOR-1402 "Need a callback option for Create Content menu" part 3
            - Changed "link" parameter to "href" (instead of "page") to match actions.
         39256 Consistency fix of doclib & repo toolbar templates after work on THOR-1402
         39260 Bugfix for "destination" parameter not being resolved correctly THOR-1402
      39261: ALF-15056: Handle Multiple errors in Sync Status box
      39215: CloudSync: F4 - fix ALF-15106: non-deeply synced folders should not add subsequent child (sub-) folders to sync set
      39209: ALF-15113. Removing the unused, stub subsystem 'CloudSync'.
      39207: ALF-15015 follow-up: make sure the first enterprise test that runs has no specific license, since we just reset the database
      39184: Fixes broken sync URLs
      39180: ALF-15054: CSS Updates
      39171: Re-enable test (ALF-15096)
      39170: Missing commit, 400-499 errors need the response details (ALF-15096)
      39168: Completion of ALF-14335. This check-in removes the old URL patterns and so all clients must now be using the new /enterprise/sync URLs.
      39162: CloudSync: comment-out unit test pending ALF-15096
      39160: ALF-15054: CSS Updates
      39144: Have SyncChangeMonitorTest remove the mock when done, which allows several more tests to pass in the suite
      39114: Fixes: ALF-14990: Folder Picker issues (caused by multiple instances being displayed with different contexts)
      39113: ALF-14557: Auth Dialogue updates
      39112: ALF-15061: Makes Lock message and icon generic - not all locks are for local edits now.
      39107: ALF-15054: CSS Updates
      39097: Try to re-order tests to have more pass, and improve error detection in one
      39093: Add in the missing sync
      39091: CloudSync: ALF-15075 - Regress: unable to pull single node update (file sync)
      - follow-on fix to allow initial push :-)
      - fallout from ALF-14853
      39080: Complete conflict transport of exceptions unit tests
      39079: Fix webscript parent definitions, to avoid NPE on missing required service
      39077: Improve Pull error reporting, and add tests for the transport level catch/encoding/decoding/throw of exceptions (to compliment existing tests)
      39076: ALF-15013 ALF-15015: Reset database before running enterprise tests, otherwise SecurityTestSuite leaves it in a bad state
      39073: ALF-15050 test affescted by locked sync set implementation.
      39072: CloudSync: ALF-15075 - Regress: unable to pull single node update (file sync)
      - fallout from ALF-14853
      39068: ALF-14893 - work around order of versions issue.
      39066: Tweak how we switch to the default authenticator for one test
      39059: ALF-15054: Added the actions "Sync", "Unsync" and "Request sync" to the header of the sync panel
      39054: More debug for move node problem.
      39041: ALF-15064 : Sync locked nodes (on src) - need to be able to bypass lock when requesting sync ...
      39040: Turn off locked sync sets for SyncAdminServiceRestApiTest
      39034: Merged BRANCHES/DEV/FEATURES/CLOUD1_CLOUDSYNC to BRANCHES/V4.1:
         39030: CloudSync: ALF-14899 - cloud target Sync API should restrict to Enterprise Network(s) only
      39033: CloudSync: minor - fix failed node count (debug logging)
      39032: ALF-14557: CSS Fixes to Auth Dialogue (WIP)
      39024: ALF-14225: Adds tracking to URL.
      39018: If the other end sent their noderef, return it to them
      39011: ALF-14225: Refactor Welcome Dashlet to show 4 columns, the 4th one of which is always the cloud sign up text.
      39009: Extra validation before doing JSON parsing
      39008: ALF-15015 Avoid having a custom ServletAuthenticatorFactory trampled in a MT environment
      39005: Attach the sources for spring-webscripts-1.0.0-tests
      38991: update should not move node if localparentnoderef is not specified.
      38962: Added a new unit test for end to end conflict.
      38961: CloudSync: ALF-15040 / ALF-15021 - Uploading file larger than content limit (max file size) for given network (eg. 50 Mb to a Free Network) causes error loop
      - wip
      38960: ALF-15050 :
      CloudSync: failing test(s) - due to locking ?? (SyncAdminServiceImplTest / org.alfresco.enterprise.repo.sync.audit.SyncAuditServiceIntegrationTest)
      38958: CloudSync: fix NPE (CloudSyncConfirmPost line 139)
      38956: Chinese Translation for 4.1
      38955: box-shadow doesn't work with IE6-IE8. It was not possible to see the borders of the info balloon.
      38951: Removed "folder-sync.js" and "folder-sync.css" to avoid code duplication. The same methods and styles are defined in "document-sync.js" and "document-sync.css".
      38940: The sync panel in document details page were not refreshed when the document was synced or unsynced from the document details page.
      38937: ALF-14859: Adds Icons for cloud version (requires cloud overrides to display them)
      38935: ALF-15006: Adds the missing config required to include the actions-util.js file in the list of ones to be concatenated
      38929: Add a toString() method to aid debugging
      38928: ALF-14952: update Unsync dialog to enable UI option to allow user to request delete of remote nodes (ie. from target) 
      38925: Updates the sync status message logic a bit - now displays the sync attempted time if the first sync fails (previously showed "Sync pending")
      38922: ALF-14677 - Synced nodes marked as locked On Premise, need to be unlocked on unsync
      Also Locks created and deleted by sync set owner.
      38921: Removes the action util methods from the global name space and adds them to Alfresco.util
      38919: CloudSync: ALF-15040 / ALF-15021 - Uploading file larger than 50 Mb to a Free Network causes error loop
      38918: File size upload limit within ContentStore.
      - required for cloud sync (ALF-15040) 
      - fix default (no limit)
      38915: File size upload limit within ContentStore.
      - required for cloud sync (ALF-15040) 
      - fix merge issue (Spring config)
      38914: File size upload limit within ContentStore.
      - partial merge - "sourced from" THOR1+CLOUD1
      - required for cloud sync (ALF-15040)
         33055: File size upload limit within ContentStore 
         35995: Fix merge issue
      38912: Locking attribute on Sync Set - First cut - add new method on Lock Service + re-enable pull unit test.
      38906: The buttons won't be created on the cloud side, so avoid js error
      38905: CloudSync: test fix
      - fallout from r38888 (ALF-15029)
      38902: ALF-14549: CSS fix for window resizing problems
      38898: More unit test debug logging, to aid with making sense of the logs on the Bamboo-only failure
      38895: Extra debugging and checking, to help narrow down why this test fails on Bamboo
      38892: ALF-14908 (No need to pass the "siteId" with the URL)
      38890: We don't need to pass the "syncOwner" with the URL anymore. We receive the needed information from the server and this avoids an extra call to build the "syncOwnerFullName".
      38888: CloudSync: F4/F24 - ALF-15029 - working copies (eg. via Edit Offline ... within a folder sync) should not be synced !
      38887: ALF-14908: Checking "isDirectSync" before comparing the value, because "isDirectSync" can be undefined
      38886: ALF-14908: Update Sync status dialogue to include the local root folder for indirectly synced nodes
      38882: CloudSync: F13/F14/F24 - ALF-14778 - "request sync" of a folder/sub-folder SSMN
      - will request the sync of the folder node itself (whether failed or not)
      - recurse and request sync of all SSMNs below but only if failed (irrespective of SSD)
      38873: Reverses failed merge attempt in r38846.
      38872: ALF-14907: "localRootNodeName" added
      38871: Adds edition check before calling enterprise only webscript. Sets sync to OFF for non enterprise editions.
      38866: Have the setup methods try harder to ensure a clean, empty setup for the area under test, to avoid issues with other tests on Bamboo leaving test data behind which then confuses things
      38863: CloudSync: minor: improve SyncTracker logging (push/pull)
      38862: ALF-14335 consolidate Sync REST APIs.
        I've added new URLs to all sync webscripts (except cloud-sync.post.desc.xml as it's singshot) which start with '/enterprise/sync'
        I have not removed the existing URLs as I'll give the new ones time to go through the dev/QA/PM system. I will likely delete the old URLs in a week or so.
        I have also changed the URL patterns in code in all the places where I see an obvious and risk-free change. This may be them all.
      38855: Ignore testPull - does not work in automated build.
      38854: ALF-14549: Add Sync panel to Folder Details Page
      38851: Renamed the sync util methods
      38850: ALF-14549: Added a panel to folder details page
      38848: merge conflict fixed
      38846: Merged from integrations/GoogleDocs/BRANCHES/THOR1_SPRINTS_GOOGLEDOCS to alfresco/BRANCHES/V4.1:
         - 31695 THOR-367 - #2 Document Library
         - 36307 Fixed THOR-1402 "Need a callback option for Create Content menu"- Will be revisited to add better comments
         - 36350 Fixed THOR-1402 "Need a callback option for Create Content menu" part 2- Changed callback obj to match action object better: { nodeRef, node, jsNode }
         - 36358 THOR-1402 "Need a callback option for Create Content menu" part 3- Changed "link" parameter to "href" (instead of "page") to match actions.
      (Changes by Erik, required for Google Docs minus changes made to privatemodules )
      38844: I have changed all occurrences of 'master' and 'slave' to 'source' and 'target' and these are the terms we should use to identify the two Alfresco instances in future.
      I believe that the only place this has leaked out into the remote API is at syncsetdefinition.post, which had a 'lockMasterCopy' parameter. This is now renamed to 'lockSourceCopy'. However, as that parameter was not supported on the back end, existing client software should continue to work.
      38839: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/V4.1:
         38835: CloudSync: minor cleanup (remove some obsolete code)
         38838: ALF-14907 Adding syncOwner firstName, lastName, userName and local root nodeRef to the remotesyncednode.get webscript.
      38837: Extra sanity checks
      38805: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/V4.1:
         38775: CloudSync: F24 subtask - ALF-14853 - move nodes "within" existing sync folder hierarchy 
         38782: ALF-14549: Add Sync panel to Doc Details Page
         38784: ALF-14549: (css fix)
         38798: Cloud sync component test - try injecting (lower case) transport bean directly.
         38799: Fix for community builds which do not have enterprise/repository.properties
      38802: Remove dev webscript that was incorrectly merged across (reverse merges r35946)
      38774: Fix broken merge of r35436 from BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/V4.1:
         - Extends Doc Lib indicator config to support javascript actions on icon click
      (method had been refactored for ALF-12955)
      38773: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/V4.1:
         38703: Sync Tracker Component - First integration test of end to end push.
         38704: CloudSync: F31/F32 - add option to request delete of node(s) on target when unsync'ing
         38706: CloudSync: F24 - fix "rename" of a synced subfolder
         38712: build fix?
         38713: missed check in
         38714: ALF-14549: Add Sync panel to Doc Details Page
         38737: Sync Tracker Component Test - New test knocked over by changes to add person service.
         38743: CloudSync: F24 sub-task: ALF-14731 - fix SyncTracker (PUSH) such that nodes are processed in event order (earliest event for each node)
         38761: ALF-14549 (Added a new evaluator so that the sync panel will be only shown when the node has been synced)
         38763: ALF-14549 (Reverting the code from r38761 because the sync panel should be shown whether or not the node is synced)
         38767: Sync Tracker Component test - first pull.
         38769: CloudSync: delete + ano '=> delete 
      38700: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/V4.1:
         38685: ALF-14910: Sync Status dialogue's {status} info needs to be rendered on the server
         38686: CloudSync: ALF-14779: push delete 
         38687: Fixes: ALF-14871 - Uses a server side redirect for view in cloud URL (rather than returning JSON) to avoid pop up blockers and funny new window behaviour associated with window.open
      38699: A few more little bits missing from merges
      38698: Enterprise Repository.Properties needs to be included in a way that works for community builds (which won't have one)
      38691: Enterprise shouldn't be in core community services
      38690: Avoid double merge issue
      38689: Couple of context changes that got lost in merging
      38688: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/V4.1:
         38527: ALF-14549: Add Sync panel to Doc Details Page
         38537: ALF-14549: Add Sync panel to Doc Details Page
         38551: CloudSync: F24 - includeSubFolders (on SSD)
         38553: Do extra valdiation of cloud URLs when setting on the connector, and handle re-doing the RemoteTicketService initialization automatically if the URL or Key is changed at runtime (eg by a unit test)
         38555: ALF-14534: Add "include subfolders" HTML checkbox to cloud folder picker
         38557: Fixes bug where folder picker may keep spinning when loading folders.
         38562: CloudSync: F24 - includeSubFolders (on SSD) 
         38563: ALF-14893 - Bug from sprint 4 demo with conflict versioning.
         38565: CloudSync: F24 - includeSubFolders (on SSD) 
         38568: Bug fix
         38571: ALF-14534: Add "include subfolders" HTML checkbox to cloud folder picker
         38605: ALF-14542: Add "Request Sync" button to sync info dialogue
         38617: ALF-14542: Add "Request Sync" button to sync info dialogue
         38620: Add NodeServicePolicies.BeforeMoveNodePolicy (4.1)
         38628: Add NodeServicePolicies.BeforeMoveNodePolicy (4.1)
         38629: ALF-14779: push delete 
         38656: ALF-14598 Removed syncCreatorPerson property from code & replaced it with syncCreatorUsername.
               The d:noderef property is temporarily retained in the content model in order not to break anyone's DBs. It will be removed in a week or so.
               SyncTrackerComponent uses this userName when considering pushes/pulls but does check if the person exists.
         38658: Hides the sync action in the repository view
         38660: CloudSync: minor (change log level)
         38661: ALF-14779: push delete 
         38671: CloudSync: quick workaround fix for syncCreatorUsername
      38684: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/V4.1:
         38248: CloudSync: ALF-14708 - fetch for pull error handling
         38250: CloudSync: fix test (AuditToken NPE)
         38253: Fixed web script voodo for /sync/config - working for real now.
         38255: ALF-14525: CloudSync: Folder Sync - UI to enable current folder in Document Library to be synced
         38256: ALF-14551: Evaluator to determine if indicator icon should be displayed
         38258: Bug fixing for indicators. Synced idicator should not be shown if the sync failed idicator is shown. Also PropertyValueEvaluator has been deleted. The same result can be achieved with ValueEvaluator.
         38263: CloudSync: F29/F38 - Unsync web script: minor improvement - make use of common isDirectSyncSetMemberNode
         38264: CloudSync: ALF-14708 - fetch for pull error handling
         38265: CloudSync: F24 - recursive folders (wip)
         38267: CloudSync: ALF-14788 (F29/F38 sub-task) unsync of node (file or folder) should auto re-sync if it is below ano' parent folder sync
         38270: ALF-14625 remove sync:conflict aspect and props.
         38271: ALF-14541: CloudSync: Folder Sync - ensure sync'ed folder on target does not appear in source selector (when choosing target folder)
         38273: FIxes: ALF-14789 - minor bug in sync status dialogue
         38286: CloudSync: update AuditToken transport (pt I)
         38291: CloudSync: ALF-14790 - F4 sub-task - for pull of new node from tgt to src
         38301: Cloud Sync Status webscript updates: Finishes off: ALF-14593.
         38304: Adds Share support for access to "Big Switch" to turn Cloud Sync on/off & change mode. From Kevin. ALF-14773
         38315: CloudSync: update AuditToken transport (pt II)
         38317: CloudSync: update AuditToken transport (pt III) - fix unit test
         38324: MT: fix InvalidNodeRefException.getNodeRef()
         38325: CloudSync: create SSD - minor: logging + header lic
         38326: CloudSync: delete SSD - fix "transport" (use param not body for delete method)
         38333: ALF-14373. Added syncOwner property to SSMN aspect - this is copied from the SSD noderef when the member node is synced
         38335: CloudSync: ALF-14455 - push the SSD_TO_DELETE event to target
         38350: ALF-14545: Add error message for sync failed
         38351: ALF-14545: Add error message for sync failed
         38352: Reverted last commit (Deleted properties by mistake)
         38353: ALF-14394  cloud sync: Error details need to be returned over web scripts.
         38357: ALF-14760 - CloudSync: file sync with permission failure - AccessDenied on target causes repeated loop on source .
         38358: ALF-14760 - CloudSync: file sync with permission failure - AccessDenied on target causes repeated loop on source .
         38359: CloudSync: F24 - recursive folders (wip)
         38361: Bug fix for ALF-14545 (Cannot get the sync info if the content was successfully synced)
         38363: Adds syncMode to JS controller and improves error catching if nodeRef can't be found.
         38366: ALF-14751 - Localise sync version message
         38370: ALF-14666 - CloudSync: REGRESS - push/pull *update* no longer seems to work (metadata or content)
         38371: added enterprise repository.properties
         38374: Bug fix for ALF-14545 (css fix)
         38376: CloudSync: pull - invalid node 
         38380: ALF-14550: Cloud view for sync info dialogue
         38386: Added the enterprise/repository.properties
         38390: CloudSync: pull of new (folder) node from tgt to src
         38392: ALF-14608 - Synced (pulled) content must record a path to the Cloud nodeAdd the remote path to the version message
         38403: CloudSync: test fix (CloudTransportWebScriptsTest testPullChangedNodesForSSD)
         38404: Beefed up null detection on adding path.
         38407: Cloud Sync Evaluator and permissions sweep
         38411: Added TARGET_FOLDER_NOT_FOUND for Sync Service Create
         38418: ALF-14615 - Add global properties for CloudSync feature
         38422: ALF-14552: Changed the icon
         38429: ALF-14679 - The TransportService must transfer the locale of a document on sync
         38436: Adds proper syncOwner display to sync status dialogue. ALF-14293
         38437: Cleans up syncMode JSON.
         38445: Fixes error time display (ALF-14293)
         38446: CloudSync: minor (F24) - prevent indirect folder move for now (in same way as indirect file) - ie. cannot unsync indirect node
         38449: Minor Sync Status:
              - fixes template issue
              - minor css updates
              - adds support for "you" rather than current user's fullname in dialogue
         38461: CloudSync: temp build/tests fix - fallout from r38418 (ALF-14615)
         38469: ALF-14525: CloudSync: Folder Sync - UI to enable current folder in Document Library to be synced.
         38474: ALF-14525: CloudSync: Folder Sync - UI to enable current folder in Document Library to be synced. (Fixed the problem with an evaluator rather then fixing it in the JS side)
      38682: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/V4.1:
         38023: First pass at json based exception transport
         38036: CloudSync: F25.5 - directSync prop
         38045: CloudSync: fix couple of NPEs - one for SyncNodeException transport and one for F25.5 (existing node / unboxing)
         38046: CloudSync: follow-on to r38045 - F25.5 (existing node / unboxing)
         38047: CloudSync: follow-on fix for F25.5 / ALF-14695 (existing node / unboxing)
         38052: CloudSync: minor test fix - CloudTransportWebScriptsTest.testPushFolder
         38055: ALF-14604 - First cut of "doing the right thing" with versions.
         38056: CloudSync: F25.5 - directSync prop
         38057: CloudSync: (Folder) Unsync (F29 / F38) 
         38058: ALF-14604 - First cut of "doing the right thing" with versions.
         38059: Undo incorrect check in from r38055
         38061: ALF-14690 : Add time stamp property to sync:failed aspect.
         38062: ALF-14525: CloudSync: Folder Sync - UI to enable current folder in Document Library to be synced
         38064: Different message for sync conflict.  ALF-14607 : Synced (successfully pulled) content must lead to version creation
         38066: ALF-14541: CloudSync: Folder Sync - ensure sync'ed folder on target does not appear in source selector (when choosing target folder)
         38068: ALF-14690 - correction to model
         38073: Failing property was added
         38105: Sync Status updates:
              - Correct Handling for status text (minus missing syncOwner and errorTime properties)
              - Fixes link handling within the dialogue
              - Adds sync:failed banner to DocLib (as per wireframes)
         38106: s/Sync'ed/Synced/
         38107: return statement was missing
         38116: CloudSync: F4 (folder sync - immediate files) - ALF-14745: skip files that are already SSMNs
         38120: ALF-14555: Upload indicator icon and indicator config
         38121: ALF-14604 - Turn auto version off   (model defaults to true)
         38122: ALF-14525: Change the icon and the text for the button
         38125: Remove sync node ref on returning node not exists error from cloud.
         38132: Small bug fix - previous change to disable autoVersionOnUpdateOfProps was over-writing cm:modified
         38133: Adding javadoc of exception types so I know which one is which.
         38163: Adds link to DocDetails page (ALF-14546)
         38165: Better error handling if the remote nodeRef can't be found.
         38173: CloudSync: ALF-14501 (F13 / F14) - Request Sync
         38175: ALF-14556: Refactor dialogue to be based on the DAM info popup 
         38176: ALF-14556: Refactor dialogue to be based on the DAM info popup (Merge conflict fixed)
         38180: ALF-14540: Add "Request Sync" doc lib action
         38187: Changed the properties for Request sync
         38188: Fix for ALF-14657 Add targetParentNodeRef to remotesyncednode webscript.
         38191: ALF-14542: Add "Request Sync" button to sync info dialogue
         38199: ALF-14575 - Wire up big switch to turn on or off Cloud Sync
             - addition of the big switch - does nothing at the moment.
         38200: ALF-14540: Add "Request Sync" doc lib action
         38201: Sync Change Monitor not enabled if big switch is "OFF"
         38202: Sync Tracker does nothing if not on premise.
         38205: CloudSync: ALF-14708 - fetch for pull error handling (wip)
         38213: Correction to sync tracker component.
         38221: ALF-14271 Move the registration of Cloud with the RemoteTicketService to bootstrap, to avoid audit problems during init
         38235: Work in progress on Rest call for /sync/config
              (Hard coded ON_PREMISE - cant get ${syncMode} to work)
         38236: minor formatting
      38680: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/V4.1:
         37715: Check in empty SyncTrackerComponentTest
         37716: ALF-14338 - extends unit test for SyncServiceImpl create method
         37717: Ignore imcomplete tests checked in by r37715
         37721: CloudSync: Folder Sync - ALF-14566: add behaviours to add/remove SSMN
         37724: Update SyncNodeException to use an enterprise-only message bundle for the exception detailed error message. This message can potentially also be re-used on the UI
         37728: Add unit tests for pushing a cm:folder through the transport. (Works much like an un-versioned node with no content changes)
         37734: Start to migrate the remote ssd creation calls out of SyncAdminService, and to CloudSyncSetDefinitionTransport, removing migration TODOs in the process
         37735: Migrate the deleteSSD remote call from SyncAdminImpl to CloudSyncSetDefinitionTransport
         37736: Have the deleteSSD transport layer properly handle/transport NoSuchSyncSetDefinitionException
         37737: Review and add SyncNodeException and NoSuchSyncSetDefinitionException to node level transport webscripts where needed
         37741: Refactor on-enterprise sync transport exception handling, to work for both push and pull cases, and start to support the same degree of handling for pull
         37767: CloudSync: Folder Sync: ALF-14590 - disallow individual unsync of file (or sub-folder) if member of a folder sync
         37785: CloudSync: fix mockito tests (ssmChangeManagementTest)
         37787: CloudSync: fix mocked unit test (nodeRef format + authorization)
         37791: CloudSync: fix more mocked unit test (nodeRef format + authorization)
         37797: The folder picker showed a second button without text when "secondaryTenants" was empty.
         37803: Ripped out adding sync:conflict aspect and implemented "cloud wins" conflict resolution.   
         37820: CloudSync: build/test fixes - TEMP ignore push/pull test - to see if it affects follow-on tests (or not)
         37823: CloudSync: Folder Sync - ALF-14566: add behaviours to add/remove SSMN
         37843: Typo correction
         37844: ALF-14580: View In Cloud action should open links in new window
         37846: ALF-14453: CloudSync: Create sync UI - shows site twice and also title shows "title.multi"
         37850: CloudCloudSync: Folder Sync: ALF-14624 - create file on target (within sync'ed folder) and then pull to source
         37870: ALF-14540: Add "Request Sync" doc lib action
         37871: ALF-14543: Add "Request Sync" multi-select action trigger
         37883: Support for transporting the node path, for use in messages and displays, and update the tests to cover this
         37888: "Sync to cloud" and "Request sync" actions were not available for multi-select action trigger
         37890: CloudSync: ALF-14647 - failing unit tests ...
         37894: CloudSync: ALF-14651 - after push, the source node may appear modified by "System (User)"
         37895: Temporary work around for Transport of SyncNodeException - exception does not contain "cause" its all "precondition failed".
         37902: ALF-14292: Add check box to disable auto-sync
         37903: ALF-14537: Add HTML checkbox to lock src copy 
         37908: CloudSync: SyncService.fetchForPull 500 error => map InvalidNodeRefException to SyncNodeException
         37909: CloudSync: ALF-14656 - create folders before files (when pushing a sync set)
         37912: ALF-14661 & ALF-14662: Add sync:syncSetMemberNode and sync:failed filters to Doc Lib.
         37922: Fix up exception messages - must be defined in the message file, not in comments
         37923: Tidy up a little the exception building
         37924: CloudSync: doFetchAndAction 500 error => map InvalidNodeRefException to SyncNodeException
         37944: Swallow SyncNodeException from PULL.
         37947: Adding aspects to the node as a requirement for ALF-14541
         37949: Cloud Sync F26/F93 (WIP): 
              - Adds View in Cloud link to location if it can't be retrieved: ALF-14464
              - Swaps dialogue date rendering from relativeDate to relativeTime w/ hover state: ALF-14539
              - Adds support for unsynced nodes: ALF-14528
         37951: ALF-14597: Remove previously needed UI conflict indicators
         37956: ALF-14554: Create evaluator & update existing evaluators
         37957: Merged HEAD to BRANCHES/DEV/CLOUDSYNCLOCAL2:
              37952: Added new API methods to template Site helper - to retrieve Share URL stem and Share URL for a given site.
         37958: Adds shareURL to metadata object in node data webscript
         37961: More debug in SyncServiceImpl
         37964: CloudSync: ALF-14271: workaround startup error (init -> bootstrap sequence) for CloudConnectorService/RemoteAlfrescoTicketService
         37965: ALF-14666: CloudSync: REGRESS (?) - push update no longer seems to work (metadata or content)
         37967: ALF-14440 : Creating sync file when target already has a file of the same name -> causes 500 error
             Removed a TODO: It is correct to throw an exception rather than over-writing a node.
         37970: Fixes JSON that was broken in r37958
      38677: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/V4.1:
         37534: Transport for double and float property values
         37537: CloudSync: SyncServiceImpl - minor: start to cleanup debug logging (to make it more useful / consistent)
         37538: Quick fix for the NullPointerException in ALF-14449.
         37539: CloudSync: ALF-14378 - pull sync changes - only the target nodeRef is required
         37540: Fix up the pull unit test, and add tests checking all the different kinds of property value transport
         37542: Add unit tests for notification of a conflict through the transport layer
         37553: ALF-14445 After changing the cloud url for use with the local loopback connector, re-init the service to ensure the url passes all the way down the stack
         37555: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/CLOUDSYNCLOCAL2:
              37554: Follow-on fix to ALF-9661 - do not fire update rule (onDeleteAssociation) if node also no longer exists
         37556: ALF-14445 After changing the cloud url for use with the local loopback connector, re-init the service to ensure the url passes all the way down the stack
         37558: Fixes "View In Cloud" link
         37563: Avoid exceptions in the logs for expected problem cases of Conflict and Not Currently Acceptable (cloud busy etc)
         37565: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/CLOUDSYNCLOCAL2:
              37564: Pull out some bits to constants, so downstream classes can more easily configure themselves
         37567: ALF-14356: Updates look and feel of user profile cloud sync panel as per wireframes.
         37574: Call version service to ensure cloud nodes are versioned.
         37575: ALF-14430 - First conflict on both ends.
         37576: CloudSync: ALF-13948 - F29 (Unsync)
         37597: Temporarily disable the failing SyncServiceImplTest.testCreate so we can get green builds
         37600: CloudSync: follow-on to r37597 (temporarily disable/ignore unit test)
         37611: Fix for: ALF-14461: Site manager can't unsync content.
         37616: CloudSync: SyncTracker (push) - ALF-14459: One failed sync causes subsequent (unrelated) syncs to fail
         37617: ALF-14464 - For now, slightly ignore "unauthorised" error when attempting to get cloud location.
         37619: Stub out some CloudSyncSetDefinitionTransport unit tests, and begin with testing handling of connector exceptions
         37622: Unit tests for exceptions from the connector for SyncMemberNodeTransport
         37629: ALF-14460 - Content edits of synced documents lead to failed syncs
         37631: Reinstate SyncServiceImplTest.create
         37639: CloudSync: ALF-14358 - REST API to get SyncSet Changes
         37640: CloudSync: ALF-14378 - SyncTracker PULL - remove x2 temp to lookup/set sourceNodeRef ...
         37650: CloudSync: ALF-14248 - remove auditing of "create SSD" (since it is now synchronous) and fix up unit tests and other related ref's
         37660: CloudSync: fix build/test (SyncAuditServiceRestApiTest.testGetSyncSetChanges) 
         37669: Enables folder sync actions in the UI
         37680: Support, and unit tests, for transporting multivalued node properties, and mltext node properties
         37682: ALF-14514 : Added aspect sync:failed
         37686: Add unit tests for the Sync Set Definition transport webscripts, and start on tests for the transport of cm:folder
         37688: ALF-14338 - Introduce SyncNodeException.
         37689: CloudSync: folder sync: ALF-14521 - update SyncSetDefinitionPost
         37698: Convert SyncNodeException to be backed by an Enum, so we can effectively transport the different types of problem. Adds an initial list of problem enums, which are message backed (but not yet in properties)
      38672: Fix up merge problems
      38665: ALF-13260: Mysql does an awful planification of ibatis "select_ChildAssocOfParentByName" query after some heavy load
         - improved "select_ChildAssocOfParentByName" where clause to engage existing index
      38662: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/V4.1:
         37061: ALF-14265 - CloudSync: fix failing tests - Activiti/JBPM WorkflowRestApiTest*
         37071: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/CLOUDSYNCLOCAL2:
              35409: Merged HEAD to BRANCHES/DEV/V4.0-BUG-FIX:
                   35399: ALF-12874: Schema reference files are out of date.
         37072: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/CLOUDSYNCLOCAL2:
              35781: Fix for MySQL part of ALF-13150: Performance of Purging Empty Transactions (like 10M)
                   ALF-13839: MySQL: "Failed to purge txns" from DeletedNodeCleanupWorker
                   - Added MySQL override of the NodeDAO for this call with a dedicated DELETE ... JOIN ... for MySQL
         37077: Fix how we pull the mimetype and encoding of the content from the content type, and add unit tests for this
         37078: Reverse accidental property change
         37084: Cloud Sync Push - Work in progress.   Adds 2 new methods to the cloud sync member node transport.    And an "AuditToken" opaque type.
         37118: Implementation of ALF-14324. Get Cloud NodeRef, Network for specified local syncset member node.
         37132: ALF-14324 Changed API so that if a remotesyncednode has no matching remoteNodeRef (due to not being synced) then the JSON field is not rendered. It had been rendering an empty string.
         37133: ALF-14324. I forgot to check in the associated test code edit for previous checkin. (37132)
         37136: Cloud Logins need to occur on the default network (we have no others until after login)
         37139: Upgrade to Commons FileUpload 1.2.2, and add in the source
         37147: Start on the FileUpload support for the pull case, and begin sending appropriate request data
         37150: Added a package-info.java to document the main components of the feature. (Ongoing)
         37153: ALF-14324. Tweak to URL for remotesyncednode.get. NodeRef as query param, rather than template arg.
         37166: Refactor things to allow for re-use in the Pull code flow, and mostly implement the Pull code. Initial tests added, but needs a real service call to fetch the SyncNodeChangesInfo before the rest can be done
         37182: ALF-14334: update CloudSyncSetDefinitionTransport to call REST getSyncSetManifest
         37183: ALF-14334: fix "syncsetmanifest" descriptor
         37187: ALF-14334: fix build/unit test (tearDown)
         37198: Minor: test improvement - fix format of dummy nodeRef
         37201: Cloud Sync - Cut over sync jobs.
         37203: Changed cron expression.
         37206: CloudSyncTrackerComponent - minor locking changes.
         37220: SyncTrackerComponent.pushSyncSet - runAs syncCreator
         37221: Fixes broken JSON
         37227: Add the pull support method to SyncService, stub out some more tests, and add AuditToken related TODOs in appropriate places
         37229: Pull unit tests
         37237: CloudSync: ALF-14358 - REST API to get SyncSet Changes - list of target nodeRefs (with changes) for a given ssdId
         37238: CloudSync: ALF-14312 - REST API to get SyncSet Manifest
         37248: ALF-14287: Fixes Cloud Folder picker to work with real cloud instance.
         37249: Minor revision bump on JSON-Simple, and attach the source
         37251: Implement AuditToken, initially taking SyncChangeEvent objects and storing just the full list of audit IDs for them. AuditToken handles the JSON serialization itself, with the Transport delegating. Adds unit tests
         37262: ALF-14287: Fixes handling for invited networks
         37277: SyncTrackerComponent.pullSyncSet - runAs syncCreator
         37283: ALF-14287: Fixes bug when folder picker is loaded repeatedly.
         37285: Store OtherNodeRef as String on the cloud end.
         37286: Pass-Through URLs are decoded in the surf layer, so re-encode before requesting
         37290: Tweak URL encoding used to not escape /
         37294: Update teh json-simple dependency definition to match change yesterday
         37306: Update jar names in build files which hard code things
         37309: CloudSync: ALF-14358 - REST API to get SyncSet Changes - list of target nodeRefs (with changes) for a given ssdId
         37310: SyncTrackerComponent.pullSyncSet - TEMP change to determine/set the sourceNodeRef ...
         37314: Fixes build so that it adds client side cloud files to documentlibrary actions js
         37316: Stub out the webscript for accepting the confirmation of a pull
         37319: Add method to "confirm" (delete) audit ids from an AuditToken
         37322: Sync tracker component - Error processing for missing sync set owner
         37324: API updates for the Pull Confirm, and start on the transport
         37325: Fix compile error - apparent fallout from r37322 (missing svn up ?)
         37331: Implement the confirm pull logic in the webscript (calls SyncAuditService to do the real confirmation), and start on unit test for this (more to follow tomorrow)
         37342: Minor: SyncTrackerComponent
         37349: SyncTrackerComponent.pullSyncSet
         37355: CloudSync: SyncTracker - minor: debug logging is quiet when nothing to do ...
         37365: CloudSync: ALF-14358 - REST API to get SyncSet Changes
         37367: Ongoing work to SyncTrackerComponent.
         37376: cloud sync - TODO comment updates
         37379: ALF-14292 - Refactor cloud sync status code.
         37380: WIP - Doc Lib Synced Content Filters
         37381: WIP - View in cloud URL wrapper.
         37438: CloudSync: ALF-14358 - REST API to get SyncSet Changes
         37440: CloudSync: possible fix for failing unit test (SyncAuditServiceIntegrationTest.queryForSsdManifestAndDetails) -> disable jobs(sync tracker)
         37442: CloudSync: temporarily comment out CloudTransportWebScriptsTest.testConfirmPull unit test (NB is updating + fixing)
         37446: ALF-14396CloudSync: PULL - fix source modifier (currently appears as "System User")
         37461: Add equals method to allow easier unit testing, and a toString to help with debugging
         37462: Fix up the confirmPull transaction handling to solve the test failure, then expand out the unit testing to cover this new code
         37463: Set conflicted aspect on local node after pull conflict.
         37474: Fixes: ALF-14427: Adds missing icon for multi-select sync action.
         37476: ALF-14425 - When a synced node is copied, its syncSetMembeNode aspect must not be copied
         37486: Start of sync transport refactoring to support pushing conflict and unsync details
         37489: Enhances Balloon dialogue to detect other balloon pop ups and hide them to prevent overlapping balloons.
         37490: Initial transport support for pushing the details of a conflict over. (Tests to follow)
         37494: ALF-14289: Adds Conflict Icon and Balloon.
         37495: Stub out un-sync and push conflict tests, full checks to follow
         37496: Rework to SyncTrackerComponent to deal with conflicts only on pull.   And lock against push and pull of the same node at the same time.
         37500: CloudSync: ALF-13948 / ALF-14404 - F29 (Unsync)
         37501: Correction to previous check in.
         37504: Add unit tests for un-sync and delete
         37505: CloudSync: remove obsolete OnPremiseSyncJob (superceded by push/pull jobs)
         37507: Unit tests for Push Conflict
         37511: Fix for ALF-14428. Metadata are not extracted for synced nodes.
         37512: ALF-14279: Displays remote path, including network, site and document. (WIP: Links still need fixing...)
         37513: Addendum fix to ALF-14428. Now also sending cm:author and cm:geographic metadata
         37520: CloudSync: ALF-13948 / ALF-14404 - F29 (Unsync)
         37522: ALF-14283: Missed file from previous commit
         37527: SyncTrackerComponent - removed node locking.   Realized it was not cluster safe - so the stuff has to work without locking.    I think it does now.
         37528: ALF-14396  CloudSync: PULL - fix source modifier (currently appears as "System")
         37530: Cleans up the cloud folder picker init & removes bug with -default- getting sent as the networkId during SSD create.
      38659: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/V4.1:
         36246: Start to wire up the transport and on-cloud services
         36250: Interface change to SyncService + beginnings of implementation.
         36251: Tweak webscript definitions, and add comments to explain a few bits
         36253: Start on unit tests for the transport - test framework and suitable mock services for testing
         36257: Start on the sync transport unit tests
         36258: Bit more on the cloud transport testing, and disable the bit for now that depends on more of the transport being implemented
         36261: Sync Service - More implementation.
         36280: Added aspect sync:synced to remember when we last successfully synced.
         36288: Implement a few more bits of the transport service, fix the way the charset and boundary information is sent, and a bit more of the tests
         36293: Nobble the sync webscripts in the unit test to use our mock service, then expand the tests to query+check the mock for what was sent through
         36305: First unit test of SyncService.create method.
         36315: Update the method signature on SyncAdminService, to match the pattern used by the other services WRT cloud credentials. Then, fix up credentials related TODOs in the service and webscript, and fix tests to match
         36319: Test basic integration between sync-sets and the cloud sync transport
         36353: Support for encoding and decoding non-content properties, and content properties which have been removed
         36359: ALF-13960. Partial implementation. REST API for the creation of SSDs on the Cloud.
         36360: Versions of the CloudConnector and CloudSyncOnCloud services suitable for unit tests
         36396: Tweak exception inheritence to better fit with transaction rollbacks, and finish the sync occurr/proceed unit tests
         36400: Expand the push sync unit test coverage, to include aspects and properties
         36401: adding toString method for better debug.
         36402: Sync Service: event suppression working so create method now does not report false conflicts.
         36403: More sync push tests, content parts still TODO
         36410: Fix for failing test cases on Bamboo.
         36414: Finish the push content unit tests, including a fix for a missing runAs, and an option not to tidy up temp files immediately so that the unit tests can still find their contents after the transaction
         36415: Add unit tests for SyncServiceImpl delete and remove from sync set.
         36417: Tweak to SyncAudit event disabling - centralised in SyncChangeMonitor. Required for upcoming changes in SyncAdminService
         36420: Preventing auditing of SSD_CREATED when creating Cloud SSDs.
         36429: Impl of ALF-14147. Create a CloudSync subsystem.
         36439: SyncService - unit test for update.
         36462: SyncService Impl - added tests for update content and setting cm:modified + fix for update which forgot to set modified.
         36557: Adding audit ids to SyncNodeChangesInfo. Part of ALF-13962.
         36558: ALF-13962 Some utility methods on SyncChangeEvent.
         36559: ALF-13962 Methods on SyncAdminService to check node membership.
         36561: ALF-13960 Ensure that syncsetdefinitions are created in a transaction.
         36567: ALF-13962. Conversion of audit entries into required SyncNodeChangesInfo object.
         36568: ALF-13962. package-info documentation.
         36571: ALF-13962. Expose the properties/aspects configured for tracking - as required by SsmnChangeManagement.
         36573: ALF-13962. Addition of extra property in sync model.
         36575: ALF-13960, ALF-13961, ALF-13963
         36586: Avoid sending dummy credentials when creating a sync set, as real ones are now supported
         36644: Fixes syntax error when files are concatenated.
         36807: Mark manually merged change
         36812: CloudSync: ALF-14250 - record source repo id (related to SSD) with all sync audit entries
         36848: CloudSync: ALF-14250 - record source repo id (related to SSD) with all sync audit entries
         36856: ALF-14270 Ensure that the sync:syncSetDefinition QName is forcefully created during system startup.
         36865: When storing cloud credentials, return information in the json to distinguish the two failure cases
         36866: When storing cloud credentials, return information in the json to distinguish the two failure cases
         36878: ALF-14270 Move the call to create the remote SSD from the audit event-handling code to a synchronous call within SyncAdminService.createMasterSyncSet()
         36897: Adds ALF-14286: Shows user a "validating" message whilst the auth details are being validated.
         36903: CloudSync: ALF-14250 - record source repo id (related to SSD) with all sync audit entries
         36914: ALF-13961 Minor tweak ro OnPremiseSyncJob (runas in order to have valid SecureContext).
         36916: Start to rename CloudSyncTransportService to CloudSyncMemberNodeTransport
         36918: Define the SSD Transport Service
         36919: Comments out UI toggles for features that don't (yet) exist deeper down the stack.
         36921: ALF-14297 This check-in completes the tests for change log entry aggregation and adds detection of non-uniform NodeRefs
         36924: Work in progress on sync push and pull jobs
         36926: Stub out a dummy implementation of CloudSyncSetDefinitionTransport. (Needs remote webscripts and service calls before it can be properly implemented)
         36931: Fix an autounboxing NullPointer error.
         36937: ALF-14262 CloudSync: fix failing test cases for CLOUDSYNCLOCAL2 branch
         36955: CloudSync: ALF-14298 - SyncAuditService: provide query to get ssd manifest for a given sourceRepoId 
         36967: Fix CloudTransportWebScriptTest unit tests - contract is null not empty
         36975: Some useful collection helper methods that I'm about to use elsewhere.
         36979: ALF-14297 Build fix. Refactor of SsmnChangeManagement to respect SyncNodeChangesInfo's use of null collections for 'no change'
         36980: Ensure audit entries are deleted on push (old sync job)
         36987: Push Job work in progress.
         37017: CloudSync: ALF-14312 - REST API (for SyncAuditService) - query to get SyncSet Manifest
         37028: Changes to SsmnChangeAggregation so that the ContentReaders are set correctly.
         37029: Fixes to failing test cases.
         37035: CloudSync: ALF-14298 / ALF-14312 - SyncAuditService: provide query to get SyncSet manifest
         37049: Fix failing rest unit test - wire the Mock Cloud Connector up to the WebScripts too, not just the services
      38655: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/V4.1:
         35946: Do not merge - dev helper webscript for checking chunking and multi-part requests are behaving correctly
         36016: Miscellanous minor improvements as part of tidyup.
         36017: Trivial changes to non-product code for demo.
         36088: Stub out how content changes will be handled
         36116: Version Labels, Stub (with a bad name...) service to check about sync allowed + intervals, and much more of the encode/send/webscript/decode code
         36157: SyncService methods - no-op implementation.
         36163: Fix typo in url generation
         36167: adds View In Cloud action
         36171: Support sending and getting the local and remote parent noderef (especially important for create)
         36175: Add json helper methods for common types
         36181: First cut of aspect sync:conflict to mark conflicted nodes.
         36182: Extend SyncService API.
         36195: Transport support for the list of aspects added/remove
         36201: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/CLOUDSYNCLOCAL2:
              36193: Pull out the Thread-local HttpClient creation from RemoteClient, and expose. Will go back into Surf at some point
              36194: Convert to using the ThreadLocal HttpClient instances, and some extra steps to ensure we always tidy up after ourselves now the instance is shared
         36205: Update Services to match new plan agreed yesterday, and start to wire the implementations up to the work Mark is doing
         36207: Finish the initial version of the sync push webscript, which largely uses other services to decode the request and have it actioned
         36208: Initial support for wrapping a delete/unsync call with all the details, before passing on to the SyncService to perform
         36209: Refactor the push webscript, so most of the logic for decoding the request is in a parent class, and then stub out the delete / unsync webscript built on top of the new common abstract parent
         36212: Build fix.
         36213: Trivial tweaks to test code.
         36214: Cleanup of temporary nodes created during test execution.
         36215: Changing syncChangeMonitor behaviour binding to onBootstrap rather than during spring init.
         36216: Moved audit model for SyncChanges into an enterprise folder.
         36217: Build fix (2)
      38653: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/V4.1:
         35543: Start on the Enterprise/Cloud simple Tenancy information webscript
         35551: Make it easier to override bits of TenantInformationGet
         35629: Mark merges that have been done
         35638: Mark merges that have been done
      38651: Mark revisions which were implicitly merged via 4.0bf
      38646: Mark revisions which were implicitly merged via 4.0bf
      38643: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/V4.1:
         35959: Stub out part of the cloud sync transport code and webscripts, which will handle getting changes between the on-premise and cloud repos
         36005: UI Updates for Cloud Sync Sprint 2:
              - Node Path Webscript (WIP)
              - Adds Sync Status Webscript
              - Adds Unsync option
              - Tweaks Doc Lib Indicator action call to include target element (makes it easier to position balloon dialogues).
         36006: Start on implementing the transport code, and a few tweaks to the plan as identified by the implementation so far
         36013: Broadened the aspect behaviour binding so that it captures all relevant aspect addition/removals.
         36015: Missing class from previous checkin (36013)
      38642: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/V4.1:
         35690: Merged BRANCHES/DEV/V4.0-BUG-FIX/ to BRANCHES/DEV/CLOUDSYNCLOCAL2:
              35689: Add the NameSpace constants for the Links model
         35697: Improve Network detection, and avoid passing the network parameter on the URL to the cloud
         35701: Enable another URL for passthrough
         35713: Filling out the data in the REST APIs for POST & GET SyncSetDefinition.
         35717: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/CLOUDSYNCLOCAL2:
              35716: Make overriding just the Share URL easier (needed for Cloud installs)
      38641: Mark r35681 as already merged
      38640: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/V4.1:
         35615: Cloud Sync: Fixes URLs to temporary APIs.
         35642: Mostly implementation of syncsetmembership.delete.
         35644: Fixing a failing test case. More fixes to come...
         35662: Cloud Proxy Pass-Through for /slingshot/doclib2/node as /cloud/doclib2/node
         35681: Merged BRANCHES/DEV/V4.0-BUG-FIX/ to BRANCHES/DEV/CLOUDSYNCLOCAL2:
              35679: Fix DataList QName hard-codings by pulling out to a proper Model Java Constants Interface
      38639: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/V4.1:
         35508: Sync Audit Service progress.
         35509: Fixing up some broken imports, no other changes.
         35510: Add some debug logging to the cloud connector service, and expand the WebScriptPassThrough tests and underlying auth helper
         35544: Remove accidental property change in last commit
         35561: Support proxying the Tenant Information webscript to the cloud as the current user
      38637: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/V4.1:
         35440: Better handling of requests with no request body
         35441: More Cloud Connector Pass-Through unit tests, including a dummy webscript (test only) which can be used to check who a request was proxied as
      38636: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/V4.1:
         35385: Stop aliasing local webscripts into cloud urls, we now have the proper pass-through proxy
         35387: Allow Enterprise Remote API tests to see Enterprise WebScripts - fix the Enterprise Remote API classpath in Eclipse, and add BaseEnterpriseWebScriptTest which brings up the server including the entprise context file
         35403: REST Unit Test for the Cloud Credentials CRUD WebScripts, and stub out the Cloud WebScript Pass-Through unit tests
         35436: Extends Doc Lib indicator config to support javascript actions on icon click
         35437: WIP: Indicator config, i18n string and stub function for Cloud Sync status display.
         35439: Support a special TESTING method, and have requests done explicitly as Guest if no cloud credentials exist
      38635: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/V4.1:
         35333: Start on enabling the Cloud Proxy PassThrough for certain key webscripts that the UI needs
         35363: Adjusts credentials success check following a change in the API last week.
         35382: Adds ability to delete Cloud credentials from the My Profile page.
         35383: Removes unused Sync Now function
         35384: Adds cloud folder picker JS to combined action files so that sync works without debug mode.
      38634: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/V4.1:
         35238: Implement the Cloud Credentials Get webscript, powered by the new services, and provide a cloud webscript helper superclass
         35282: Cloud Sync Audit.
         35283: Enable the credentials get/set webscripts to work (fixing an authentication issue), and initial work on proxy webscript
         35287: Cloud Sync Audit. Support for deletion of Sync Audit entries.
         35315: Service, WebScript and tests for deleting remote ticket based and cloud credentials
      38633: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/V4.1:
         35236: Add the CloudConnectorService, which wraps the underlying remote services in a cloud specific way (base url, system id, key etc)
      38623: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/V4.1:
         34882: First cut of SyncChangeMonitor feature.
         35027: Adds ability to select target network & plumbs in the options, makes it easy to add more options.
         35110: Adds support for hasAspects and notAspects attributes to Doc Lib multi-item select.
         35113: Cloud-Sync: Adds multi-file sync action.
         35122: A big chunk of Sync Audit Service work.
      38622: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/V4.1:
         34717: Merged BRANCHES/DEV/CLOUDSYNCLOCAL to BRANCHES/DEV/CLOUDSYNCLOCAL2:
              34403: Adds DocLib action, indicator config and labels, along with start of evaluator config.
              34404: Adds action implementation & cloud folder picker alfresco module, with template webscript. Modifies build to include new js file in concatenated doclib action file.
              34405: Modifies the Global File picker to make the API calls more extendable (e.g. for use in Cloud Sync).
              34481: Adds ability to enter cloud auth details from user profile page. Needs a little bit of refactoring once the APIs have been finalised
              34482: Adds Work In Progress on Cloud Auth prompt
              34667: WIP: Mocked up APIs - formats mostly merged from demo
              34687: Initial cut of part of SyncAdminService which manages CRUD of SyncSetDefinitions.
              34688: The most basic documentation the webscript.
              34693: Action and Indicator icons from Linton
              34694: Inline Cloud Auth Details Dialogue
              34695: Cloud Synced Indicator updates
              34714: Creates sync set when a folder is chosen.
         34744: Fixes bug where multiple actions were triggered for each successive click on the Cloud Sync action
         34745: Updates Evaluator with name of actual aspect applied to items in a sync set.
         34757: Merged HEAD to BRANCHES/DEV/CLOUDSYNCLOCAL2:
              34289: Upgrading JUnit lib to 4.10 to get full Rules support.
              34317: Some initial documentation on JUnit Rules samples.
              34328: More JUnit rules fun. Added a new rule to help with the creation and automatic cleanup of temporary test nodes.
         34759: Merged HEAD to BRANCHES/DEV/CLOUDSYNCLOCAL2:
              34290: Fixing Eclipse settings following on from previous JUnit lib upgrade. (rev 34289)
              34297: Build fix. Eclipse project was still referring to the old JUnit lib.
         34765: Fixes a couple of typos before today's Sprint demo. Success and error messages now correctly display following sync action.
         34782: Merged HEAD to BRANCHES/DEV/CLOUDSYNCLOCAL2:
              34777: Added enhancement to TemporaryNodes rule to allow for dummy content.
         34806: Merged HEAD to BRANCHES/DEV/CLOUDSYNCLOCAL2:
              34805: Added a convenience method to the ApplicationContextInit @Rule to allow for easier spring overriding in test code.
         34825: Merged HEAD to BRANCHES/DEV/CLOUDSYNCLOCAL2:
              34824: Utility methods to get details of property changes (map comparison).
      38619: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/V4.1:
         36805: Tweak exception inheritence to better fit with transaction rollbacks
         36806: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/DEV/V4.0-BUG-FIX:
              36556: A useful collection conversion utility method.
      38616: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/V4.1:
         36366: Tweak to implementation to ensure that on-authentication-failed, the status is updated within a r/w transaction.
         36374: Provide more specific exceptions from the Remote Connector Service for client and server errors
         37348: ALF-14386 - RemoteConnector: NPE if responseBody is null (eg. HTTP 204)
         37411: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/CLOUDSYNCLOCAL2:
              37410: ALF-14386 HttpClient returns a null byte array if there is no response body (eg 204), swap that for an empty array to avoid NPEs and better fit the interface contract
      38559: Merged PATCHES/V4.0.2 to V4.1
         38364: Merged V3.4-BUG-FIX to PATCHES/V4.0.2
            36421: ALF-14914: Fix for Mac Lion versioning issue. ALF-12792 (Part 1 of 2)
               Enable the InfoPassthru and Level2Oplocks server capability flags, InfoPassthru is the flag that fixes the Mac Lion versioning error.
               Added support for filesystems that do not implement the NTFS streams interface in the CIFS transact rename processing, for the Alfresco repo filesystem.
            36422: ALF-14914: Fix for Mac Lion versioning issue. ALF-12792 (Part 2 of 2)
               Enable the InfoPassthru and Level2Oplocks server capability flags, InfoPassthru is the flag that fixes the Mac Lion versioning error.
            36423: ALF-14915: Add support for file size tracking in the file state. ALF-13616 (Part 1 of 2)
            36424: ALF-14915: Fix for Mac MS Word file save issue. ALF-13616 (Part 2 of 2)
               Added live file size tracking to file writing/folder searches so the correct file size is returned before the file is closed.
            36491: ALF-14915: Added CIFS transact2 NT passthru levels for set end of file/set allocation size. ALF-13616.
               Also updated FileInfoLevel with the latest list of NT passthru information levels.
            36703: ALF-14916: Fix for Mac Office 2011 Powerpoint save fails on CIFS. ALF-13615.
         38367: Merged V4.0-BUG-FIX to PATCHES/V4.0.2
            37630: Process queued responses at the end of the thread request run, before re-enabling socket read events. ALF-14179, ALF-14180.
         38368: Merged V4.0-BUG-FIX to PATCHES/V4.0.2
            37067: ALF-13294	CIFS: When versionable aspect is active, using the Microsoft Word for Mac 2008 option "always create a backup copy" leads to document versions loss
      38244: ALF-14785: Merged V4.0-BUG-FIX to V4.1
         37482: ALF-14437: Merged HEAD to V4.0-BUG-FIX
            37388: ALF-13545: First attempt at digitally signing the Windows installers
            37391: ALF-13545: Fix quoting and output directory specification
            37393: ALF-13545: Correct deployment installer signcode command


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@40271 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-08-10 07:55:53 +00:00
Dave Ward
91fcaf09dc Merged V4.1-BUG-FIX to HEAD
39838: Minor fixes to yellowTheme rendering and title background
   39871: ALF-610: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1)
      39842: ALF-15294 CLONE Jodconvertor - no office manager available 
         - Wire up 'startListener' logic better, so that it does not need to go in OpenOfficeContentTransformerWorker
           but in the SocketOpenOfficeConnection, which also avoids a test on start up.
      39841: ALF-15294 CLONE Jodconvertor - no office manager available 
         Changing the OOoDirect subsystem so that:
         - It will not start an OpenOffice process if the OOoJodconverter subsystem is also starting an process on the same port (8100 is
           still the default in both cases). An ERROR is logged on startup if there is a clash of ports.
         - It no longer tries to establishes a connection to an OpenOffice process if ooo.enabled is false, or there is a clash of port
           numbers with the OOoJodconverter subsystem. Both these checks are new.
         - ooo.enabled must now be true before it tries to connect to an OpenOffice process on a remote host (ooo.host must not be localhost).
         - It will no longer schedule a job to establish and test the connection if it is not being used.
   39923: ALF-610: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1)
      39922: ALF-15294 CLONE Jodconvertor - no office manager available 
         - Start up problems with community version when the OOoJodconverter sub system is not there, because of the access to a Jod bean
         - Allow a default bean to be specified when the sub system bean could not be accessed.
   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
   39975: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.1-BUG-FIX (Record Only)
      39974: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/DEV/V3.4-BUG-FIX 
         39953: Refactored "Content I'm Editing" dashlet from synchronous (slowing down user dashboard initial display) to asynchronous client-side rendering. (ALF-13404)
   39978: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_07_09 to BRANCHES/DEV/V4.1-BUG-FIX
      39921: ALF-13473: IE9: can't login to awe. Upgrade YUI library to 2.9.0 for awe application.
   39991: ALF-15339: Added empty-value check, caused group/user-search in workflows to fail
   39999: Reversed revision 36174, thus removing Kofax
   40025: Merged BRANCHES/V4.1 to BRANCHES/DEV/V4.1-BUG-FIX (Record Only)
      40024: Merged BRANCHES/DEV/V4.1-BUG-FIX to BRANCHES/V4.1
         40022: Fix for ALF-15144 - Slow Share doclib high-level folder browsing due to version history retrieval
   40028: ALF-15346: Upgrade of Tika to 1.3-SNAPSHOT
      - Upgraded commons-codec from 1.4 to 1.5
      - Upgraded commons-compress from 1.1 to 1.4.1
      - Upgraded fontbox from 1.6.0 to 1.7.0
      - Upgraded jempbox from 1.6.0 to 1.7.0
      - Upgraded pdfbox from 1.6.0-patched to 1.7.0-patched
      - Upgraded metadata-extractor from 2.4.0-beta-1 to 2.6.2
      - Upgraded poi-* from 3.9-beta1-20120329 to 3.9-beta1-20120801
      - Upgraded tika-* from 1.2-20120518 to 1.3-20120801
      - Added juniversalchardet version 1.0.3
      - Added xmpcore version 5.1.2
      - Added xz version 1.0
      - Changed .classpaths, build.properties, and build.xml to correspond to above


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@40268 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-08-09 17:24:37 +00:00
Dave Ward
0d57d67bec Merged V4.1-BUG-FIX to HEAD
39199: Fixed ALF-13252 "Share - Added aspects are not shown in folder properties"
   39235: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_07_09 to BRANCHES/DEV/V4.1-BUG-FIX:
      38994: ALF-14983 : Upgrade scripts to increase column sizes for Activiti
      39052: ALF-14983 : Upgrade scripts to increase column sizes for Activiti
      (note: reviewed and merged, including required merge ghanges to .sql, .properties, .xml for schema number update 5111 -> 5112)
   39239: ALF-14111 CLONE - 60k sites: Groups are not displayed in all supported browsers when 60k sites and 60 groups in the system
      - Code works on 3.4 as it includes a fix for ALF-7604 (3.4.2).
      - V4.1 should also have this fix (but did not) as there was a clone ALF-7734 (of ALF-7604) applied to Team that
        was merged to HEAD (and hence 4.x). The merge to HEAD failed to include this fix.
      - Putting this code back into 4.1.1 - this should correct this issue (ALF-14111) as the code will no longer have to sort
        240,000 groups when there are 60,000 user created groups. 
   39257: ALF-10730: Fall back on parentType for icons if necessary
   39307: Fix for ALF-14799 - jsonUtils.toJSONString() outputs long values as floating-point numbers
    - Updated to latest Surf libs rev 1101 which fixes this issue
   39310: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_07_09 to BRANCHES/DEV/V4.1-BUG-FIX
      39071: ALF-13767: User error messages in org.alfresco.repo.web.scripts are all hardcoded and cannot be localised
             Modify Java backed webscripts to return localised messages to model.
   39345: Impl from Shane Frensley to fix ALF-3484 - Alfresco should show meaningful error message when deleted item recovery fails.
   39362: RECORD ONLY MERGE from V3.4-BUG-FIX to V4.1-BUG-FIX
      39360: <<DO NOT MERGE TO V4.1-BUG-FIX>>
      Remove the creation of OSX installers - we will never need them any more since they are neither distributed not trialled
   39416: Fix for ALF-14466 Share Document Library breaks for obscure control character in document title
   39594: Minor formatting tweak for coding standards consistency.
   39622: ALF-9254: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1)
      39605: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration 
         - transformer.PdfBox.TextToPdf no longer does txt to pdf transform as OOo/JOD handles non western chars better and are not that
           much slower even for western encodings
           - It still does csv and xml to pdf
           - transformer.complex.Text.Pdf2swf now has a wild card first transformer for text to pdf (rather than transformer.PdfBox.TextToPdf)
             The 2nd transform is still transformer.Pdf2swf. As a result transformer.PdfBox.TextToPdf or the OOo/JOD transformers may be used.
           - transformer.complex.Archive.Pdf2swf now has a wild card first transformer for the same reason.
           - transformer.complex.Text.Image now has a wild card first transformer for the same reason.
         - Allow transformer config element supportedTransformations to wild card source or target mimetype
   39692: ALF-9254: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1)
      39679: ALF-15227 3.4 CLONE - Alfresco incapable of previewing text files including non Western European characters without custom configuration 
         - Fix build failures (not sure about RecordsManagementAuditServiceImplTest)
         - Reset some of the text to pdf / swf limits now OOo or JOD is used rather than PDFBox
   39719: ALF-13037: Ensure that doclist is refreshed when on edit properties triggered folder rule that causes documents to be moved
   39734: Improvements to reduce need to index Surf component XML files - parent config folders already dealt with, but this removes the burden of indexing the XML content. (ALF-10826)
   39740: Merged BRANCHES/V4.1 to BRANCHES/DEV/V4.1-BUG-FIX: (record-only - already present)
      39734: Improvements to reduce need to index Surf component XML files - parent config folders already dealt with, but this removes the burden of indexing the XML content.
   39779: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (RECORD ONLY)
      39774: ALF-15262: Merged V4.0-BUG-FIX to V3.4-BUG-FIX
         35738: Merged HEAD to BRANCHES/DEV/V4.0-BUG-FIX:
            35737: Fix for ALF-11923. Linked rules can't be deleted if source folder was deleted.
         35751: Addendum to fix for ALF-11923. Fixing failing test case by tightening up delete behaviour.
            I also fixed the @since annotations from Odin to 3.4.11
      39777: ALF-15262: Fixed compilation error by re-introducing typo in method name!
   39784: Merged BRANCHES/V4.1 to BRANCHES/DEV/V4.1-BUG-FIX (RECORD ONLY)
      39775: ALF-15271: "Site Content" dashlet shows all documents from all the sites in Alfresco Share
   39831: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (4.1.1)
      39015: Merged in upgrade of truezip to 7.5.5 see ALF-14247
      39361: Added truezip-swing jar.  It seems that Truezip needs Swing :(


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@40265 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-08-09 16:37:33 +00:00
Samuel Langlois
68b4af4b11 Merged V3.4-BUG-FIX to HEAD
39015: Upgrade of truezip to 7.5.5 see ALF-14247
   39361: Added truezip-swing jar.  It seems that Truezip needs Swing :(


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@39832 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-07-26 16:41:46 +00:00
Alan Davis
0bd1c922b4 Merge V4.1-BUG-FIX (4.1.1) to HEAD
38859: ALF-14240: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1)
      38858: ALF-15012 CLONE - New properties for "baseContentTransformer" prevent a remote OpenOffice configuration to start
         - Turns out that the 'New properties' that I added in 3.4.8 made it harder to get a remote OpenOffice instance
           working, but it has not been possible to do OpenOffice transformations on a remote machine for some time in the
           way described on the wiki
           https://wiki.alfresco.com/wiki/Running_OpenOffice_From_Remote_Machine#Remote_Machine_Setup
         - The following issues were all closed as "Not a Bug - Unsupported use case", even though the wiki describes it.
           They all work now - Only discovered these after I had fixed the code.
           ALF-236:  (Alfresco 3.1.1) RemoteOpenOfficeContentTransformer fails to transform txt to odt
           ALF-4049: (Alfresco 3.2.2) RemoteOpenOfficeContentTransformer can't be used in a sub-system...
           ALF-8440: (Alfresco 3.3.3) Indicates moving OpenOffice transformations to the subsystem OOoDirect requires
                     different spring bean overrides.
         - Having worked out that RemoteOpenOfficeContentTransformer was really just a very early version of
           OpenOfficeContentTransformerWorker, I have removed RemoteOpenOfficeContentTransformer and the
           remote-openoffice-context.xml.sample and modified OpenOfficeContentTransformerWorker to support remote
           OpenOffice instances. Rather than having to override spring beans it is now possible to do the
           configuration using Alfresco global properties. Introduced one new one: ooo.host This must be set to the name
           or ip of the remote system, ooo.port (already existed) must be set to the port used by the remote OppenOffice
           instance and ooo.enabled (already existed) must be set to false so that a local instance is not started.
         - As a side effect of using OpenOfficeContentTransformerWorker, all bug fixes that have been added to this
           class will now also be available to remote OpenOffice instances.
         - Added extra change to share-form-config.xml (not in 3.4) to include the host as a field
   38742: ALF-14801 - Overwrite or delete a folder containing multiple files and folders via CIFS on Lion OS X fails with StringIndexOutOfBoundsException
   38679: ALF-14857 - Importing .eml messages generated from Lotus Notes doesn't work
   38675: ALF-14942	Cast operation will always fail in MoveFileOperation
   38666: Merged V4.1 to V4.1-BUG-FIX
      38665: ALF-13260: Mysql does an awful planification of ibatis "select_ChildAssocOfParentByName" query after some heavy load
         - improved "select_ChildAssocOfParentByName" where clause to engage existing index
   38598: New Chinese translations from Gloria plus Bitrock configuration to enable them


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@38860 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-07-06 09:47:41 +00:00
Alan Davis
7e1568020d Merge V4.1-BUG-FIX (4.1.1) to HEAD
38283: Merge V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1)
      38281: ALF-14340 CLONE: Alfresco crashes when viewing doclib / previewing - PDF with CMap
         - Fix rotate build failure on 4.1.1 and HEAD
           Disable 'ANY' (wild carded) transforms where one of the other intermediate transforms
           supports the transform.
   38276: Fixed ALF-12524 "Check in/out to Google Docs actions are available for original document"
   - Updated comments for gdocs checkin evaluator
   - Added new doclib evaluators: evaluator.doclib.action.notWorkingCopy, evaluator.doclib.action.checkedOutAspect & evaluator.doclib.action.notCheckedOutAspect
   - Made sure evaluator.doclib.action.googleDocsCheckOut use notWorkingCopy & notCheckedOutAspect
   - Made sure both "google doc checkin" action's js function works for both working copy & original on Document Details page
   38275: ALF-14784: Multi-valued Properties Not Serialized to JSON Correctly
      - Moved serialization of individual properties to JSON to separate method which is called recursively for lists

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@38285 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-06-25 13:22:01 +00:00
Alan Davis
d933341888 Merged V4.1-BUG-FIX (4.1.1) to HEAD
38219: ALF-14674: DOS voodoo to make start_deployment.bat work, as installed by Bitrock
   38214: ALF-14340 CLONE: Alfresco crashes when viewing doclib / previewing - PDF with CMap
      - Proper fix for build start up issue. The transformer.PdfToImage bean was still being used by
        transformer.complex.AdobeIllustrator.Image in 4.1.1 (not in 3.4.11) but had been removed in 3.4.11
        so when the merge tock place to 4.1.1 the bean could not be found.
        - Similar approach taken for application/illustrator as was done for application/pdf in 3.4.11
          so that the transformer.PdfToImage (which used PDFRenderer and PDFBox) was no longer needed.
   38209: Tweaks to code merged over recently from 3.4 relating to doclib filters query simplification.
   38197: Temporary fix to get Alfresco start up working again
   38196: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      38172: ALF-12081: Ensure that docs edited online via VTI can be cancelled
      38194: Mergd V3.4 to V3.4-BUG-FIX
         38174: ALF-13578: Merged V4.0-BUG-FIX to V3.4
            35169: ALF-13401, ALF-12393: Added exception translation to AbstractReindexComponent retrying transactions, following change in r35162
   
   38185: Improvements to Lucene query used by Image Summary dashlet after large load testing on 4.0 - from 15sec down to 0.1sec
   38181: Chinese translation updates from Gloria, based on EN r37907.
   38178: ALF-14720: Get rid of big, unused class
   38164: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      38162: Merged V3.4 to V3.4-BUG-FIX
         38145: ALF-13578: Merged V4.0-BUG-FIX to V3.4
            35162: Removed attempt to force a concurrency exception for getNodePair after a node had actually been deleted. Code would retry 40 times before failing.
            35169: ALF-13401, ALF-12393: Added exception translation to AbstractReindexComponent retrying transactions, following change in r35162

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@38222 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-06-22 18:13:17 +00:00
Dave Ward
3ba7ffcca0 Merged V4.1-BUG-FIX to HEAD
38065: ALF-13725: yui-genXXX appears in the warning message while changing file name 
   38113: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/V4.1-BUG-FIX
      35857: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1
         33050: THOR-427: Decrease log level of 'Login Failed'
   38117: Merged V4.1 to V4.1-BUG-FIX
      38087: ALF-14725: Merged V3.4-BUG-FIX to V4.1
         38086: ALF-14724: Upgrade to Java 1.6 u33
   38118: Missing semicolons
   38128: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      37821: Fix for ALF-13658 - Direct access (SSO) to share user dashboard with external authentication fails and user is prompted to log on when browsing
      37829: ALF-14340 CLONE: Alfresco crashes when viewing doclib / previewing - PDF with CMap
         This first part is general code (does not fix the specific issue) that could be merged to any branch.
         - TransformerDebug changes made to support investigation
         - Addition of 'supported mimetype transformations' to spring configuration (this is generally what people have thought EXPLICIT transformations were).
         - Tidy up of OpenOffice and JOD converters so that they don't say they can convert a mimetype to itself. There is a binary transformer that can just copy them.
           This also simplifies the Transformer debug output. 
      37831: ALF-14340 CLONE: Alfresco crashes when viewing doclib / previewing - PDF with CMap
         - missing file from last commit.
      37832: ALF-14340 CLONE: Alfresco crashes when viewing doclib / previewing - PDF with CMap
         This second part that fixes the specific issue with reconfiguration of the transformers used.
         - Configuration of transformers changed to use ImageMagick with Ghostscript rather than PDFBox and PDFRenderer.
           The same transformations should be possible after this change. No combinations have been removed or added.
         - ImageMagick with Ghostscript now replaces both PDFBox and PDFRenderer for PDF to PNG.
         - A single or double ImageMagick with Ghostscript transformation (fails over to double when not possible with a
           single transformation) is now used by transformer.complex.PDF.Image
         - ImageMagick with Ghostscript rather than transformer.complex.PDF.Image now declares itself as having an EXPLICIT
           transformation for PDF to PNG. So normally there is no need to even look at the more complicated
           transformer.complex.PDF.Image unless it is included as a component of another transformer (there are 3).
         - PDFRenderer and 3rd party libs were only being used for PDF to PNG, so could be removed.
           NOT REMOVED AT THIS STAGE TO ALLOW CUSTOMISATION USE AND WORKAROUNDS OF ANY ISSUED THAT MIGHT BE FOUND.
         - PDFBox is still required for text to PDF, PDF to Text and metadata extraction.
         - Tidy up transformer.PdfBox.TextToPdf so that it does not declare csv to pdf and xml to pdf as EXPLICIT as
           this is the only transformer that can do it.
      37834: ALF-10518 - Improvements to tagQuery.get.js for the Repository use case to remove the need to add //* PATH for CompanyHome query.
      37835: Fix for ALF-14429 - Recently Modified dashlet takes up to 30 seconds to load after upgrade to Alfresco 3.4.6.23
      37858: Merged V3.4 to V3.4-BUG-FIX (RECORD ONLY)
         37592: Merged V3.4-BUG-FIX to V3.4 (3.4.10)
            35103: Merged DEV to V3.4-BUG-FIX
         37789: Merged V3.4-BUG-FIX to V3.4
            37788: Second part of fix from Alex Mukha for ALF-11714
         37841: ALF-14524: Merged PATCHES/V3.4.9 to V3.4
            37840: ALF-14589: ALF-9861 breaks the JSON based error reporting for document library actions (by custom actions and code) 
               - Fix by Mr Roast
      37865: Merged DEV to V3.4-BUG-FIX (with corrections)
         37845: ALF-13929: Error during processing of the 'show audit' template after upgrade
            New patch that updates show_audit.ftl to the newest version during upgrade
      37877: Correction to corrections:
      37865: Merged DEV to V3.4-BUG-FIX (with corrections)
         37845: ALF-13929: Error during processing of the 'show audit' template after upgrade
            New patch that updates show_audit.ftl to the newest version during upgrade
      37918: Merged DEV to V3.4-BUG-FIX
         37548: ALF-11124: English language bundle properties have _en_US suffix
            Updated ant scripts to create properties files without _US suffix.
      38090: ALF-14699: Merged DEV to V3.4-BUGFIX
         38070: Search in Alfresco Explorer does not work
      38124: Merged V3.4 to V3.4-BUG-FIX (RECORD ONLY)
         38092: Merged V3.4-BUG-FIX to V3.4
            38090: : Merged DEV to V3.4-BUGFIX
               38070: ALF-14699: Search in Alfresco Explorer does not work


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@38135 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-06-21 16:58:32 +00:00
Dave Ward
507c4d8bf8 Merged V4.0-BUG-FIX to HEAD
37207: BDE-69: Filter more tests for minimal build plan
   37253: Fix for ALF-13634 Re-created category won't show up again on a node in Document Library.
   - also fixes deletion of secondary associations
   37265: Merged V4.0 to V4.0-BUG-FIX
      37224: ALF-14174: Part 14 for ALF-14237 Upgrades from 4.0.0.x/4..0.1.0 will not fix the timestamps on acl changesets - SOLR will skip ACLs set prior to upgrade
      - Fix syntax error on Oracle
      37250: Fix for ALF-14174 The patch adding timestamps to acl_change_set breaks SOLR tracking
      - better cross DB fix
   37298:  ALF-14365 - added hazelcastConfig.xml.sample
   37323: ALF-13247: Two nodes with the same primary path. 
      -Fixed by initializing zone before parallel batch processing begins.
   37326: ALF-13933 Alfresco needs to be able to support LibreOffice for transformations
   ALF-13452 Open office startup from Java not working on OSX
      - Added code to start LibreOffice 3.5 on Mac (requires different options to the command and
        ure-link is a directory rather than a file on mac)
      - Removes $DYLD_LIBRARY_PATH from the environment when starting either openoffice or libreoffice on mac
        so does not need to rely on the installer moving the soffice.bin process to .soffice.bin and then
        creating a soffice.bin shell script that removed $DYLD_LIBRARY_PATH
      - Indent TransformerDebug a bit more now we have fail over transformers at the top and lower levels
        (saves N.N.N.N.N.N getting mixed up with text)
   37340: Merged V3.4-BUG-FIX (3.4.10) to V4.0-BUG-FIX (4.0.3) RECORD ONLY
      37339: ALF-13452: Merged V4.0-BUG-FIX (4.0.3) to V3.4-BUG-FIX (3.4.10)
         37326: ALF-13933 Alfresco needs to be able to support LibreOffice for transformations
         ALF-13452 Open office startup from Java not working on OSX
            - Added code to start LibreOffice 3.5 on Mac (requires different options to the command and
              ure-link is a directory rather than a file on mac)
            - Removes $DYLD_LIBRARY_PATH from the environment when starting either openoffice or libreoffice on mac
              so does not need to rely on the installer moving the soffice.bin process to .soffice.bin and then
              creating a soffice.bin shell script that removed $DYLD_LIBRARY_PATH
            - Indent TransformerDebug a bit more now we have fail over transformers at the top and lower levels
              (saves N.N.N.N.N.N getting mixed up with text)
         36273: ALF-13933 Alfresco needs to be able to support LibreOffice for transformations
            - Return a dummy OpenOffice command even when there is no OpenOffice/LibreOffice installed or on the path. 
         36264: ALF-13933 Alfresco needs to be able to support LibreOffice for transformations
            - remove old jodconverter-core-3.0-beta-3.diff
         36259: ALF-13933 Alfresco needs to be able to support LibreOffice for transformations
            << Developed on Windows 7. Might need more work on Linux to get LibreOffice to shut down, but should be
               okay with OpenOffice 3.2 which was used in the previous release. >> 
            - Updated jodconverter to latest version jodconverter-core-3.0-SNAPSHOT-patched.jar 28/4/2012 which is newer
              than 3.0 beta-4
            - Applied patch for http://code.google.com/p/jodconverter/issues/detail?id=103 to handle setting the env
              for LibreOffice 3.5
            - Modified code to use partial GNU style options (not used for -env!) when using LibreOffice
            - Added OpenOfficeCommandLine to dynamically supply OpenOffice or LibreOffice command line args for OOoDirect
            - Tested to work with OpenOffice 3.4 and 3.2 on Windows 7
   37353: Merged V3.4-BUG-FIX (3.4.10) to V4.0-BUG-FIX (4.0.3)
      37352: ALF-13452, ALF-13933 Alfresco needs to be able to support LibreOffice for transformations
         - Build test failure
   37359: New JUnit Rule to support automatic creation and cleanup of Share sites in test code.
   This is required for an imminent fix to ALF-14345, but I'm checking it in separately in order to merge this general utility.
   37360: Fix for ALF-14345. Site Service list method does not recognise sub-types of st:site.
   37364: Merged V3.4-BUG-FIX (3.4.10) to V4.0-BUG-FIX (4.0.3) RECORD ONLY (not needed in 4.0.x)
      37363: ALF-13452, ALF-13933 Alfresco needs to be able to support LibreOffice for transformations
         - Build test failure x2 (reference to jodconverter*jar not needed in 4.0.x)
   37370: Merged V3.4-BUG-FIX:
      ALF-11714: Updated WCMQS to ensure all FreeMarker variables output to HTML are protected with ?html to prevent XSS
   37382: Translation (DE, IT, JA, NL) updates from Gloria, based on EN rev37081
   37384: Fix for ALF-14219 SolrQueryHTTPClient unable to handle long queries (4096 bytes)
   37386: Merged V4.0 to V4.0-BUG-FIX
      37385: ALF-14238: Fix by Dmitry to correct iteration in ImapUnsubscribedAspectPatch


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@37387 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-06-02 07:56:08 +00:00
Dave Ward
ebb756825e Merged V4.0-BUG-FIX to HEAD
37121: ALF-12796: Ensure that only visible nodes are shown via Category search in Repository view when libraryRoot is changed from company home.
   37124: ALF-14220: Parallel reviews now takes into account maximum percentage of approval rate possible when deciding to add new task
   37128: Fixes: ALF-14322. Translation update from Gloria
   37135: Fix for ALF-13993 It fails to find documents whose tag is longer than 255 characters
   - TAGS are truncated as QNAMES - default to 255.
   - TAGS longer then 255 characters can be created.
   - TAGS equal in the first 255 characters can not be created (as they would be treated as duplicates by search)
   37181: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
     Merge HEAD to V3.4-BUG-FIX
      33880: ALF-12777 / ALF-14259: MMT should not install AMPs which override pre-existing files in the war file, unless -force is provided. The MMT is moving toward more of a validation phase (checks things, calculate changes) then an execution phase (makes the changes).
   37192: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
      37081: ALF-13054 Rule action "Transform and copy image" fails if transformation cannot be performed by transformer.ImageMagick
         - (Problem 3 only) - TransformerDebug is now issued from ContentService.isTransformable(...) and ImageTransformActionExecuter.doTransform(...)
      37088: ALF-10217: Updated parse-args.lib.js to support sites having two parent nodes.
      37143: Fixes: ALF-14322: Translation update from Gloria.
      37145: ALF-14303 Alfresco crashes when viewing doclib / previewing - PDF with CMap 
         Adding temporary workaround:
            Modified fail over transformers for PDF to PNG to be PDFRenderer, ImageMagick (new) and the PDFBox. If Ghostscript is installed on the server,
            ImageMagick will be able to perform the transformation. If not installed, it fails with an unsupported transformation and fails over to PDFBox as it
            does today and will encounter this issue if the supplied PDF. If this issues takes place, install Ghostscript. 
      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
      37191: ALF-13379: Fix IsImmutableProperty to react to locks again and stop unit test from confusing a lock with a checkout
   37193: Merged V4.0 to V4.0-BUG-FIX
      37070: ALF-14310: alfresco-enterprise-webeditor-4.0.2.zip fails with HTTP Status 500
      - Due to more incomplete dependency updates
      37146: (RECORD ONLY) ALF-13745: Merged V3.4-BUG-FIX (3.4.10) to V4.0 (4.0.2)
         37145: ALF-14303 Alfresco crashes when viewing doclib / previewing - PDF with CMap 
            Adding temporary workaround:
               Modified fail over transformers for PDF to PNG to be PDFRenderer, ImageMagick (new) and the PDFBox. If Ghostscript is installed on the server,
               ImageMagick will be able to perform the transformation. If not installed, it fails with an unsupported transformation and fails over to PDFBox as it
               does today and will encounter this issue if the supplied PDF. If this issues takes place, install Ghostscript. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@37196 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-05-30 08:27:10 +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
Dave Ward
d437d5105d Merged V4.0-BUG-FIX to HEAD
36311: BDE-69: filter long tests if minimal.testing property is defined
   36314: Merged V4.0 to V4.0-BUG-FIX (RECORD ONLY)
      36247: ALF-11027: temporarily remove import of maven.xml, since it makes ant calls fail from enterpriseprojects
   36331: ALF-12447: Further changes required to fix lower case meta-inf folder name
   36333: Revert ALF-12447.
   36334: ALF-14115: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
      36318: ALF-12447: Fix case on META-INF folder for SDK
      36332: ALF-12447: Further changes required to fix lower case meta-inf folder name
   36337: ALF-14115: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
      36332: ALF-12447: Yet more meta-inf case changes needed.
   36342: ALF-14120: fix only completed tasks returned
   36343: ALF-13898: starting workflow from IMAP now using workflowDefs with engine name included, fallback to appending $jbpm when not present, to preserve backwards compatibility.
   36345: Fix for ALF-12730 - Email Space Users fails if template is used
   36346: Fix for ALF-9466 - We can search contents sorted by categories in Advanced search in Share, but saved search will not be shown in UI.
   36364: Switch version to 4.0.3
   36375: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/DEV/V4.0-BUG-FIX:
      36366: Tweak to implementation to ensure that on-authentication-failed, the status is updated within a r/w transaction.
      36374: Provide more specific exceptions from the Remote Connector Service for client and server errors
   36376: Fix ALF-14121 - Alfresco fails to start if using "replicating-content-services-context.xml"
   36393: Final part of ALF-13723 SOLR does not include the same query unit tests as lucene
   - CMIS typed query and ordering tests
   36432: ALF-14133: Merged V3.4-BUG-FIX (3.4.10) to V4.0-BUG-FIX (4.0.3)
      << 4.0.x specific change: Changed transformer.complex.OOXML.Image into transformer.complex.Any.Image >>
      << allowing any transformer to be selected for the conversion to JPEG >>
      36427: ALF-14131 Complex transformers fail if a lower level transformer fails even though there is another transformer that could do the transformation
         - Added a base spring bean for all complex transformers
      36362: ALF-14131 Complex transformers fail if a lower level transformer fails even though there is another transformer that could do the transformation
   36434: Test fix for ALF-13723 SOLR does not include the same query unit tests as lucene
   - CMIS test data change broke AFTS ID ordering
   36503: Removed thousands of compiler warnings (CMIS query test code)
   36518: Fix for ALF-13778 - Links on Share Repository search page show incorrect link name; do not work when root-node is defined.
   Fix now means that Share search correctly handles overridden Repository root node setting. Original work by Vasily Olhin.
   36520: BDE-69: filter all repo tests if minimal.testing property is defined
   36534: ALF-14116: Latest Surf libs (r1075) - ensure that i18n extensions can process browser sent short locales
   36563: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
      36336: ALF-12447: Yet more meta-inf case changes needed.
      36347: Fix for ALF-13920 - Error occurred when try to edit/delete category
      36352: Fix for ALF-13123 - Invalid JSON format from Get Node Tags Webscript - strings not double-quoted. Also fixed POST webscript with same issue.
      36399: ALL LANG: translation updates based on EN r36392
      36421: Fix for Mac Lion versioning issue. ALF-12792 (Part 1 of 2)
      Enable the InfoPassthru and Level2Oplocks server capability flags, InfoPassthru is the flag that fixes the Mac Lion versioning error.
      Added support for filesystems that do not implement the NTFS streams interface in the CIFS transact rename processing, for the Alfresco repo filesystem.
      36422: Fix for Mac Lion versioning issue. ALF-12792 (Part 2 of 2)
      Enable the InfoPassthru and Level2Oplocks server capability flags, InfoPassthru is the flag that fixes the Mac Lion versioning error.
      36423: Add support for file size tracking in the file state. ALF-13616 (Part 1 of 2)
      36424: Fix for Mac MS Word file save issue. ALF-13616 (Part 2 of 2)
      Added live file size tracking to file writing/folder searches so the correct file size is returned before the file is closed.
      36444: Merged DEV to V3.4-BUG-FIX
         36419: ALF-12666 Search against simple-search-additional-attributes doesn't work properly
            SearchContext.buildQuery(int) method was changed.
      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.
      36475: ALF-14131 Complex transformers fail if a lower level transformer fails even though there is another transformer that could do the transformation
         - Change base spring bean on example config file
      36480: 36453: ALF-3881 : ldap sync deletion behaviour not flexible enough
         - synchronization.allowDeletions parameter introduced
         - default value is true (existing behaviour)
         - when false, no missing users or groups are deleted from the repository
         - instead they are cleared of their zones and missing groups are cleared of all their members
         - colliding users and groups from different zones are also 'moved' rather than recreated
         - unit test added
      36491: Added CIFS transact2 NT passthru levels for set end of file/set allocation size. ALF-13616.
      Also updated FileInfoLevel with the latest list of NT passthru information levels.
      36497: Fixed ALF-14163: JavaScript Behaviour broken: Node properties cannot be cast to java.io.Serializable
       - Fallout from ALF-12855
       - Made class Serializable (like HashMap would have been)
       - Fixed line endings, too
      36531: ALF-13769: Merged BELARUS/V3.4-BUG-FIX-2012_04_05 to V3.4-BUG-FIX (3.4.10)
         35150: ALF-2645 : 3.2+ ldap sync debug information is too scarce 
            - Improved LDAP logging.
      36532: ALF-13769: BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2012_01_26 to V3.4-BUG-FIX (3.4.10)
         36461: ALF-237: WCM: File conflicts cause file order not to be consistent
            - It is reasonable set values for checkboxes using the indexes from the list, which are not changed. So when we submit the window, the getSelectedNodes method is invoked and 
              it takes selected nodes by checkbox values from "paths" list. 
      36535: Merged DEV to V3.4-BUG-FIX
         36479: ALF-8918 : Cannot "edit offline" a web quick start publication
            A check in TaggableAspect.onUpdatePropertiesOnCommit() was extended to skip the update, if no tags were changed.
      36555: Merged V3.4 to V3.4-BUG-FIX
         36294: ALF-14039: Merged HEAD to V3.4
            31732: ALF-10934: Prevent potential start/stop ping-pong of subsystems across a cluster
               - When a cluster boots up or receives a reinit message it shouldn't be sending out any start messages
   36566: Merged V3.4-BUG-FIX to V4.0-BUG-FIX (RECORD ONLY)
      36172: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/V3.4-BUG-FIX:
         36169: ALF-8755: After renaming content / space by Contributor via WebDAV new items are created
   36572: Merged V4.0 to V4.0-BUG-FIX
      36388: ALF-14025: Updated Surf libs (1071). Fixes to checksum-disabled dependency handling
      36392: ALF-14129 Failed to do upgrade from 3.4.8 to 4.0.2
         << Committed change for Frederik Heremans >>
         - Moved actual activiti-tables creation to before the upgrade
      36409: Fix for ALF-14124 Solr is not working - Errors occur during the startup
      36466: Fix for ALF-12770 - Infinite loop popup alert in TinyMCE after XSS injection in Alfresco Explorer online edit.
      36501: Merged DEV to V4.0
         36496: ALF-14063 : CLONE - Internet Explorer hangs when using the object picker with a larger number of documents
            YUI 2.9.0 library was modified to use chunked unloading of listeners via a series of setTimeout() functions in event.js for IE 6,7,8.
      36502: ALF-14105: Share Advanced search issue with the form values
      - Fix by David We
      36538: ALF-13986: Updated web.xml and index.jsp redirect to ensure that SSO works with proper surf site-configuration customization
      36539: Fix for ALF-14167 Filtering by Tags/Categories doen't findes any content in Repository/DocumentLibrary
      - fix default namespace back to "" -> "" and fix the specific SOLR tests that require otherwise.
      36541: ALF-14082: Input stream leaks in thumbnail rendering webscripts
      36560: Correctly size content length header after HTML stripping process (ALF-9365)
   36574: Merged V4.0 to V4.0-BUG-FIX (RECORD ONLY)
      36316: Merged V4.0-BUG-FIX to V4.0 (4.0.2)
      36391: Merged V4.0-BUG-FIX to V4.0
         36376: Fix ALF-14121 - Alfresco fails to start if using "replicating-content-services-context.xml"


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@36576 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-05-18 17:00:53 +00:00
Dave Ward
dbb11a5ce2 Merged V4.0-BUG-FIX to HEAD
35366: Fix for ALF-13542 - Notification is not displayed, when you try to create duplicate user.
   35538: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/V4.0-BUG-FIX: (pre-req for ALF-13791)
      35410: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
           - fix merge issue (compilation fix)
      35443: Merge build/test fix (record-only)
      35463: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
           30194: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1:
                29718: ALF-6029: Additional MT fix to force default tenant
                29719: THOR-7: Create tenant
   35541: Fix for ALF-13723 SOLR does not include the same query unit tests as lucene
   - added base tests
   35547: Merged BRANCHES/DEV/CLOUD1 to BRANCHES/DEV/V4.0-BUG-FIX: (ALF-13791)
      35511: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
           30252: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1:
                 29763: THOR-107: MT-aware immutable singletons
                 29766: THOR-107: MT-aware immutable singletons
                 29768: THOR-31: MT-aware shared cache
                 29770: THOR-107: MT-aware immutable singletons
      35512: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
           30253: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1:
                 29771: THOR-31: MT-aware shared cache
                 29777: THOR-107: MT-aware immutable singletons
                 29786: THOR-107: MT-aware immutable singletons
                 29787: THOR-31: MT-aware shared cache (fix MultiTNodeServiceInterceptorTest)
                 29799: THOR-107: MT-aware immutable singletons
      35513: Merge build/test fix
      35516: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/CLOUD1:
           30026: THOR-5: tenant-aware caches
      35517: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
           30260: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: (core)
                 29860: THOR-73: prep for HEAD sync/merge-forward
                 29866: THOR-73: prep for HEAD sync/merge-forward
                 30026: THOR-5: tenant-aware caches
      35520: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
           30297: THOR-73: Line-endings only
           30298: THOR-73: Line-endings only
           30300: THOR-73: fix ActivitiWorkflowServiceIntegrationTest
           30302: THOR-73: fix SubscriptionServiceActivitiesTest
      35528: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
           30459: THOR-156: prep - consolidate/improve get current user's tenant domain
           30469: Fix bootstrap config check when running unit tests (where one tenant already exists)
           (partial merge only)
   35565: MT: fix update tenant entity
   - pre-req for ALF-13757
   35567: Fix merge fallout (compile error)
   35569: ALF-13757: MT - minor patch to migrate existing tenants, if any (when upgrading)
   35592: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/V4.0-BUG-FIX: (ALF-13791)
      34153: Minor: THOR-5: MT-aware immutable singletons (spp/vti)
   35598: ALF-11459: Added null-check on in-flight process diagram-generation to prevent error when running headless
   35604: ALF-13426 Transformation: DOCX conversion failure
      <<< Fix split into two parts to make merge of this general part to 3.4.10 simpler. >>>
      <<< The second part contains 4.0.x specific changes. >>>
      - Change to ContentServiceImpl to fail over to other available transformers on error (can be turned off with
        global property content.transformer.failover=false).
   35605: ALF-13426 Transformation: DOCX conversion failure
      <<< Second part >>>
      - Remove explicit transformation sections for OOXML (added in 4.0.1 ALF-12461) as these are stopping other
        transformers from being used. Was done originally as a copy paste from another bean that needed an explicit section.
      - The combination of allowing other transformers (that were used prior to 4.0.1) and fail over from OOXML to these
        transformers allows to docx fixes that do and do not contain an embedded image to be transformed to png.
   35608: fix build
   35609: Merged V3.4-BUG-FIX (3.4.10) to V4.0-BUG-FIX (4.0.2) RECORD ONLY
      35607: Merged V4.0-BUG-FIX (4.0.2) to V3.4-BUG-FIX (3.4.10) 
         35604: ALF-13426 Transformation: DOCX conversion failure
            <<< Fix split into two parts to make merge of this general part to 3.4.10 simpler. >>>
            <<< The second part contains 4.0.x specific changes. >>>
            - Change to ContentServiceImpl to fail over to other available transformers on error (can be turned off with
              global property content.transformer.failover=false).
   35619: ALL LANGUAGES: Translation updates based on EN r35407
   35630: Merged HEAD to BRANCHES/DEV/V4.0-BUG-FIX:
      34289: Upgrading JUnit lib to 4.10 to get full Rules support.
      34317: Some initial documentation on JUnit Rules samples.
      34328: More JUnit rules fun. Added a new rule to help with the creation and automatic cleanup of temporary test nodes.
      34777: Added enhancement to TemporaryNodes rule to allow for dummy content.
      34805: Added a convenience method to the ApplicationContextInit @Rule to allow for easier spring overriding in test code.
      35621: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to HEAD:
           35620: More JUnit Rules Enhancements, covering well known nodes and easier context loading
   35631: Fixing some Eclipse junit/lib dependencies which had become out of date - seemingly before my pervious commit (35630).
   35640: Fix for ALF-10085 "Adding/removing CMIS Relationship changes last modified date of source object"
   35647: Merged BRANCHES/DEV/DAM/V4.0-BUG-FIX-35588 to BRANCHES/DEV/V4.0-BUG-FIX:
      35589: Creating new branch from $FROM
      35591: Merged BRANCHES/DEV/DAM/V4.0-BUG-FIX-35195 to BRANCHES/DEV/DAM/V4.0-BUG-FIX-35588:
           35196: Creating new branch from $FROM
           35338: ALF-13734: Move Additional DocumentList Methods to DocumentListViewRenderer
                - Moved tooltip to simple viewRenderer
           35340: ALF-13734: Move Additional DocumentList Methods to DocumentListViewRenderer
                - Moved fnRenderCellSelected logic to DocumentListViewRenderer
                - Moved fnRenderCellStatus logic to DocumentListViewRenderer
                - Moved fnRenderCellDescription logic to DocumentListViewRenderer
                - Moved fnRenderCellActions logic to DocumentListViewRenderer
           35346: ALF-13734: Move Additional DocumentList Methods to DocumentListViewRenderer
                - Moved onEventHighlightRow logic to DocumentListViewRenderer
                - Moved onEventUnhighlightRow logic to DocumentListViewRenderer
                - Moved onActionShowMore logic to DocumentListViewRenderer
                - Minor private method renaming
           35427: ALF-13734: Move Additional DocumentList Methods to DocumentListViewRenderer
                - Changed check for display of metadata banners and lines to more explicit bannerView and lineView properties which are set to the viewRenderer's name by default, but can now more easily be overridden
           35503: ALF-13734: Move Additional DocumentList Methods to DocumentListViewRenderer
                - Renamed bannerView property to more specific metadataBannerViewName
                - Renamed lineView property to more specific metadataLineViewName
           35583: ALF-13734: Move Additional DocumentList Methods to DocumentListViewRenderer
                - Added rowClassName property to make finding the row easier in cases where an event trigger element might not be the row itself
                - Added check for expected row element class name in getDataTableRecordIdFromRowElement, if not present trying getAncestorByClassName with rowClassName property
                - Moved onFileRenamed to DocumentListViewRenderer
                - Changed fnActionHandler to use getDataTableRecordIdFromRowElement rather than target.offsetParent
                - Changed onLikes to use getDataTableRecordIdFromRowElement rather than assume the row parameter is the correct element
                - Changed onFavourite to use getDataTableRecordIdFromRowElement rather than assume the row parameter is the correct element
      35610: ALF-13734: Move Additional DocumentList Methods to DocumentListViewRenderer
           - Changed method of grabbing container element in selectFiles to use parentElementIdSuffix from current viewRenderer
   35650: Fix for ALF-13813 SOLR fails for fuzzy queries
   35651: Fix tests for ALF-13813 SOLR fails for fuzzy queries
   More for ALF-13723 SOLR does not include the same query unit tests as lucene
   - added tests for Alfresco fts run via the request handler 
   - fixed fuzzy query tests so far ...
   - report queries that generate errors
   35664: ALF-13294 - CIFS: When versionable aspect is active, using the Microsoft Word for Mac 2008 option "always create a backup copy" leads to document versions loss
   35679: Fix DataList QName hard-codings by pulling out to a proper Model Java Constants Interface
   35689: Add the NameSpace constants for the Links model
   35699: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/DEV/V4.0-BUG-FIX:
      35698: New WebScript to provide the Share View URL for a given NodeRef (based on the Node Type and SysAdminParams)
   35716: Make overriding just the Share URL easier (needed for Cloud installs)
   35741: ALF-13819 Remove description+template for a controller-less webscript that was committed by mistake in v3.4
   35765: Fixed version of junit.jar in build files
   35772: ALF-1994 - Allow user defined white-list of HTML tags for HTML sanitisation process. Spring config added for tags and attributes.
   35781: Fix for MySQL part of ALF-13150: Performance of Purging Empty Transactions (like 10M)
      ALF-13839: MySQL: "Failed to purge txns" from DeletedNodeCleanupWorker
      - Added MySQL override of the NodeDAO for this call with a dedicated DELETE ... JOIN ... for MySQL
   35784: Fix for ALF-13845 SOLR "alfresco" queries are not cached correctly
   35785: More for ALF-13723 SOLR does not include the same query unit tests as lucene
   - duplicated sort and AFTS tests from the lucene sub-system
   - run queries via request handler
   - addded new locale tests for d:text ordering
   35805: ALF-13828 Method name typo, should be getThumbnailDefinitions not getThumbnailDefintions. (Old method retained, @deprecated, for backwards compatibility)
   35806: More debug to setFileInformation
   35836: Fix for ALF-13794 Mismatch in SOLRAPIClient and NodeContentGet webscript causes content of type d:content not to get indexed
   35862: Fix for ALF-13826 Solr CMIS Query After Delete a Node Throws CmisRuntimeException: Node does not exist
   - make appropriate methods aware of node existence....
   35867: ALF-13886 Certain errors may lead to no conn model object being available, so check it is there before using it to render the "Return to folder" link
   35901: ALF-13474 possibility of deleting compleded workflows + explorer ui cancel action fix
   35923: Fix for ALF-13724 Share folder permission management - changes to parent/child folders not accurately reflected
   35936: More for ALF-13723 SOLR does not include the same query unit tests as lucene
   - tests for mltext localised collation
   35944: BufferedContentDiskDriver needs to use deviceName and sessionKey to make it unique rather than userName
   35949: ALF-13755: MT is configured (but not enabled) by default
   - note: also related to THOR-248 (effectively means that r31407 becomes a merge record-only)
   35951: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/V4.0-BUG-FIX: 
       34107: record-only (follow on to r35949 - see ALF-13755 / THOR-248)
   35953: ALF-12792 - Creation Date and Modification Date initialization for open files.
   35968: Follow up to fix for ALF-13839: MySQL: "Failed to purge txns" from DeletedNodeCleanupWorker
    - Sanity check highlighted transactional resource block in the database
    - Each cleanup runs its own transactions as required now
    - See also ALF-13150: Performance of Purging Empty Transactions suffers if the number of unused transactions grows too large (like 10M) 
   35970: Merged BRANCHES/DEV/DAM/V4.0-BUG-FIX-35924 to BRANCHES/DEV/V4.0-BUG-FIX:
      35925: Creating new branch from BRANCHES/DEV/V4.0-BUG-FIX
      35966: ALF-13912: Move DocumentList.onHighlightFile UI Logic to DocumentListViewRenderer
           - Moved DocumentList.onHighlightFile logic to DocumentListViewRenderer
           - Added DocumentListViewRenderer.getRowElementFromDataTableRecord and DocumentListViewRenderer.getRowSelectElementFromDataTableRecord
           - Changed onHighlightFile to call those new getRow* methods for easier reuse in view renderer extensions
   35979: ALF-10278, ALF-13902: Ending task now done with the right assignee when unassigned (eg. not claimed from pool) or when workflow-owner completes the task assigned to someone else, without claiming first 
   35981: Fix for ALF-12670 - An exception occurs during creation wiki page
   Changed Wiki title field limit to the 100 char limit imposed by QName which unfortunately is used by the underlying service to store the field title.
   35991: ALF-13901: Incorrect workflow-history gathering/displaying on uncompleted tasks in ended parallel multi-instance activity
   35993: ALF-10278, ALF-13902: Fixed failing test (was not using AuthenticationUtil for test-user)
   36001: BDE-69: create test-minimal and continuous-minimal Ant targets
   36004: Fixes for:
   ALF-12813 - jsonUtils.toJSONString mangles up Associative Arrays
    - Added support for nested Java Map/List to jsonUtils
   ALF-13647 - the first time a ICAL calendar URL is called with kerberos SSO a JSESSIONID cookie is not sent by the client, request fails with a 500 Internal server error
    - Support for "negotiate" HTTP auth header and general improvements to that area
   ALF-13877 - Invalid WebScript URLs cause ERROR-level exception stacks
    - DEBUG only output for "missing" webscripts and invalid API call URLs
   36014: ALF-13844: XSLT Filtering Not 100% Secure
      - added more namespaces to the security filter.
      - verified that include/import uses the security filter.
   36018: ALF-13609: Enterprise installers lay down sample site and users
      -Added feature to SiteLoadPatch to disable loading.
      -Added property "disable.sample.site". Set property (system or otherwise)  disable.sample.site=true to skip loading the sample site on a new installation.
   36031: debug improvement.
   36039: ALF-13779: isPooled() implemented correctly now
   36044: ALF-13770: Merged V3.4-BUG-FIX (3.4.10) to V4.0-BUG-FIX (4.0.2)
      36043: ALF-13769: Merged V3.4.8 (3.4.8.7) to V3.4-BUG-FIX (3.4.10)
         35776: ALF-11535 Home Folder Synchronizer fails when destination folder already exists
            - Don't move home folders that are the same as the provider's root folder or even above it!
              If the same, these tend to be shared folders.
              If above, this indicates that an LDAP sync has corrupted the original provider name and has hence
              changed what we think is the root folder!
   36046: ALF-13745: Merged V3.4-BUG-FIX (3.4.10) to V4.0-BUG-FIX (4.0.2)
      <<< Also added placeholder thumbnails (copies if docx, pptx and xlsx which in turn appear to be copies of the 2003 doc, ppt and xls) >>>
      36041: ALF-13667 Additional OpenOffice mimetypes to be added to the mime-type maps
         - Added mimetypes for docm dotx dotm pptm ppsx ppsm potx potm ppam sldx sldm xltm xlsm xltm xlam xlsb
         - Added transformation limits to avoid very long running tasks.
         - Disable Jod and OpenOffice transformers via PDFBox for new types to txt, as there are better options
           with the exception of potm and xlsb that can only be done by Office.
         - TransformerDebug include max source size in available transformer list
      35958: ALF-13745 Add Support for Microsoft Word File Format DOCM
         << General TransformationOptionLimits change >>
         - Addition of TransformationOptionLimitsMap to make it simpler to add lots of TransformationOptionLimits.
           Only one per line rather than about 10 - Needed for this JIRA as lots of limits are needed
         - Changes to transformerDebug to make it more obvious which transformers are excluded
   36047: Fix for ALF-13925 - UsernamePropertyDecorator incorrectly handles displayName construction
   36048: More for ALF-13723 SOLR does not include the same query unit tests as lucene
   - tests and fixes for internal fields
   36061: Fix remoteapi tests by putting back repository tests before, where they belong
   36064: ALF-13682 'View Process Diagram' not working if auditing is turned on
      - modified Auditable annotation on the getWorkflowImage() method which was returning an InputStream
        so we would not consume the input again.
      - modified AuditMethodInterceptor to ignore any InputStream and OutputStream values. Implemented as a
        list of non aubitable classes. Refactored generation of auditable arguments and return value to a method 
        rather than two almost identical in-line copies.
   36065: ALF-13756: MT - replace Tenant attributes with Tenant table
   - update schema comp files for x5 DBs
   - note: will need to be tested in DB build plans (via schema comp -> when fail on error is enabled)
   36066: ALF-13609: Enterprise installers lay down sample site and users
      -Removed extraneous line of code.
      -Renamed boolean to "disabled" and associated accessors.
      -Added property "sample.site.disabled=false" to repository.properties.
      -To disable loading of the sample site on a new installation, set property (system or otherwise)  "sample.site.disabled=true"
   36080: Merged BRANCHES/DEV/DAM/V4.0-BUG-FIX-36070 to BRANCHES/DEV/V4.0-BUG-FIX:
      36071: Creating new branch from BRANCHES/DEV/V4.0-BUG-FIX
      36079: Merged BRANCHES/DEV/DAM/V4.0-BUG-FIX-35924 to BRANCHES/DEV/DAM/V4.0-BUG-FIX-36070:
           36069: ALF-13935: Move DocumentList Upload Indicators and Instructions to DocumentListViewRenderer
                - Created renderEmptyDataSourceHtml method in DocumentListViewRenderer which contains the view logic previously in _setupDataSource
                - Created _setEmptyDataSourceMessage which actually appends the constructed empty HTML instructions for cases where extensions simply want the same instructions but in a different container
                - Added firing of Bubbling event postSetupViewRenderers at the end of _setupViewRenderers since all viewRenderers now have to be registered before _setupDataSource is called
   36085: More for ALF-13723 SOLR does not include the same query unit tests as lucene
   - internal fields
   - paging
   - security filters
   36089: ALF-11725:	Replication document with comment fails due to integrity exception
      - updated script transfer service.
   36094: ALF-11725 : config change.
   36098: ALF-13719: Javascript addAspect(aspect, properties) does not apply cm:autoVersionOnUpdateProps property value
   36105: SESURF-102: Fix dependency handling when use-checksum-dependencies is not enabled.
   36107: Tweak wiki page create/update logic, to handle clearing the tags when updating a page when all tags are removed (ALF-10979)
   36109: ALF-7874 MimeType definitions for Adobe AfterEffects files
   36110: ALF-7874 Upgrade Tika for improved detection of Adobe Premier and AfterEffects
   36112: ALF-7874 MimeType definition addition for Adobe Premier files
   36133: Merged DEV to V4.0-BUG-FIX
      36130: ALF-13988 : apply_amps script no longer works on Mac OSX
         apply_amps.sh was corrected to resolve "readlink -f" Mac OS problem.
   36135: ALF-12330: Editing of completed task now redirects to referring page (if available) + transition-buttons not rendered on completed tasks
   36141: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
      35641: ALF-13452: Open office startup from Java not working on OSX
      - Fix from Bitrock in combination with new wrapper in BINARIES
      35687: ALF-13520: alfresco.log file ending up in system32 directory
      - Not anymore!
      35736: ALF-13751: Reduce over-agressive traversal of child associations when detecting cyclic groups in LDAP sync
      - Recurse upwards to topmost parent then recurse downwards
      - No need to recurse upwards and downwards on every recursion step!
      35987: Merged DEV to V3.4-BUG-FIX
         35984: ALF-11850 WCM - Incorrect message when copying/cutting assets within a Web Project
            1. In ClipboardBean.addClipboardNode(NodeRef ref, NodeRef parent, ClipboardStatus mode) was added check whether the node in the AVM.
            2. In webclient.properties was added node_added_clipboard_avm property.
      36049: Fix for ALF-9662 To allow admin user to view dashboard of moderated site.
      36050: Fix for ALF-13843 - Content creation silently fails when it's being created with already existent name.
      36054: Fix for ALF-13231 - Message 'Failure' on workflow cancelation
      36055: Fix for ALF-13926 - Intranet compatibility options override share's settings
      36102: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX
         36097: Fix for ALF-13976 - 404 error handling in Share no longer correctly receives JSON response. OKed by DaveW.
      36103: ALF-13578 : CIFS AlfJLANWorker threads (concurrency) - server not responding
      36137: Merged V3.4 to V3.4-BUG-FIX
         35433: ALF-13021: Folder deletion from Editorial not deleting from Live folder automatically
         - Fix by Valery
         - Needs further work for 4.0.x
         35488: ALF-13718: Full reindex performance on SQL Server
         - ORDER BY on child assoc query changed to only include ID (with Derek's permission)
         - ADMLuceneIndexerImpl altered to not use batch loading in getChildAssocs so as not to blow the transactional caches when reindexing a large hierarchy
         - ADMLuceneIndexerImpl altered so that it only checks for the existence of child associations when 'lazily' creating parent containers
         - ADMLuceneTest corrected (with Andy's permission) so that this doesn't throw the unit test out
         35505: ALF-13718: Corrected ADMLuceneCategoryTest to clear the 'real' index before creating a fake 'test' index
         35809: Merged DEV to V3.4
            35800: ALF-10353 : Internet Explorer hangs when using the object picker with a larger number of documents
               YUI library was modified to use chunked unloading of listeners via a series of setTimeout() functions in event.js for IE 6,7,8.
         36101: ALF-13978: Merged V4.0-BUG-FIX to V3.4
            36014: ALF-13844: XSLT Filtering Not 100% Secure
               - added more namespaces to the security filter.
               - verified that include/import uses the security filter.
         36108: ALF-13978: Fixed compilation errors
         36129: Merged DEV to V3.4
            36123: ALF-13951 : It's impossible to customize dashboard in Alfresco Share
                A yui-2.8.1-patched library contains a fix for ALF-10353.
   36142: Merged V3.4-BUG-FIX to V4.0-BUG-FIX (RECORD ONLY)
      35432: ALF-13762: Merged V4.0-BUG-FIX to V3.4-BUG-FIX
         35366: Fix for ALF-13542 - Notification is not displayed, when you try to create duplicate user.
      35593: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX:
         35375: Fix for ALF-13711: "Hidden Aspect applied to Mac powerpoint files."
              - re-instated previous hidden aspect behaviour
              - unit tests
              - also fixed cascade behaviour
   36144: Merged V4.0 to V4.0-BUG-FIX
      35918:    31473: -- initial commit for ALF-11027
         -- enables CE / EE deployment of artifacts to a maven repository
         -- added necessary ant build files and build properties. 
         -- also added a README
         31474: -- added .project to svn:ignore
         32534: -- added missing artifacts and fixed wrong ones
         -- added possibility of custom artifacts labeling (by adding -Dmaven.custom.label), e.g. to allow snapshot / release deployments from working branches
         -- TODO: document required ~/.m2/settings.xml
         32582: -- renamed alfresco-datamodel to alfresco-data-model
         -- fixed release/snapshot and custom version labeling
         -- tested with Community, enterprise build undergoing (removed distribute-extras as pre-requisite)
         32610: -- tested enterprise only deployment 
         -- removed tabs 
         -- fixed property placeholding
         -- tested all artifacts
         32611: -- added maven-ant-tasks library to automatically load ant maven tasks without dependencies on the ant installation
         -- added typedef in the main maven.xml
         35250: -- reworking on ALF-11027 to enable automated deployment of artifacts to the Maven repo
         -- following conversations with DaveW implemented the following:
            - removed classifier (just rely on different groupId, org.alfresco for Community and org.alfresco.enterprise for Enterprise)
            - Added debugging lines to make sure proper repo / groupId configuration is picked up
            - enabled SNAPSHOT/RELEASE deployment for both community and enterprise
         -- updated README-maven-deploy.txt with all instructions on how to run the build
         35388: -- added references to Maven settings.xml in the BINARIES as discussed with DaveW
         35648: [ALF-11027] Since artifact:mvn does not support settingsFile attribute, switching to embedded command line -gs parameter to specify a custom settings.xml location
         35649: [ALF-11027] Since artifact:mvn does not support settingsFile attribute, switching to embedded command line -gs parameter to specify a custom settings.xml location
         35652: [ALF-11027] artifact:mvn uses an older Maven version which command line switch is -s instead of -gs
         35775: [ALF-11027] Removed DoD and Kofax deployment from enteprise deployment procedure
         35783: [ALF-11027] removing custom README and added documentation in line of the tw maven.xml files
         35793: Fix comment syntax: no -- allowed there
         35802: [ALF-11027] Removed calls to DoD targets 
         35810: [ALF-11027] Introducing a maven-build-deploy goal to build and deploy at once, maven-deploy now "just does the job
         35822: [ALF-11027] Moved the maven setup steps to a maven-env-prerequisites separate target, so it gets executed earlier and defines the task
         35851: [ALF-11027] Move targets around to fix the regular, non-continuous build
         35894: [ALF-11027] Add maven.do.deploy variable, to control maven deployment from bamboo using parameterised plan
         35896: [ALF-11027] Using Bamboo Plan Variables properly
         35899: [ALF-11027] Use Bamboo variable to specify release vs snapshot rather than deployment or not 
         35905: [ALF-11027] Upload source and javadoc jars into Maven repo as well
         35912: Upgrade maven-deploy-plugin to 2.7, to be able to deploy Javadoc and Source jars as well
      35950: ALF-11027: Fix typo in jlan-embed deployment, removed svn revision from version, removed deployment of jmx-dumper
   36145: Merged V4.0 to V4.0-BUG-FIX (RECORD ONLY)
      34612: Merged V4.0-BUG-FIX to V4.0
         ALF-12740: Update to previous fix (only apply to IE8 and below)
      34618: Merged V4.0-BUG-FIX to V4.0
         34474: ALF-13169 Tomcat fails to shutdown
            - fix non daemon Timers
      34637: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/V4.0     (4.0.1)
          34636: Fix for ALF-13365 SOLR: Recently modified docs dashlet sorts incorrectly
      34690: MERGE V4.0_BUG-FIX to V4.0
        34226 : ALF-12780  Mac OS X Lion 10.7.2: Editing a document via CIFS and TextEdit removes versionable aspect from this file
      34716: Merged V4.0-BUG-FIX to V4.0
         34715: Fix for __ShowDetails desktop action returned URL is truncated if hostname too long. ALF-13202.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@36155 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-05-08 12:07:00 +00:00
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
Nick Burch
d37af8c0f6 Tika and POI upgrade for ALF-13106
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34883 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-03-29 11:24:51 +00:00
Dave Ward
436352d8a1 Merged V4.0-BUG-FIX to HEAD
34386: Merged V4.0 to V4.0-BUG-FIX
      34384: Fixed further merge problem
      34385: Merge V3.4-BUG-FIX (3.4.9) to V4.0 (V4.0.1)
         34381: Merged V3.4 (3.4.8) to V3.4-BUG-FIX (3.4.9)
            34378: ALF-13030 ALF-13041 Transformer Server needs filename and to make its transformer preferred over OpenOffice and JOD
               Relates to ALF-10976 and ALF-10412 set of changes
               - The last commit to make the sourceNodeRef available to the first child transformer of a ComplexContentTransformer
                 made it available to them all. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34387 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-03-02 18:33:18 +00:00
Dave Ward
840440764b Merged V4.0-BUG-FIX to HEAD
34321: Make CIFS virtual circuit per session limit configurable, return correct status code when virtual circuit limit is reached.
   Required by Terminal Server clients as they can use a single session for all connections. ALF-13156
   34322: Services part of fix for ALF-13057 Nodes marked with rma:ghosted aspect (or other configurable aspects/types) should not be renditioned.
   34323: Added configuration property for CIFS virtual circuits per session, required by Terminal Server clients. ALF-13156.
   34332: Fix for ALF-8405
   34336: Merged BRANCHES/V4.0 to BRANCHES/DEV/V4.0-BUG-FIX:
      34335: Fixing a failing test as part of ALF-13057
   34338: NodeDAO: re-parent "lost & found" orphan child nodes (see ALF-12358 & ALF-13066 / SYS-301)
   - test fix (follow-on to r34279)
   34341: NodeDAO: re-parent "lost & found" orphan child nodes (see ALF-12358 & ALF-13066 / SYS-301)
   - ano test fix (once more with feeling)
   34351: Merged V4.0 to V4.0-BUG-FIX
      34335: (RECORD ONLY) Fixing a failing test as part of ALF-13057
      34350: Merged V3.4 to V4.0
         34327: ALF-13030 ALF-13041 Transformer Server needs filename and to make its transformer preferred over OpenOffice and JOD
            Relates to ALF-10976 and ALF-10412 set of changes
            - TransformerOptions.sourceNodeRef now populated
            - Set average transformer time via global properties
            - TransformerDebug of active transformers added
         34331: ALF-13030 ALF-13041 Transformer Server needs filename and to make its transformer preferred over OpenOffice and JOD
            Relates to ALF-10976 and ALF-10412 set of changes
            - Fix test failures
         34346: ALF-13030 ALF-13041 Transformer Server needs filename and to make its transformer preferred over OpenOffice and JOD
            Relates to ALF-10976 and ALF-10412 set of changes
            - sourceNodeRef was not available to the first child transformer of a ComplexContentTransformer
   34358: Merged V4.0 to V4.0-BUG-FIX (RECORD ONLY)
      34324: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/V4.0:
         34322: Services part of fix for ALF-13057 Nodes marked with rma:ghosted aspect (or other configurable aspects/types) should not be renditioned.
   34360: Merged V3.4-BUG-FIX to V4.0-BUG-FIX (RECORD ONLY)
      34349: Merged V3.4 to V3.4-BUG-FIX
         34327: ALF-13030 ALF-13041 Transformer Server needs filename and to make its transformer preferred over OpenOffice and JOD
            Relates to ALF-10976 and ALF-10412 set of changes
            - TransformerOptions.sourceNodeRef now populated
            - Set average transformer time via global properties
            - TransformerDebug of active transformers added
         34331: ALF-13030 ALF-13041 Transformer Server needs filename and to make its transformer preferred over OpenOffice and JOD
            Relates to ALF-10976 and ALF-10412 set of changes
            - Fix test failures
         34346: ALF-13030 ALF-13041 Transformer Server needs filename and to make its transformer preferred over OpenOffice and JOD
            Relates to ALF-10976 and ALF-10412 set of changes
            - sourceNodeRef was not available to the first child transformer of a ComplexContentTransformer
         34348: Merged PATCHES/V3.4.7 to V3.4
            34347: ALF-12949: Merged V4.0-BUG-FIX to PATCHES/V3.4.7
               33959: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX
                  33950: Fix for ALF-12787:
                         - Surf Memory usage optimizations and improvements to ModelObject and derived classes.
                         - Reduced avg memory usage for a ModelObject in the Surf persister cache from 4.0K to 1.5K.
                         - Related refactoring to support removal of in-memory XML DOM previously used to maintain ModelObject state. Now XML DOM only created as needed for set() operations and thrown away.
                         - Improvements to Surf Persister cache strategy to support MRU style concurrent cache, now uses a LinkedConcurrentHashMap to provide a concurrent cache that also has a configurable maximum capacity
                         - Added various improved spring config for persister caches and default sizes.
               Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX
                  33956: Latest SpringSurf libs: Fixed issue with overly aggressive caching of missing page View objects.
               34108: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX
                  34107: Added missing jar lib to wcmquickstart and webeditor dependencies
   34363: Merged V4.0 to V4.0-BUG-FIX
      34362: Merged V3.4 to V4.0 (RECORD ONLY)
         34282: ALF-13059: Windows 7 specific: It's impossible to add documents to DWS
         - Fix by Alex Malinovsky
         34348: Merged PATCHES/V3.4.7 to V3.4
            34347: ALF-12949: Merged V4.0-BUG-FIX to PATCHES/V3.4.7
               33959: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX
                  33950: Fix for ALF-12787:
                         - Surf Memory usage optimizations and improvements to ModelObject and derived classes.
                         - Reduced avg memory usage for a ModelObject in the Surf persister cache from 4.0K to 1.5K.
                         - Related refactoring to support removal of in-memory XML DOM previously used to maintain ModelObject state. Now XML DOM only created as needed for set() operations and thrown away.
                         - Improvements to Surf Persister cache strategy to support MRU style concurrent cache, now uses a LinkedConcurrentHashMap to provide a concurrent cache that also has a configurable maximum capacity
                         - Added various improved spring config for persister caches and default sizes.
               Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX
                  33956: Latest SpringSurf libs: Fixed issue with overly aggressive caching of missing page View objects.
               34108: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX
                  34107: Added missing jar lib to wcmquickstart and webeditor dependencies


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34364 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-03-02 15:00:35 +00:00
Alan Davis
ffb5aa8f40 ALF-12725: Merged V4.0-BUG-FIX (4.0.1) to HEAD
33889: ALF-12725: Merged V3.4-BUG-FIX (3.4.9) to V4.0-BUG-FIX (4.0.1)
      33888: Merged V3 (3.4.8) to V3.4-BUG-FIX (3.4.9)
         33887: ALF-10976 (relates to ALF-10412)
            - Fix build failures. Error in FailoverContentTransformer.isTransformable and FailoverContentTransformer.isTransformableSize
              which resulted in no mimetype checks if the size was negative which it was in ThumbnailServiceImplTest.testHTMLToImageAndSWF.
            - Commented out new unit tests in ContentServiceImplTest as OpenOffice is not on the build machines.
   


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@33898 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-02-14 22:52:27 +00:00
Dave Ward
c3a622e3c4 Merged V4.0-BUG-FIX to HEAD
33836: Fix for ALF-10651 Fix patches that trigger reindexing and ALF-10656 SOLR: Patches execute search during bootstrap causing deadlock
   33842: Fixes ALF-12797: i18n strings in activiti-admin login-screen escaped properly
   33844: Fix for ALF-10651 Fix patches that trigger reindexing and ALF-10656 SOLR: Patches execute search during bootstrap causing deadlock
   - batch touch to limit the in clause size generated
   33845: Manually added extra core Share extensions needed for the V4.0 Records Management module from the development branch.
   - Refactored JSON property decorators for the Document Library data webscripts
   - Document List banners (e.g. working copy) moved into metadata template config
   - Ability to override default document/folder title within Document Library (<title> element in metadata template - unused in core code)
   - Additional extension point in surf-doclist to override remote data URL
   - Better handling for missing content property
   33852: ALF-12725: Merged V3.4-BUG-FIX (3.4.9) to V4.0-BUG-FIX (4.0.1)
      33849: Merged V3 (3.4.8) to V3.4-BUG-FIX (3.4.9)
         33848: ALF-10976 (relates to ALF-10412)
            Fixed bug to do with preview being stuck as always being 'Content cannot be previewed.
            Do you wish to download?' or a 'blank preview after a transformer is not found' for all
            content with the same mimetype. Cache in ThumbnailRegistory.getThumbnailDefinitions()
            now understands that transformers may have an upper content size limit. The choice between
            the two options was based on the size of the first file previewed of each mimetype.
            Needed to add getMaxSourceSizeBytes() to support this (see below).
            - refactored (previous refactor was incomplete) ContentTransformer so that
              the two halfs of isTransformable is now split into sub methods
              isTransformableMimetypes and isTransformableSize.
              This is why there are so many files changed.
            - Moved getMaxSourceSizeBytes() from AbstractContentTransformerLimits to ContentTransformer as
              there were becomming too many places in the code that needed needed to check if the ContentTransformer
              was an instanceof AbstractContentTransformerLimits before calling this method.
            - TransformerDebug now uses KB MB GB values in output to make it simpler to read.
            - TransformerDebug now uses thousand separaters in millisecond values to make it simpler to read.
            - TransformerDebug now reports the 'parent' transformer name rather than the sub-transformer name 
              when an unavailable transformer is found. Makes it simpler to tie up with the 'available transformer'
              list with the new pushIsTransformableSize() calls.
            - TransformerDebug now uses trace logging for calls from ThumbnailRegistory.isThumbnailDefinitionAvailable()
              as it is normally followed by a ContentService.transform() which is logged at debug level anyway.
            - TransformerDebug now turns logging level to trace if the file size is 0 bytes. Request from Jan.
              Not sure how one uploads such a file!
            - Modified ComplexContentTransformer.isTransformable() so that it checks the mimetypes before the sizes
              so that TransformerDebug does not report 'unavailable transformers' that don't support the
              mimetype conversion.
            - Modified ComplexContentTransformer.getLimits and ComplexContentTransformer.isPageLimitSupported()
              to include the limits from the first sub transformer.
              Was not an issue until ContentTransformer.getMaxSourceSizeBytes() was introduced.
            - Added logger to RhinoScriptProcessor to debug requests run javascript on the server.
            - Dropped the sourceUrl parameter from ThumbnailRegistry.getThumbnailDefinitions() which was
              introduced with limits as it is logicall not needed.
   33853: DiskInterface.renameFile() can now throw PermissionDeniedException to return a different status to the client. Part of ALF-12717.
   33856: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
      33835: ALF-12546: Remove references to retired RegPaths.exe from installed apply_amps.bat script
      33843: Fix for ALF-12775
      33855: Merged V3.4 to V3.4-BUG-FIX
         33851: ALF-12588: Documents Intermittently Do Not Appear in Share
            - Fix by Alex Busel for regression I accidentally caused in 3.4.6
            - Simple typo in mergeDeletions() caused path deletions to sometimes not get applied or get processed twice
            - Yikes!


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@33857 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-02-13 12:24:24 +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