10 Commits

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


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


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


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


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


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@43914 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-11-23 16:46:57 +00:00
Dave Ward
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
Florian Mü
1904f66734 User status changes now generate activities
Activities Dashlet:
- added "I'm following" filter
- prepared activities filter (not working yet)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28589 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-06-25 17:58:43 +00:00
Dave Ward
6ebc200a0e Merged V3.4-TEAM to HEAD
26804: Fixed line endings and removed sundry svn:mime-type properties after merge rev 26779
   26805: Merged BRANCHES/V3.4/ to BRANCHES/V3.4-TEAM:
      26803: Fixes: ALF-8138, adds a i18n property for a ToDo list's attachment title.
   26817: Fixes: ALF-7813 - Mini Calendar now highlights all events rather than only the ones valid for the current view.
   26821: Fixed ALF-7889: Auditable data should not change during archive and restore
    - NodeService archive (private method) and restore (public method) switch off cm:auditable behaviour
    - This is system-wide and not configurable
   26823: ALF-8152 - Simple view: incorrect file type icon
   26826: GDoc: Collections are now being correctly created in GDoc when document is checked out
   
   26829: Change initial load event back to onContentReady to keep Firefox & Firebug happy.
   26830: ALF-8151 - Filetype icon or is incorrectly displayed at the Content I'm editing dashlet. (Copied mappings across from alfresco.js)
   26833: Fixed ALF-8060 "Collaborator can't edit created links by other users"
   26836: Fix for ALF-8126
   26837: Fixes ALF-8124: Override default BitRock NLS readme strings
   26840: Fixed ALF-8127 "Inconsistence between Create and Edit user page"
   26841: Fix for ALF-1044. (Searching for groups whose names contain regex reserved chars.)
     The fix was to add [] as reserved chars to the RegEx SimpleLanguageDef. Thanks AndyH.
   26844: Fixed ALF-8000, ALF-7997, ALF-8108 and ALF-7721. Partial fix for ALF-8156. All these issues relate to admin console form configuration.
   26845: Fix for ALF-8181 - Admin console - sometimes displays the 'previous' tool, one step behind mouse click
   26854: Fixed ALF-8179: The new HTML email templates are bootstrapped with a mimetype of text/html they should be text/plain as they are freemarker files. Being plain text allows the content to be edited without TinyMCE corrupting the raw source. I also made all the templates inline editable.
   
   NOTE: To see these changes you must start with a clean database as these changes are only applied during initial bootstrap.
   26865: Merged V3.4-BUG-FIX to V3.4-TEAM
      26864: ALF-8025: JMX forms will no longer persist invalid values and subsystem auto-start errors are non-fatal
         - Errors on bootstrap subsystem startup are logged and absorbed. So should still always be possible to bring the server up to a level where its configuration can be corrected
         - The JMX setAttributes() method, which sets multiple attributes at once, is now handled differently from an individual setAttribute()
         - It attempts to restart the subsystem with the new properties. If successful these are persisted and a reload message is broadcast across the cluster. If unsuccessful it rolls back to the old properties and restarts the subsystem with those. Then the error is passed on to the caller.
         - Unit tested through JMX by AuthenticationChainTest
   26871: Refactor of fix to ALF-7888 to address clarified/extended requirements.
     After discussions with various engineers & the product manager, it has been agreed that sites should not appear in the recycle bin as they cannot be recovered from there. This is not a change to existing behaviour.
     However, formerly sites were only hard-deleted if deleted via the SiteService & remained archivable via the Explorer client and presumably other protocols such as CIFS.
     Now sites will by default not be deletable at all. So any attempt to delete a site via Explorer, CIFS etc will fail with an exception. This is achieved with a policy/behaviour on Site deletion.
     But that behaviour is disabled within the SiteService.deleteSite thus allowing deletion (and hard deletion at that) via that service only.
     End result is that admins can't accidentally delete sites as most interfaces prevent it and Share allows it after the normal warning dialogs.
   
     Had to tweak the SiteLoadPatch to delete a site via the SiteService rather than the NodeService.
   26873: Merged BRANCHES/V3.4 to BRANCHES/V3.4-TEAM:
      26860: ALF-7101 and ALF-7866 - don't show the rules options to collaborators, as they shouldn't be able to create/manage rules
   26874: Previous check-in (svn r. 26871 for ALF-7888) slightly broke the sample site for Team.
   Refactored the SiteLoadPatch to fix that.
   26875: ALF-7835 - args["itemTitle"] and args["page"] are already decoded, so don't try to decodeURIComponent them a second time when building the activity feed, otherwise it'll fail with special characters
   26893: Fixed ALF-7821 & ALF-7967 by making the OpenOffice read-only as it's all pre-installed for Team and shouldn't be editable. Also removed the (Subsystem) from the OpenOffice label.
   
   Also updated forms to remove the 'operations' button and move back to a Save/Cancel button as since Dave's changes to setAttributes() all the logic (including rollback of invalid properties) is now handled, meaning we no longer have to call the start() operation on the MBean.
   26901: Merged V3.4 to V3.4-TEAM
      26900: ALF-8180: The installer shouldn't randomly delete a directory called tomcat that it didn't create
         - Fix provided by Bitrock
   26905: Fix for ALF-8207 - Themes are not translated (not resolving title ids)
   26910: Fixed ALF-8206 "ES - Layout dashlets"
   26913: ALF-7838 - When paging the comments, do the reverse ordering before we page, rather than after
   26920: More on ALF-7004. The notification templates (used in the send email action of a rule) now follow the look and feel of the mockups Linton did originally.
   
   For this to work the MailActionExcecuter action needed the shareUrl, as all other email sending processes go through this action they no longer need to pass the shareUrl in. There was some inconsistency in how the URL was structured (sometimes with a trailing slash, sometimes not) so this has been cleaned up, which did mean more template updates.
   
   As before, this will require a clean database to see the updated templates.
   26921: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V3.4-TEAM:
      26349: ALF-6062 - Add sorting by display name to the Group REST APIs that support paging
      26375: ALF-6062 - Make sorting of groups in the rest API case insensitive.
      26376: Correct long-incorrect indent and style stuff (at Gav's request)
      26402: ALF-6062 - Paging and Sorting (Case Insensitive) for the Groups REST APIs
      26423: ALF-6062 - Support sorting and paging of the child authorities and users of a group in the REST API, where previously only child groups were sortable and pageable
   26924: Some of ALF-8223: Added form config for GoogleDocs properties currently present on MBean
   26931: ALF-8092 - Convert the archived nodes webscript to the new style paging, which fixes an array index issue
   26933: Fixed ALF-8156: Too many detailed options for filesystem configuration in Admin Console
   
   Also made the position of 'enabled' properties consistent i.e. the first thing in the form/section.
   26937: Build fix for FeedCleanerTest. Also a refactoring of the Site deletion prevention behaviour for ALF-7888.
   This pattern should now be reusable outside the site service.
   
   I took my BeforeDeleteNode behaviour off the st:site node type. It was registered in SiteAspect.java.
   This was causing the test case failure as when I disabled behaviours on a site node before deletion, I was
   disabling all behaviours, including the necessary FeedCleaner behaviour.
   
   Added new aspect cm:undeletable
   Sites now have cm:undeletable as a mandatory aspect
   
   The BeforeDeleteNode behaviour that was attached to sites is now attached to cm:undeletable in UndeletableAspect.java
   
   site-services-context.xml defines an undeletableAspect bean which registers the behaviour on cm:undeletable.
   This could perhaps be moved into the NodeService. Will discuss on Monday.
   
   26938: Fixes ALF-8196: Ensure that WebView title bar link is updated as soon as its set
   26940: Fix for ALF-8036. Incorrect permissions copied when copying folder with permissions from one site to another.
     Permissions on nodes held within share sites are now cleaned after a move or a copy to a different share site.
     Cleaning in this context means permissions relating to the old site are removed and permission inheritance is turned on again. In this way the relocated nodes will look like they have just been uploaded, as requested in the issue comments.
     A new method in the SiteService stack (cleanSitePermissions) is used to initiate this clean-up from the move-to, copy-to slingshot webscripts.
     This is delegated to a new class/bean SitesPermissionCleaner which encapsulates the clean-up operation.
     The cleanup must be recursive as there could be nodes anywhere within the relocated tree which have permissions directly set on them. The tree is walked using nodeDAOs for efficiency. The cleanup is performed with aclDAOs, again for efficiency.
   
     This fix was developed on 3.4.2, but was backed out of there and is now checked in (effectively for the first time) on Team. This check-in will need to be merged to 3.4.3 at some point.
   26941: Updating svn properties on root associated with check-in 26940 for ALF-8036.
   Sorry. I forgot to check these in a moment ago.
   
   26949: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V3.4-TEAM:
      26945: ALF-3554 / ALF-8257 - Adding rules to a node applies a marker aspect, so update the Rules Service to remove this when all removes are deleted.
   26950: Fix failing tests caused by r26920. Now that we rely on the Mail Action Executor to set the share URL for the templates, it's no longer available at the mock level when not calling the MailActionExecutor. Switch to a different model variable to check
   26954: ALF-8232 - Paging controls in doclib can overlay on top of sorting controls at 1024 screen res when 8+ pages are present
   26955: Follow-up to r26954 (ALF-8232). Remove local i18n messages for Links component.
   26956: Fixed ALF-8223 "Google integration needs Admin Console to configure options"
   26963: Fixed ALF-8223 "Google integration needs Admin Console to configure options"
   26964: Fixed ALF-8226 "ES FR DE Site pages in Customise Site to be spaced"
   - tested in FF3.5, SF3 & IE6,7,8
   26966: Added missing theme ID string
   26968: Merged V3.4-BUG-FIX to V3.4-TEAM
      26967: Fix for ALF-8259 - Static Asset Cache use of the /res resource servlet has overwritten the cachecontrol values set by the filter.
   26969: Moving the cm:undeletable aspect out of the SiteService and into the NodeService. Loosely related to ALF-7888.
   The cm:deletable aspect has been renamed to sys:undeletable.
   The class which registers the default behaviour, UndeletableAspect, has been moved into repo/node.
   Various minor changes in model files & spring config required.
   26970: ALF-8267 - Data Lists: search for user should not require minimum characters
   26971: Fixed ALF-8280 "ALL LANG - conversor pdf2swf - untranslated"
   26976: ALF-8271 - "Repository" appears as a destination when creating/editing linked rules in Doc Library.
   Rules picker now switches available modes based on whether Repository browsing is allowed or not. Removed reference to non-existent file. Also made rules picker sensitive to changing picker mode or site.
   26977: Fixes: ALF-7812: Adds support for multiday events.
   26978: Fixes: ALF-6107 - Fixes Tab order isses with Add event form.
   26979: Fix for ALF-8264. My Tasks incorrect capitalization.
   26991: ALF-8276 - "Select" dialog when adding items to workflow shows more information than in should
   26992: Fix for ALF-8288 - ES - Typo in serach result and also variable doesn't seem to work. Translation error, corrupted {0} strings pattern.
   26993: ALF-8148 - Details page Permissions incorrectly shows No privileges
   26994: Follow-up to r26993 (ALF-8148) for folders.
   26995: ALF-8265 - Data Lists: inconsistent capitalization; tooltip text is wordy
   26998: Fixes ALF-8091: Decode page URLs when removing dynamic welcome dashlets
   27000: Merged V3.4-BUG-FIX to V3.4-TEAM
      26999: Update to correct latest spring-webscripts-api jar
   27001: Fixes: ALF-8119 (IE8 bugs) & ALF-8118 - Clears event data from form.
   27005: Fixes: ALF-8168 - JSON encoding issue in Calendar API
   27025: Slight tweak to login dialog for iOS user usability
   27026: Fixes ALF-7764: Remove fade effect on title bar actions in IE to ensure correct image rendering
   27035: ALF-8314 - Document Library: Comment displays poorly when first word of comment is short.
   27040: Fix for ALF-8126 - Incorrect title of Transformer ImageMagick - missed labels
   27076: Merged V3.4-BUG-FIX to V3.4-TEAM
      26668: Fixes ALF-7920: Updated Linux/OSX config to add support for missing TIFF files in ImageMagic (dependant upon r26667 in ALF-BINARIES)
   27084: Merged V3.4 to V3.4-TEAM
      27083: ALF-8124: Corrected ${} placeholders in Japanese installer strings
   27091: Merged V3.4 to V3.4-TEAM
      26834: Fixes ALF-7904, ALF-8063: BitRock config updates
   27093: Fix for ALF-8308. Cannot like a folder that has rules defined for it.
     Added a necessary fix which prevents the exception being thrown.
   27094: Fixed ALF-8223: Google integration needs Admin Console to configure options.
   
   Also fixed a couple of other strings broken in a previous commit.
   27102: Further fix for ALF-8223: Google integration needs Admin Console to configure options. Removed application name to leave just enabled checkbox, username and password fields.
   27105: Fixed ALF-8277 & ALF-8253: Tooltips are not translated
   
   The JMX attribute description is no longer returned by the form processor as 99% of the time they don't contain anything useful and they are not localised.
   27106: Fix for ALF-8321: Cancel workflows move it to trashcan
   27115: ALF-7826, ALF-7949, ALF-8180, ALF-7904, ALF-8063: Reconciled project-team.xml with changes in project.xml
   27118: Merged V3.4-BUG-FIX to V3.4-TEAM
      26669: Fixes ALF-7987: Ensure rollback directories are removed on uninstall
   27119: ALF-8128: Propagate Team project name into Linux installer builder
   27137: Merged V3.4 to V3.4-TEAM
      27136: Installer string updates from Gloria
   27140: Temporary workaround to prevent rules running on cm:rating nodes (which happened for 'liked' folders ALF-8308 & ALF-8382)
   
   27162: Fixed ALF-8427 "Language packs: It's impossible to view any version of the wiki page if it contains native characters"
   27166: Updates to the invitation email templates following delivery of new l10n files.
   These changes were 'hand-merged' due to missing styling markup in the delivered l10n files.
   The new files had all styling markup removed.
   
   For the record, here's what I did:
   
   I compared the new and old files foreach {de, es, fr, it, ja} and found that all changes were short, simple and easy to merge.
   So I pasted in the main content div from the new l10n files, leaving all other styling markup (meaning css) unchanged.
   For the record, here's what diff says changed in this check-in:
   
   DE
   53c53
   <                                              
   ---
   > 
   55c55
   <                                              hat Sie eingeladen, als ${args["inviteeSiteRole"]} an der Site  ${args["siteName"]} teilzunehmen.</p>
   ---
   >                                              hat Sie eingeladen, mit der Rolle ${args["inviteeSiteRole"]} an der Site <b>${args["siteName"]}</b> teilzunehmen.</p>
   62,63c62,63
   <                                              <br />Benutzername: ${args["inviteeUserName"]}
   <                                              <br />Passwort: ${args["inviteeGenPassword"]}
   ---
   >                                              <br />Benutzername: <b>${args["inviteeUserName"]}</b>
   >                                              <br />Passwort: <b>${args["inviteeGenPassword"]}</b>
   66c66
   <                                              <p>Wir legen Ihnen nahe, das Passwort bei der ersten Anmeldung zu ändern.
   ---
   >                                              <p><b>Wir legen Ihnen nahe, das Passwort bei der ersten Anmeldung zu ändern.</b><br />
   
   ES
   52,53c52,53
   <                                              <p>Hola ${inviteePerson.properties["cm:firstName"]!""}:</p>
   <                                              
   ---
   >                                              <p>Hola, ${inviteePerson.properties["cm:firstName"]!""}:</p>
   > 
   55c55
   <                                              le ha invitado a unirse al sitio ${args["siteName"]} con el rol de ${args["inviteeSiteRole"]}.</p>
   ---
   >                                              le ha invitado a unirse al sitio <b>${args["siteName"]}</b> con el rol de ${args["inviteeSiteRole"]}.</p>
   62,63c62,63
   <                                              <br />Nombre de usuario: ${args["inviteeUserName"]}
   <                                              <br />Contraseña: ${args["inviteeGenPassword"]}
   ---
   >                                              <br />Nombre de usuario: <b>${args["inviteeUserName"]}</b>
   >                                              <br />Contraseña: <b>${args["inviteeGenPassword"]}</b>
   66,67c66,67
   <                                              <p>Le recomendamos que cambie la contraseña la primera vez que inicie una sesión.
   <                                              Para hacerlo, vaya a <b>Mi Perfil</b> y seleccione <b>Cambiar contraseña</b>.</p>
   ---
   >                                              <p><b>Le recomendamos que cambie la contraseña la primera vez que inicie sesión.</b><br />
   >                                              Para hacerlo, vaya a <b>Mi perfil</b> y seleccione <b>Cambiar contraseña</b>.</p>
   
   FR
   53c53
   <                                              
   ---
   > 
   55c55
   <                                              vous invite à rejoindre le site ${args["siteName"]} avec un rôle de ${args["inviteeSiteRole"]}.</p>
   ---
   >                                              vous invite à rejoindre le site <b>${args["siteName"]}</b> avec un rôle de ${args["inviteeSiteRole"]}.</p>
   62,63c62,63
   <                                              <br />Nom d'utilisateur : ${args["inviteeUserName"]}
   <                                              <br />Mot de passe : ${args["inviteeGenPassword"]}
   ---
   >                                              <br />Nom d'utilisateur : <b>${args["inviteeUserName"]}</b>
   >                                              <br />Mot de passe : <b>${args["inviteeGenPassword"]}</b>
   66c66
   <                                              <p>Nous vous conseillons vivement de modifier votre mot de passe lors de votre première connexion.
   ---
   >                                              <p><b>Nous vous conseillons vivement de modifier votre mot de passe lors de votre première connexion.</b><br />
   70c70
   <                                              <p>Si vous souhaitez décliner l'invitation de ${inviterPerson.properties["cm:firstName"]!""} cliquez sur ce lien :<br />
   ---
   >                                              <p>Si vous souhaitez décliner l'invitation de ${inviterPerson.properties["cm:firstName"]!""}’, cliquez sur ce lien :<br />
   
   
   IT
   53c53
   <                                              
   ---
   > 
   55c55
   <                                              ti ha  inviatato a partecipare al sito ${args["siteName"]} con il ruolo di ${args["inviteeSiteRole"]}.</p>
   ---
   >                                              sei stato inviatato a partecipare al sito <b>${args["siteName"]}</b> con il ruolo di ${args["inviteeSiteRole"]}.</p>
   57c57
   <                                              <p>Fare clic sul collegamento per accettare l’invito dell'${inviterPerson.properties["cm:firstName"]!""}':<br />
   ---
   >                                              <p>Fare clic sul collegamento per accettare ${inviterPerson.properties["cm:firstName"]!""}'s l'invito:<br />
   62,63c62,63
   <                                              <br />Nome utente: ${args["inviteeUserName"]}
   <                                              <br />Password: ${args["inviteeGenPassword"]}
   ---
   >                                              <br />Nome utente: <b>${args["inviteeUserName"]}</b>
   >                                              <br />Password: <b>${args["inviteeGenPassword"]}</b>
   66c66
   <                                              <p>Si consiglia di cambiare la password quando si effettua l'eccesso per la prima volta.
   ---
   >                                              <p><b>Si consiglia di cambiare la password quando si effettua l'eccesso per la prima volta.</b><br />
   70c70
   <                                              <p>Per rifiutare l’invito dell’${inviterPerson.properties["cm:firstName"]!""}, fare clic su questo collegamento:<br />
   ---
   >                                              <p>Per rifiutare ${inviterPerson.properties["cm:firstName"]!""}’s l'invito, fare clic su questo collegamento:<br />
   
   
   JA
   53c53
   <                                              
   ---
   > 
   55c55
   <                                              ????${args["siteName"]} ??????${args["inviteeSiteRole"]}?????????????????????</p>
   ---
   >                                              ????<b>${args["siteName"]}</b> ????? ${args["inviteeSiteRole"]} ????????????????????</p>
   62,63c62,63
   <                                              <br />????: ${args["inviteeUserName"]}
   <                                              <br />?????: ${args["inviteeGenPassword"]}
   ---
   >                                              <br />????: <b>${args["inviteeUserName"]}</b>
   >                                              <br />?????: <b>${args["inviteeGenPassword"]}</b>
   66c66
   <                                              <p>?????????????????????????????
   ---
   >                                              <p><b>?????????????????????????????</b><br />
   
   27172: Fixed ALF-7856 "Team: DocLib action displaying incorrect tooltip text"
   27339: ALF-8330 - ALL LANG - "Assigned To" in Data List created displays untranslated
   27340: Fixes Encoding issue in L10N files.
   27471: Fix for ALF-8150 - check for visibility before applying focus to element for IE.
   27499: Drop one and two of updates from translators based on rev26820
   27501: ALF-8151 - Filetype icon or is incorrectly displayed at the Content I'm editing dashlet
   27507: ALF-8478: Default repeat interval for activity email notifications should be 1 day
   27520: Fixed ALF-8329 "Consumer can add comments to files, folders, links and blogs"
   27527: Fixes ALF-8409: Ensure that UTF-8 encoded characters in file names can be uploaded to folders (that may also contain UTF-8 encoded characters) via DND in FireFox 3.6
   27531: Merged V3.4-BUG-FIX to V3.4-TEAM
      27525: Merged V3.4 to V3.4-BUG-FIX
         27120: Resolve ALF-8187: Transaction retries of CMIS webscripts failing
   27543: Fixed ALF-8464 "Start Workflow: Search for groups still requires minimum 1 character"
   27562: Merged V3.4-BUG-FIX to V3.4-TEAM
      27560: Fix for ALF-8434 - AVMRemoteStore not setting UTF-8 response encoding for some methods
   27572: Fixes: ALF-7596 - Config values not being correctly read in FTL
   27573: Fixed ALF-8504: Non-admin users are warned about license expiry too soon
    - ALF-8502 Adjust admin warning period from 30 to 21 days
    - ALF-7259 RTEAM 33: RepoAdmin Web Script to report Red/Amber/Green
   27592: Fixes: ALF-8444 - JA properties file in incorrect location.
   27594: ALF-8508 - Document Library: Google Docs actions not correct
   27596: Fixed ALF-8484	"Consumer and Contributor should not be able to choose button "Revert" of the document"
   27598: Annotated properties file to indicate which text is exposed to the UI and therefore needs translating. Needed for: ALF-8442
   27615: Fix for ALF-8501 - License warning box needs to be toned down in colour
   27616: Tweak for IE
   27617: Fixes: ALF-8423 - string missed in earlier merge
   27619: ALF-7904: Synchronize alfresco-customteam-settings.xml with alfresco-customstack-postgres-settings.xml!
   27625: ALF-7518 - Update Team Help and Tutorial URLs once finalised. * DO NOT MERGE *
   Note: version.edition cannot be used as a placeholder due to the mismatch between "edition=Enterprise" and help URL containing "team"
   27626: Change default value for "useTitle" to true for Site DocLib
   27648: Fix for ALF-8552
   27649: Fixed ALF-8495: Alfresco Logo is incorrectly displayed in notify user letter
   
   Usual note with these checkins applies, clean database will be required to see the updated templates.
   27650: Fixed ALF-8425: Select Tags button is missing at the Edit Properties page for msg files
   27664: Issue checking in XSLX Google Docs (related to ALF-8580)
   
   27667: ALF-7518 - Update Team Help and Tutorial URLs once finalised
   New tutorial URL for Share, now hosted within main docs system; uh-tutorial.html topic page.
   27683: Merged BRANCHES/DEV/dwebsterTeam to BRANCHES/V3.4-TEAM:
      27675: DE: Drop 3 & 4 for Team translations based on r27552
      27676: ES: Drop 3 & 4 for Team translations based on r27552
      27677: FR: Drop 3 & 4 for Team translations based on r27552
      27678: IT: Drop 3 & 4 for Team translations based on r27552
      27679: JA: Drop 3 & 4 for Team translations based on r27552
      27680: L10N updates to system-messages.properties (for License messages exposed to UI)
   27686: Fixes: ALF-8266
   27694: Change related to ALF-8556. Sometimes Google Docs cannot be checked out.
   This change was suggested by Roy. cm:failedThumbnail nodes were deleted onUpdateProperties. Now they are only deleted if there are no locks preventing their deletion (e.g. due to being checked out.)
   27710: Fixed ALF-7721: There are no field rescrtictions on 'Edit: Fileservers' form and ALF-8558: There is no pattern for Username field in Google Docs
   27711: ALF-8590 - Check Out for some documents is not working
   ALF-8591 - CheckIn form Google docs for some documents is not working
   
   Google Docs-specific filter code added to Manage Aspects UI to remove "gd:googleEditable from the list of addable aspects unless the file's mimetype is supported (i.e. txt, doc, xls, ppt). Google Docs enabled ootb in team-config.
   27713: GDoc - Fix for checkout of .odt files (see ALF-8599)
   
   27723: Added back theme name string that was removed in rev 26971
   27740: Updates from Gloria following bundle completeness analysis.
   27755: Removed extra unused Japanese translation files.
   27756: ALF-8207 - ALL LANG - Themes are not translated
   27759: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V3.4-TEAM:
      27758: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX:
           27757: Fix for ALF-8430.
   27761: JA Updates from Gloria following bundle completeness analysis.
   27767: Fixes: ALF-8279 - reloads translation Gloria sent.
   27768: ALF-8213 - Manage My Subscription link now directs to team.alfresco.com - tooltip from label added
   27769: Fixes ALF-8652: Add removed quotes and revert translations back to correct language
   27770: Fixes: ALF-8228: Column widening needed
   27771: Initial commit of these translated files from Gloria.
   27772: ALF-8555 - Incorrect behavior of enabling Google docs (Really: Forms get submitted twice in certain circumstances)
   27773: ALF-8329 - Consumer can add comments to files, folders, links and blogs
   Fixed: 8. Open details page for file and try to add comment --> comment added successfully;
   27774: Spanish Gender Changes following review from Gloria.
   27779: Final fixes from L10N completeness check.
   27792: Remove debugging code from r27772
   27804: ALF-8207 - ALL LANG - SpringSurf issue with default theme definition
   27826: Manually reverts (to a version prior to r27683) a file in each language that was incorrectly supplied in English, and ensures they match the current EN properties.
   27827: Fixes: ALF-8210
   27843: Fix for ALF-8449 - ALL LANG - site themes are not translated (Customise Site page)
   27873: Merged V3.4 to V3.4-TEAM:
      27871: Fixes ALF-8124: Ensure Spanish locale for installer shows product name correctly
   27883: Implementation of ALF-8737 Support for thumbnailing/previewing of additional mimetypes (Adobe). Also video/audio playbac
   k.
   
   This check in enables thumbnails for Adobe Photoshop, recent Adobe Illustrator files and previews for Adobe Photoshop, recent Adobe Illustrator files
   as well as metadata extraction for Adobe Illustrator files (PDF-based formats).
   
   It also enables video playback of .m4v files, where the browser supports it.
   I have also added placeholder icons for .m4v files.
   Adobe Photoshop (.psd) files are handled by ImageMagick. However our existing ImageMagick-based content transformer excludes most mimetypes that don't start with "image/". By allowing "application/photoshop" to be accepted, that transformer
    will now perform thumbnails and previews.
   Recent Adobe Illustrator file formats are pdf files and so can use the PDF transformers/extractors i.e. PDFRenderer and 
   PDFBox and pdf2swf.
   I have added a new complex transformer for .ai files which uses the existing PDF/ImageMagick component transformers.
   
   New JUnit test cases for these transforms.
   
   As part of testing, we discovered that IE9 will not play mp3s of mimetype == audio/x-mpeg, only audio/mpeg.
   The latter is the correct mimetype, the former is out of date, but Alfresco was using the former. So we've updated that MIME type in various places in the code.
   27888: Google Docs 
     - Updated client google doc api jars
     - Fixes ALF-8592: Incorrect behavior on permissions for Google docs
   
   27894: Minor fixes for iOS:
   . overflow content shown by default in dashlets
   . doclib long filenames no longer cause screen to resize
   . ipad css overrides
   . YUI dialogs no longer jump around the page during text entry input
   27904: Minor fixes for iOS usability:
   . Drag&drop doclist help removed for mobile devices
   . Create New DataList shows list as full height (not scrollable)
   . Removed default webkit inner shadow from input fields
   27915: Minor fixes for iOS usability: Forced scrollbar appearance on overflowed div elements


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@27939 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-05-20 13:30:26 +00:00
Dave Ward
419ecfb9e7 Merged V3.4-TEAM to HEAD
24882: Branch for Team
   24883: Version Edition label
   24906: Partial implementation of ALF-6566. Replace gears image...
     This check-in adds support for the feature as described in JIRA. However we do not yet have
     the icon graphics files. I have therefore used some temporary icons in order to flush out
     implementation issues and to enable browser-based testing.
     A future check-in will add the correct placeholder icons and if they follow the naming
     convention, no change in code should be necessary.
   
     Also added and modified some test cases.
   24909: ALF-6606: Configurable sorting for Share Document Library. Also change Show/Hide Folder button to icon. (Placeholder icons)
   24914: ALF-6564: Initial cut of JMXFormProcessor, will show all attributes of a given MBean and has the ability to persist an attribute value.
   24916: Initial Alfresco Team project structure and build targets
   24917: First tranche of thumbnail icons for ALF-6566. Replace gears icon.
     Have added icons for some basic mime types and removed some temporary icons.
     I had to do a clean repo build to flush out the temporary docx and jpeg icons.
   24919: svn ignore patterns
   24922: Missed files for team build targets
   24932: Add a simple AVM to Zip exporter service, initially for use by the site exporter
   24935: Start on a java backed webscript to export a site, including all the details (ALF-6567)
   24945: Removed two unnecessary TODOs from the RatingService code.
   24949: Improved documentation for RatingService webscripts.
   Added sample JSON responses for two webscripts.
   24956: Implementation of ALF-6792. RatingSchemes should allow self-rating.
     Formerly, the cm:creator of a node could never apply a rating to it. An unchecked RatingServiceException would be thrown if they attempted to do so.
     With this check-in ratingScheme beans have a new property: selfRatingAllowed. The exception will now only be thrown if a cm:creator attempts to rate their own content in a scheme where this property is false.
     The property is true by default and in particular, is true for "likesRatingScheme".
   24958: ALF-6599: First pass DND file upload - FireFox4/Chrome support for single/multifile DND upload with basic progress
   24961: Added additional data to the response coming from rating.post.
   I have added averageRating, ratingsTotal and ratingsCount to that response.
   24963: ALF-6625: Balloon Popup Framework. Initial checking. More work maybe required when we start using it, or when designs are complete.
   24964: ALF-6598 "Configure Site page refactor"
   - page.lib.js - Freemarker lib to sort out used pages and which links and labels to use
   - Drag n drop
     * now supports horisontal lists
     * improved tabfocus and keynavigations
     * callbacks can be attached on dnd events: delete-clicks, enter-clicks, element-moved, element-duplicated
   - Alfresco.util.isVisible - Checks if the element and all its parents are visible and displayed in the ui.
   - Alfresco.util.PopupManager.getUserInput now accepts a "input" parameter that can be set to "text" ("textarea" is default)
   - Automatic click listeners can be defined as: 
     <a href="#onRenameClick" class="${el}" rel="${page.pageId?js_string}">${msg("link.rename")}</a>
     which will call:
     onRenameClick: function(pageId, anchor) {}
   24965: Changing date format of appliedAt JSON property to xmldate.
   24971: ALF-6600: Event handling performance improvements for DND file upload
   24976: Added team.war to continuous assemble-tomcat
   24977: ALF-6600: Initial pass at DND upload highlighting
   24979: Add method AuthorityService.getAuthorityNodeRef, and unit tests for it
   24980: UI label change for Team install
   24981: Set security permission on the new AuthorityService.getAuthorityNodeRef method, in line with the other get methods
   24987: ALF-6607 - Likes, favourite and comment actions. Also DocLib panel redesign. Updates to Rating Service to better match Team use cases.
   24989: ALF-6601: Added JavaScript multipart data constructor for FireFox 3.6 support
   24990: Fix "Access Denied" error when navigating into a "Liked" folder.
   25000: Merged V3.4 to V3.4-TEAM
      24999: ALF-6764 - Updated copyright year to 2011
   25004: ALF-6601: Set file size limit, HTTP status code error handling
   25007: Add user, group and person ACP exports to the Site Export webscript.
   (The user export is provisional, pending a service level way to access the user NodeRef)
   25008: ALF-6788: Update dashboard template to provide full width component and presets updates to reflect new default layouts.
   25017: Initial check-in for ALF-6809. A service to managed deleted items.
   This check in adds a basic REST API for GETting and DELETEing deleted items from the archive store.
   JUnit tests of the REST API are included but are not yet complete.
   
   25018: Trivial fix for failing test case related to ALF-6809
   25019: A previous check-in (25017) accidentally included an extra Java file that wasn't ready.
   File is related to ALF-6809 and will be implemented today.
   This check-in removes the internals of the class to allow it to compile.
   The class is not injected into the spring application context and is essentially dead code pending its implementation later.
   25027: Adding nodeType to the archivednodes.get webscript response.
     Requested by UI as part of ALF-6809.
   25035: ALF-6789: Personal dashboard welcome (with wireframe styling)
   25036: ALF-6782 - Undelete administration console page (WIP)
   ALF-6784, ALF-6786, ALF-6787
   25037: ALF-6564: Added operations to default form, all parameter-less operations are displayed as a button on the form. Clicking a button executes the operation after saving all attribute values.
   25038: Added a node filter to the archivednodes.get webscript. Currently excluding cm:thumbnails.
     A new bean on the script's controller class that allows injection of nodetypes to be excluded.
     Should be trivial to exclude other node types later and easy to exclude based on other criteria.
   25039: Part of ALF-6809. Deleted items were returned from archivednodes.get in the wrong order.
   They are now sorted by archive datetime most recent first. (Was previously sorted with most recent last.)
   Also switched the test case, which was backwards too!
   25040: Changing some copyright headers from 2010 to 2011.
   25041: ALF-6564: JMX forms can now be configured with selective attributes and the set of operations. Also includes an example form configuration for the outbound email almost matching Linton's wireframes.
   25042: ALF-6788: Fix rendering of old (V3.4) user dashboards stored in AVM with new Team layout
   25044: Part of ALF-6809. Added displayPath value to archivednodes.get.
   25047: Part of ALF-6809. Reconfiguration of cm:thumbnail archive behaviour.
   Formerly, we were archiving cm:thumbnails on deletion and filtering them from the archivednodes.get webscript which was not ideal as they remained in the archive.
   This check in removes the filter on the GET webscript and prevents cm:thumbnails from being archived in the first place.
   25049: ALF-6782
    - added Trashcan to admin tools menu
    - cleaned up list, show display path
   25050: ALF-6782 - css tweaks
   25052: Added check for multiple calls to onHistoryManagerReady() as workaround for issue with multiple History Manager objects when using Alfresco.util.DataTable.
   25053: Test case refactoring as part of ALF-6809
   25055: ALF-6803: First drop of aggregate file upload progress information.
   25056: Part of ALF-6809. A preliminary PUT webscript that is used to restore nodes from the archive to their original loaction.
   Currently only works on a single node per call (which is what the JIRA requires).
   Test code currently incomplete. I'm checking in now to give UI something to work with.
   25057: Fix for failing test case, which was part of ALF-6566.
   25058: ALF-6567 - AVM importer, which can load a zip file's contents into a specified AVM filesystem. Includes a bootstrap wrapper around the main importer.
   25068: Part ALF-6893: RTEAM 03: Expose restrictions using RepoAdminService
     - Subtask of ALF-6832: AT17: License restriction reporting
     - Added RepoAdminService.getRestrictions in Java and Webscripts APIs
     - Currently nulls returned indication 'no restrictions'
     - Cleaned up unused AdminService
   25069: ALF-6625 - adds a switch to control what calendar views are enabled and switches off Day, Week and Month views in Team.
   25073: Test case overhaul and minor tidying of code. Part of ALF-6809.
   25074: ALF-6803: Style updates to upload progress info
   25075: ALF-6601: Updated in-memory file upload check so that failure is based on total (not individual) file size.
   25081: Merged V3.4 to V3.4-TEAM
      25051: Build Fix: ALF-6865 CopyServiceImplTest.testCopyToNewNodeWithPermissions failing on permission copying
   25082: Part ALF-6893: RTEAM 03: Expose restrictions using RepoAdminService
     - Subtask of ALF-6832: AT17: License restriction reporting
     - Added RepoAdminService.getUsage in Java and Webscripts APIs
   25084: Improve how the Site Exporter gets at the users for a site, and have the user authentication details export skipped if a non-repository based authenticator is enabled
   25085: Final part of ALF-6809. Support for paging the results from archivednodes.get.
   Follows the standard maxItems, skipCount convention and enables paging in the trashcan view automatically thanks to Kev's use of the convention.
   25088: Final, final part of ALF-6809. Throwing 4xx, 5xx exceptions for nodeArchiveService-level failures to restore nodes
   25090: ALF-6601: Updated in-memory upload limit to be configurable
   25096: ALF-6601: Updates to DND highlighting and behaviour, set correct upload limit in bytes, NLS updates
   25101: Fixing failing test cases. Fallout from recent changes to the JSON response formats in these webscripts.
   25103: ALF-6613 - SpringSurf improvements to allow easier refactoring of Document Details page
    - latest SpringSurf libs with RequestCachingConnector improvements
    - removed manual request level caching of remote calls responses in web-tier components - now completely automatic
   25104: ALF-6803: DND upload dialog styling
   25106: ALF-6802: Added feature detection to disable drag'n'drop events (disables for IE6, IE7 & IE8)
   25108: ALF-6564: Added a check to the JMXFormProcessor to ensure the current user is an administrator. Also relaxed the rules in the checkbox control so it can be used for string values not just boolean values.
   25113: ALF-6789: Updated CSS to support IE6/IE7
   25116: Prevent server-side exception when navigating trashcan; related to paging. (ALF-6809)
   25117: ALF-6824 - Only show "Like" and "Comment" actions if a user has the correct permissions. Additional fixes for IE7.
   25118: Fix incorrect category aspect name. Missing file from r25117
   25119: ALF-6645 - Share and Team branding updates
   25121: Removed erroneous comment block
   25123: Merged HEAD to BRANCHES/V3.4-TEAM:
      25115: Fixes: ALF-6336 - resolved incorrectly translated date formatting strings.
   25124: Add a new bootstrap component for bootstrapping Sites. Handles the contents, AVM and authentication, people and their group membership to follow. 
   (Uses singleton spring beans in line with the patch service's use, to ensure that when loaded from a bootstrap extension things still occur in the correct order)
   25128: Merged V3.4 to V3.4-TEAM
      25127: Merged V3.3 to V3.4
         25126: ALF-6903 - Share theme feature does not work. Also fixes issue with MultiThreadedHttpConnectionManager in SpringSurf.
   25130: Continue with the site bootstrapper - finish supporting the loading of the site contents ACP
   25132: Work on ALF-6832:TR25: License restriction reporting
    - ALF-6893: RTEAM 03: Expose restrictions using RepoAdminService
    - ALF-6911: RTEAM 02: Record and expose system attributes
    - Added RepoUsageComponent
      - Unit test incl. testLicenseUse
      - Persists and retrieves usage data using AttributeService
   25133: ALF-6789: Added "Close" link to dynamic-welcome dashlet and associated webscript
   25135: ALF-6789: Add missing localization
   25136: ALF-6601: Defensively code against missing config
   25137: Fix up of transfer test.
   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.
   25139: ALF-6804: Disable drop outside of document list
   25140: ALF-6887 - for sending HTML emails
   - prelim support - either text explicitly starts with "<html" and/or is passed via new HTML param
   25141: Updated version to 3.5.0 for Team
   25142: ALF-6834 - activities feed email notification (1st cut)
   - for sprint 1 demo (ALF-6928, ALF-6929, ALF-6931, ALF-6932)
   - note: to demo ... manually copy "activities-email.ftl" into repo (/Company Home/Data Dictionary/Email Templates/activities) and configure your own email address (for one or more users)
   25145: ALF-6602: Added first time instructions for DND upload
   25147: Merged HEAD to BRANCHES/V3.4-TEAM:
      25100: Fix for build issue Steve was encountering on new build boxes using Ant 1.8.x
   25151: ALF-6790: Updated CSS and images to match latest mockups
   25161: Basic support for canned queries
    - ALF-6910: RTEAM 01: Query support for system-wide attributes (ALF-6832)
    - At this stage it only has support for count-style queries
    - General-purpose change that will be needed for main Enterprise branches
   25162: Temporarily disables the balloon framework while I fix a bug in it.
   25163: Basic support for canned queries: extended tests
    - ALF-6910: RTEAM 01: Query support for system-wide attributes (ALF-6832)
    - General-purpose change that will be needed for main Enterprise branches
   25164: Further Site Export/Bootstrap work - support importing People (profiles for users), and placing them into the correct groups
   25165: ALF-6905 - RTEAM 04: Add restrictions to trial license
   25166: ALF-6644 - Theme per site.
    - Theme selection for a site and its child pages can be made in the Customise Site page
    - Framework now allows theme per application, site or page.
   25167: ALF-6790: First pass at new site dashboards welcome dashlets
   25168: ALF-6832 - RTEAM 19: Update DescriptorService
   25169: ALF-6906 - RTEAM 18: Report Team or Enterprise in startup log
   25171: ALF-6998 - activities feed email - reuse Share messages (including L10N)
   25172: ALF-6910: RTEAM 01: Query support for system-wide attributes
    - Added and call canned queries for users and documents
    - ALF-6832 TR25: License restriction reporting
   25175: ALF-6998 - activities feed email - fix build copy of activity-list*.properties
   25176: ALF-6962 - activities feed email - use configured share url (from sysAdminParams)
   => share.protocol, share.host, share.port, share.context (note: you may need to override for dev/demo env)
   25178: ALF-6564: TR12: Implement JMX Form Processor. Added tests, fixed a couple of bugs in form processor and added all Mike's form config for MBeans we're provisionally exposing.
   25187: ALF-6998 - activities feed email 
   - quick fix if running within repo-only context (eg. via Eclipse)
   25188: Prevented NPE with Enterprise edition built as community.
   25189: Expose getAllowWrite on the TransactionService API
    - This is a user-independent flag as opposed to isReadOnly, which makes allowance for the 'System' user
   25190: Work on ALF-6832:TR25: License restriction reporting
    - ALF-6893: RTEAM 03: Expose restrictions using RepoAdminService
    - Use TransactionService as the source of 'isReadOnly'
   25191: Fix to issue where null could be passed as URI Tokens
    - fixes issue where pages failed to render on first display since rev 25166
   25192: CSS tweak
   25194: I18N'd system startup message
   25195: Restrictions now sets current time and readOnly property.
   25196: ALF-6790: Added user prefs to enable site welcome dashlet visibility
   25198: ALF-6790: Fix user close welcome dashlet persistence. Added site welcome dashlet close reload.
   25200: ALF-6803: Update upload dialog title to display (encoded) folder name (not entire path)
   25203: ALF-6834 - TR15: Activities feed email notifications
   - ALF-6931 - RTEAM 23: update activity feed DAO to filter by min id and/or max items
   - ALF-6929 - RTEAM 21: now uses last feed id for each user
   - minor cleanup (eg. tweak template to deal with null message)
   25204: ALF-6790: Fixed broken site preference logic
   25206: Checkpoint ALF-6608 - Inline property editing - name field. Also paves the way for ALF-6611 - Inline property editing - any meta field. Currently does not constrain input values, nor handle repository errors (e.g. duplicate name).
   25212: ALF-6602: Updates to reflect latest designs
   25213: ALF-6564: More MBean form config
   25248: A new schema version range for 3.5
   25249: ALF-7049 - RTEAM 12: Disable Alfresco Explorer
   25252: ALF-7050 - RTEAM 09: Disable MT
   25263: Fix trailing comma for IE browsers
   25268: Implementation of ALF-6829 Popularity of a node (RatingService).
   
   This check-in is actually a fairly generic support for rolled up property values within rating schemes.
   Popularity is currently the only concrete rollup in the system, but it should be possible to add more without too
   much difficulty.
   
   Given the published API for the rating service, we have added rollups for "ratingCount" and "ratingTotal" for the built-in rating schemes (likes). Therefore searching/sorting on either cm:likesRatingSchemeCount or cm:likesRatingSchemeTotal, both of which are defined in an aspect cm:likesRatingSchemeRollups should give popularity for the likes rating scheme.
   
   
   Additions to the content model.
     I have added aspects, properties for the built-in rollups, namely count and total.
   
   Spring changes
     The rating scheme(s) now have rollups injected into them. These rollups are algorithm classes that know how to calculate the rolled up props.
     Naming conventions are used to determine the output property and are captured in RatingRollupNamingConventionsUtil.java.
   
   API changes
     New methods: RatingService.getRatingRollup(NodeRef, String, String)
     & RatingScheme.getPropertyRollups()
   
   Changes to the RatingService implementation and JUnit test code.
   
   To roll your own rating rollups:
     To add your own rating rollup, you need to reuse one of the existing AbstractRatingRollupAlgorithm subclasses or create a new one.
     That class will produce the value of the rolled up property by iterating the ratings in the given rating scheme for a given node.
     You need to inject your rollup algorithm into the rating scheme bean in rating-services-context.xml
     On applyRating() and removeRating() the RatingService will check the rating scheme for any registered rollup algorithms and will have them recalculated.
     It will then use the naming conventions described in the JIRA and in RatingRollupNamingConventionsUtil to get aspect/property names for each of the rollups.
     It will then add the property value in the normal way.
     Therefore, you need to extend the content model to include the expected aspect and property values. Follow likesRatingScheme for a sample.
   25273: Fix failing unit test.
   25274: DocLib sorting support for "popularity" (Likes rating scheme)
   25277: ALF-6602: Updated instructions to reflect new design. Info shown now dynamically based on site ownership/access rights/browser feature support
   25278: Merged BRANCHES/V3.4 to BRANCHES/V3.4-TEAM:
      25267: ALF-1070 - if site/user is deleted then immediately clean associated site/user feed
   25279: ALF-6601: Updated to handle 0 byte dropped files (or folders)
   25280: ALF-7009 WIP checkpoint
    - Also removed some code that is obsolete since ConsoleTool class extends Alfresco.component.Base
   25286: ALF-6599: Changed folder DND target back to image (not row)
   25298: ALF-7009 - Upload and replace Share logo
   25311: ALF-7080 / ALF-7002 - ActivitiesFeed subsystem (+ option to enable/disable job triggers)
   - moved ActivitiesFeed into subsystem for dynamic mgmt via JMX
   - FeedNotifier repeat interval can be dynamically changed
   - also added "enabled" property to AbstractTriggerBean => FeedNotifier job can be disabled / re-enabled
   25312: ROLLBACK (Partial) 25249 ALF-7049 Disable Alfresco Explorer.
   25313: ROLLBACK 25252 : ALF-7050 - RTEAM 09: Disable MT
   25317: ALF-6930 - bootstrap / patch activities email template
   25331: ALF-6890 - RTEAM 16: License-based restrictions: Number of users
   25333: Merged BRANCHES/V3.4 to BRANCHES/V3.4-TEAM:
      25319: Build/test fix (fallout from ALF-1070)
      25322: Build/test fix (fallout from ALF-1070)
   25356: ALF-6930 - bootstrap / patch activities email template
   - missed file, sorry !
   25358: ALF-6834 - Activities email: tweaks
   - pass through repeatInterval (to template model)
   - add exclude email list (eg. for default admin)
   25360: RTEAM 28: License restriction reporting: Force refresh
    - Added API for selective updates of usage data based on an enumeration: USAGE_USERS, USAGE_DOCUMENTS or USAGE_ALL
    - When people are added, for instance, usage will be updated and then retrieved for checking.
   25363: ALF-6639 - Default collaboration dashboard
    - NOTE: may need Team overlay version on merge if this change is *not* the default for Swift
   25364: Modified usage/restriction admin webscripts to use a common FTL lib for the json output and added some missing quotes around the license mode value.
   25365: ALF-6597: Added DashletTitleBarActions widget and applied to WebView dashlet
   25367: ALF-7082 - Remove Network Dashlet
    - Removed network dashlet from codeline
    - Support in WebScripts to allow hook for override of exception handling from webscripts for specific use cases
    - Surf LocalWebScriptRuntime overrides error handling looking for specific case of SC_NOT_FOUND - and silent ignores missing webscript components
    - Improved Share handling of missing webscript components that have already been bound into a dashboard (i.e. not a missing "slot" but an existing component binding that points to a missing webscript URL) - this will also allow for easier removal of other existing dashlets in the future without requiring repo-side patches or similar.
   25369: ALF-7042 (ALF-6832) RTEAM 28: License restriction reporting: Force refresh
    - Added unit test for update WebScript
   25375: Implementation of ALF-7024. Document versions service/webscript needs to return avatar url.
   The avatar url has been added to the JSON response as requested.
   If there is no avatar, a JSON null is returned as requested.
   25377: Add maxDocs, maxUsers and license mode to License JMX bean
   25378: Adding additional property to version.get webscript: a correctly-formatted ISO8601 date.
   This has been added as requested in the comments of ALF-7024.
   25381: Refactor of LicenseComponent and related to produce LicenseMode in descriptor (ALF-6907 RTEAM 19)
    - Need actual enum to do later usage updates according to mode
   25382: ALF-7053 - RTEAM 07: Disable Transfer
   25387: ALF-6564: Finished JMXFormProcessor (again). There is now a configurable list of operations to ignore, revert is ignored by default. The labels for the buttons are also localisable now.
   25390: Fixed up License MBean after changing the descriptor API
   25391: ALF-6911: RTEAM 02: Record and expose system attributes
    - Added job locking around individual usage queries
    - It is possible to concurrently update user and document counts
    - Exposed true/false return value on updates and added this to usages webscripts
   25392: Switched version edition back to Community
    - If we distribute Team using a community build, then we should know about it.
    - Team functionality is triggered by an Enterprise build or TEAM license.
   25393: Undid rev 25392
   25394: Work on ALF-6832:TR25: License restriction reporting
    - ALF-6893: RTEAM 03: Expose restrictions using RepoAdminService
    - ALF-6911: RTEAM 02: Record and expose system attributes
    - Added RepoUsageMonitor
      - Self-starting schedule
      - Only checks for restrictions that are in place
      - Issues warnings and errors; puts system into read-only mode on violation
   25403: ALF-6890 - Switch over of user query to database backed query.
   25408: WIP checkpoint for Agenda view refactor:
      - Adds Alfresco.util.friendlyDate to supply "Yesterday/Today/Tomorrow" style date
      - refactors getEvents into a common function in calendar-view.js (calendar-view-month not touched because it gets elements from the DOM rather than API)
      - Uses DataTables to display agenda events (currently unformatted)
   25410: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V3.4-TEAM:
      25409: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX:
           25407: Merged BRANCHES/V3.3 to BRANCHES/V3.4:
                25401: Allow continuous.xml database drop/create on postgresql and mysql to support the database being on a different machine
                25406: We no longer need a 2nd _test database for the unit tests, so remove the code that created/removed them during the continuous build
   25411: Fix to allow application logo to be uploaded with same filename as a previous logo.
   25416: Implementation of ALF-7100. Comments webscript doesn't return dates in iso8601.
   I added iso8601-formatted date fields jsut as for ALF-7024.
   25418: Implementation of ALF-7173. Remove the RatingService restriction whereby a single user can only rate a single node with one RatingScheme.
   Change to the RatingService javadoc so that it doesn't mention the restriction.
   Additional method in RatingService: getRatingsByCurrentUser - to return multiple ratings.
   Reimpl's testOneUserRatesInTwoSchemes test case from a -ve to a +ve test case.
   Rewrote the REST test cases slightly to cover the case of a single user multiply rating a node.
   Various changes through the apply() case to support this.
   25419: Change the Site Loading for ALF-6567 from a bootstrap to a patch. This means that if a site is loaded then deleted, it won't be re-loaded again.
   25420: Fixed unit test for ALF-6911: RTEAM 02: Record and expose system attributes
    - Forgot to prompt user usage changes to check numbers against
   25422: Addition of selfRatingAllowed field to ratingdefinitions.get webscript.
   As this is now a configurable property on a scheme, it should be reflected in the REST API.
   25423: Node rows that transition to the deleted state (not archive) are given type sys:deleted
   25425: Add an example extension context file to patch-load an exported Site, and allow the import path to use defaults to reduce the number of settings required
   25426: ALF-6597: Added temporary tooltip code for DashletToolbarActions (and updated to WebView dashlet to use it)
   25427: ALF-6789: Removed dynamic welcome dashlet from add dashlets menu
   25428: ALF-6599: Removed encoding of spaces in displayed location name on DND upload to folder
   25430: ALF-6890 - tweaks to query and person service for user limit stuff.
   25432: ALF-6597: Updated DashletToolBarActions to ensure fade in on first mouseover
   25433: Implemented ALF-6613, ALF-6614, ALF-6615, ALF-6616, ALF-6617, ALF-6618, ALF-6619, ALF-6620, ALF-6621, ALF-6622 - PART #1 
   - ALF-6613 TR22: Document Details page improvements
   - ALF-6614 Page redesign and refactor
     * Components are atomic and doesn't need global events to work.
   - ALF-6615 Document Actions panel
   - ALF-6616 Tags panel - NEW, replaces the old "info (tags+permissions)" component
   - ALF-6617 Share links panel
   - ALF-6618 Properties panel
   - ALF-6619 Permissions panel - NEW, replaces the old "info (tags+permissions)" component
   - ALF-6620 Workflows panel
   - ALF-6621 Version History panel
   - ALF-6622 Comment component redesign and refactor
   - alfresco-macros.lib.ftl
     * <#function uriTemplate id> 
       Helper for getting a uriTemplate in freemarker
     * <#function userProfileLink> 
        Helper fopr rendering a userProfile link in freemarker
   - alfresco-util.js - Rhino Javascript-helpers
     * function error(code, message, redirect) 
       Helper for redriting and throwing a webscript error
     * function param(name, defaultValue)
       Helper for placing a webscript "param" in the model, lloks for param in the following order args, page.templateArgs, properties, defaultValue. 
       If no value is found and no default value was given an error is thrown.
       Useful to avoid webscripts "crashing" when accessed from /service/ rather than from /page/ path, i.e. when refreshed/reloaded using ajax.
     * function getRepositoryUrl()
     * function getRootNode()
     * function getDocumentDetails(nodeRef, site)
   - alfresco.js
     * New in Alfresco.util.DataTable
       c.dataSource.doBeforeParseData - to modify response before rendering, i.e. if an array is the respons rather than an object
       c.dataTable.config.className - if another css class than alfresco-datatable shall be used
       c.paginator.history - set to false to avoid browser history management to kick in
       reloadDataTable() - to reload
       getData(record) - to get data related to a row in the table
     * sanitizeMarkup() - moved out code from request(), strips out <script> tags from html
     * New in Alfresco.base.Component
       - createYUIButtons()
       - attachLinkClickListeners()
       - refresh(url) - gets new markup from server and replaces the old and unregisteres the js component instance
   - base.css 
     * .alfresco-twister-actions - use this class to place actions in the twisters that are visible when twister is opened
     * .document-version - common css class for version label
     * .alfresco-datatable - Common styling for datatables created from Alfresco.util.DataTable, 
        gives list like appearence and removes headers and bprders.
   - NOTE! Tested in FF3.5 & SF4, PART #2 will contain: 
     x-browser testing, tidy up comments form, social gadgets in header, activities after new version upload
   25437: ALF-6789: Added confirmation dialog for welcome dashlet close
   25439: More WIP for Team's Agenda view. General clean up, code commenting and start of styling.
   25443: ALF-6597: Added actions to remaining dashlets
   25451: Site label suffix removed from title bar
   25452: ALF-7053 - Disable Replication Service
   25453: ALF-6599: Disabled DocLib DND upload when viewing non path filters (and fixed filter view bug that was previously introduced)
   25454: Stub out the user upload via CSV webscripts
   25455: Implemented ALF-6613, ALF-6614, ALF-6615, ALF-6616, ALF-6617, ALF-6618, ALF-6619, ALF-6620, ALF-6621, ALF-6622 - PART #2
   - components doesn't break when accessing a working copy OR a repository document (non site)
   - remove som unecessary code that slipped in with comments-list.js
   - "Add comments" now clears the editor before the next add
   - Comment paginator is only visible when necessary (happens to all paginators by default,force show with c.paginator.hide=false)
   - removed the document-details.ftl instantion of the javascript class
   - version panel isn't rendered on doc details page for working copies 
   - versions panel had white background under text "No previous verisions exist"
   - code commenting sweep 
   25457: ALF-6599: DND event listener fix
   25460: CSS tweak to document path
   25461: ALF-6790: Updated links for invite and upload for managers/contributors
   25462: ALF-6811: Added upload users CSV button to existing user admin console page. Stubbed code for invoking WebScript
   25470: Some build fixes
   - in general running without an authenticated user
   - getPerson -> getRestrictions without any security context
   25473: Added csv, xsl, xslx formats/mimetypes to default list for webscripts.
   25475: ALF-6608: Inline property editing - name field
   ALF-6625: TR04: Balloon popup (tooltip) component
   Also Document Library restyling: rollover style, text removed from most buttons, new icons.
   25476: Repository Browser brought up-to-speed with latest Site DocLib changes.
   25477: TEAM build fixes
   - fix unprotected service not to use public services - allows repoAdminService to be wired up to personService
   - There may be collateral damage to test using the messageService
   25482: Add the Apache Commons CSV library, and also fix the classpath breakage caused by the postgresql jdbc jar switch
   25483: Implementation of ALF-7005. TR24: Remove inappropriate rule script actions.
   Both sets of script actions (email templates and scripts) are built up using FolderContentsParameterConstraint objects.
   Using this class a location in the repo is specified and all cm:content children under that location (recursive) are included.
   I have added a new, optional property to that class which allows the specification of a list of file extensions, which is used as an inclusion filter for the content nodes.
   I decided against using a MIMEtype-based filter as there are situations where users add e.g. .js files as text/plain.
   Then I inject "js" and "ftl" as inclusion filters in the relevant action-constraint beans in the action service.
   We can easily add further file extensions should it be necessary.
   
   25484: ALF-6597: Fixed IE6 selector issue
   25486: ALF-6597: CSS correction to r25484
   25488: Small adjustments to descriptor logging during startup.
   25489: Team Eclipse project
   25491: ALF-6789: CSS tweaks to welcome dashlet columns
   25492: Get the basics in place for the user CSV upload - provides a sample csv file, loads it, process the contents and reports a JSON response, but doesn't yet create the users
   25495: ALF-6642: TR08: Site only view - remove Repository view.
   Copy and Move to dialogs only display Sites destination in this mode.
   Note: Page mapping not removed until it's clear how this will integrate with the installer; hence manually browsing to the Repository Browser is not pretty right now.
   25496: Minor follow-up fix for Repository Browser.
   25497: Support for ALF-6642 on details pages.
   25499: Document Library sort improvements: individual sort parameters can now be given a default sort order (like the Share search results page). Currently configured as name: ascending, popularity: descending.
   Also added support for "#upload" in URL to show the upload dialog.
   25500: ALF-7120: TR03: Test and integrate sample site into bootstrap process
   
   NOTE: This will install the Work In Progress sample site to your repository next time you start the repo. 2 new users will be added and will count towards your allocated users, you can safely delete the site and the users, they will not get re-loaded.
   25501: When generating the example file for the user CSV upload, have the webscript generate .xls and .xlsx versions, as well as the previous .csv one.
   25502: ALF-6790: Update upload link to #upload to get upload dialog
   25503: Team build fix: Fix message service tests after changing the beans wired up
   25505: New requirements for ALF-6617 "Share links panel", now only displaying link to current page
   25507: ALF-6640 - WIP. Initial styling pass, event actions, etc.
   25511: ALF-6789/ALF-6790: Removed old welcome dashlets
   25512: Resolve ALF-7099: Duplicate view:reference entries in an ACP export created using multiple noderefs
   25514: General cleanup of implementation and use runAs to query Admin-only service
   25516: More ALF-6893: RTEAM 03: Expose restrictions using RepoAdminService
    - Added 'licenseValidUntil' to web script returns (may be null)
   25518: Harden MessageServiceImplTest against leaked transactions
   25519: Refactor the common code for dealing with tenant usernames + tenant domain checking, during person creation, out to the person service
   25521: ALF-7099 export follow up: emit associations after all objects
   25523: Add support to the User CSV Upload webscript to actually create the people and users, using the new common service methods in common with share
   25524: Implementation of ALF-7093. Transfer/replication actions must not be displayed when the transfer service is disabled.
   
   Note: It is the ReplicationService which is enabled/disabled as opposed to the TransferService.
   A new webscript has been added (available at GET /api/replication-service-status) which returns 
   {"data": {"enabled": true}}
   
   Also a new REST test case.
   25525: ALF-6911: RTEAM 02: Record and expose system attributes
    - made getRestrictions() accessible to 'guest'
   25526: Update the user csv upload webscript with some debug log entries, and excel support
   25528: ALF-6602: Updated to new (temporary) images, updates to CSS
   25535: Removed deep svn:mergeinfo.  Please merge from base of code lines and remove spurious svn:mergeinfo
   25536: Merged V3.4 to V3.4-Team
      25399: Fix for ALF-6991: "Connection pool causes poor performance in some test suites"
             - applied constructor fix recommended by https://issues.apache.org/jira/browse/DBCP-330
      25400: Fix for ALF-6991: "Connection pool causes poor performance in some test suites"
             - commit missed file
      25474: Eclipse classpath tweaks to prevent element-based entry for Commons DBCP
   25537: ALF-7094: First cut of TR24: JSF-based login screens should warn unsupported when in Team mode. The wording needs reviewing and changing as does the position and styling of the text.
   25542: Implementation of ALF-7182. TR20: When a user 'likes' a document it appears in the activities feed.
   MikeH gave me the JavaScript changes for this in Share tier. Thanks Mike.
   I added some ftl and properties.
   25546: ALF-6602: Further image and CSS tweaks to doc lib assistance
   25548: Enhancements to user limit error reporting (ALF-6890: RTEAM 16: License-based restrictions: Number of users)
    - Report the usernames being added that generate the limit violation
   25549: ALF-6789: CSS updates
   25551: Fixed bug in Alfresco.util.DataTable when setting default css class name (appearing i.e. on trash can admin ui)
   25552: Minor cleanup in createPerson code.
   25554: ALF-6635 "TR12: Browser based administation - JMX admin console pages"
   25557: Updated version of sample site for Team, the full page width welcome dashlet is now present for both users.
   25559: First phase of ALF-6835:
    - Share now retrieves repository license/restrictions via REST API on first user login
    - Dynamically applies override config onto Alfresco config based on license info - allows Enterprise/Team specific tweaks to UI etc.
      - also constructs an object representing the license/restrictions that can be read by Surf components
    - Share Footer component now dynamically switches Community/Enterprise/Team logos and text based on config
    - Removed team project from source tree - NOTE: remove it from your local Eclipse projects
    - Removed team build targets - NOTE: devenv team targets will no longer work
    - Removed enterprise overlay for footer and share enterprise logo (no longer required due to dynamic footer configuration)
   25562: ALF-6835 - About Share dialog now displays appropriate edition logo and background based on license details
   25566: Allow users of the Mail action to pass in extra model options for their templates to use. 
   25568: When processing user CSV uploads, skip cleanly over blank lines
   25570: ALF-6811: Updated users admin console page and associated scripts to process WebScript feedback
   25572: ALF-6884 - TR25: Reload license file on live server via JMX operation on LicenseDescriptor mbean.
   25575: Agenda View WIP. Added add/edit/show more events functionality, bug fixes and styling. Updated Calendar API to include event description!
   25578: Bring user limit warnings in line with PersonService (create time) warnings
   25579: Repo usage monitoring done every 12 hours
   25580: ALF-6599: Update folder target highlighting & update temporary images
   25583: Fixes bug in Calendar Agenda view - number of days shown by default (was: from now - end of current month, is: from now until now + 30)
   25584: ALF-6602: Fix broken links on assistance panel
   25585: Branding and CSS tweaks from Linton
   25587: Wrap the User CSV upload result json in a data block, to better fit the current pattern
   25591: In the User CSV upload webscript, correct line numbers in error messages for excel uploads
   25593: Dashlet title rollover behaviour changes. Insitu edit balloon now removed when textbox loses focus.
   25596: Impl of ALF-7175 Comment order ... changed.
   This check-in adds a repo-side webscript parameter to reverse the order of comments
   25599: ALF-7233 remove doc for changing server.transaction.allow-writes
   25601: ALF-6811: Update to users.js to handle modified JSON response from WebScript
   25602: Agenda View, Bug fixes and CSS tweaks.
   25605: The empty 'Operations' set no longer appears in view mode and made the mail.password field behave like a password field
   25606: Tweak the JSON to better fit the current layout standards
   25607: Add a few more fields to the User CSV upload, based on the fields in Share
   25609: ALF-6645 - Branding tweaks
   25613: Help URLs moved to new edition based config - removed enterprise overlay.
    - NOTE: final 3.5 URLs still to be decided!
   25624: ALF-6789/ALF-6790: Updates to CSS/DOM to achieve completely fluid vertical and horizontal layout
   25626: ALF-6789: Updated profile to provide #edit hash and welcome daslet to make use of it
   25628: ALF-7207 - activities feed email / mail action executor
   - mail action executor should not get (+ auto-create) person when running as System
   - prepare / send email for each person as a separate txn
   - also: add actual / max feed item counts to template model  (as per ALF-6834)
   25631: Share Admin Console tool groupings
    - Implemented basic groups of tools in the admin console
    - First attempt at grouping tools - needs review by Linton/MikeF
   25644: Disable repository searching for team license configuration.
   25646: ALF-6835 - License details shown on License Descriptor admin page
    - Fixed up out-of-date JMX form bean names (changed on repo side since original JMX form config)
   25647: Team Agenda View - no events text, and other minor fixes
   25648: ALF-6811: Updates CSV WebScript response, added HTML format handling, added results panel to user console.
   25650: File missed from check in 25647
   25652: Start to convert the User CSV uploader to using localised error messages and error responses rather than non-localise exceptions
   25653: Added MikeF's url templates for ALF-6628 TR23: Preview support for Flash Video and HTML5 video.
   
   25654: ALF-6835 - Edition Interceptor improvements
   25655: Update how the User CSV Upload webscript returns messages and errors. Makes use of a property loaded via a resource bundle, and a new extension to WebScriptExtension which is driven by a supplied ResourceBundle, rather than the system-wide ones (which don't hold webscript specific messages)
   25656: ALF-6789/ALF-6790: Updated text, CSS/DOM tweaks & update to site-members to provide all members hash for welcome dashlet
   25658: ALF-6811: Updates to HTML format response for CSV request to support HTML uploader
   25659: Partial implementation of ALF-7230.
   This check-in changes the bootstrap data within the acp such that the sample JavaScript files in Data Dictionary/scripts are now bootstrapped as *.js.sample.  Their content has not been changed.
   Note that this applies to backup.js, example test script.js, backup and log.js, append copyright.js, alfresco docs.js and test return value.js.
   A separate solution will be provided for the command-*.js scripts.
   
   25660: Better reporting of the script causing stream errors
   25661: ALF-7231: RTEAM 32: FileFolderService method to get localised file
    - Locate the base translation using the well-known QName path (selectNodes) - this is the current way.
    - Call this additional method to locate any localized siblings
   25662: ALF-7263 - Track multiple reasons why we are read only otherwise we can't go back to read/write.
   ALF-7220 - Repo Usage Component Unlock
   25663: ALF-7256 - Ensure license reload does not damage server after upgrades
   25666: ALF-6811: Fix success message for all users uploaded
   25668: Increased user limit to 10 users for trial license
   25672: Some formatting
   25673: Minor comments format from Javadoc to inline
   25674: User count reporting: Keep track of disabled users on person
    - Disabling a user adds an aspect to the related person object
    - Should be able to export after disabling user
    - Don't count disabled persons
    - User count is reduced by 1 to cater for 'guest'
    - RTEAM 16: License-based restrictions: Number of users
   25679: A little more information is now returned if an error occurs whilst persisting MBean attributes or invoking an MBean operation.
   
   The sample site root node is prevented from being archived when it's deleted during the sample site bootstrap process.
   25681: ALF-6789: Change "Close" to "Remove"
   25685: Agenda View: Fixes Tagging.
   25686: IE fixes and slight change to the "automatic" binding from button/links against a component (value/rel attribute is now treated as a simple string instead of as an object)
   25688: Agenda view - new sketch logo from Linton for when there are no events
   25689: Feed edit icon css class
   25690: Invite test uses disabled users
   25691: ALF-7229 - partial (for Activities Feed Notifier)
   - also cleanup IoC deps
   25693: Work in progress ALF-6593: TR04: Update dashlets to provide consistent look & feel, include thumbnails, help text, action links where applicable
   25694: MERGED V3.4-BUGFIX to V3.4-TEAM
      24898 : Fix to FixUserQNamesPatch
   25695: ALF-6789/ALF-6790: Added new icons, removed old ones
   25697: ALF-7231: RTEAM 32: FileFolderService method to get localised file
    - Fixed extraction of 'base' name to be parts before *first* period
    - Changed unit test to use 'Something.html.ftl'
   25698: IE7 bug fix (a comma sign had slipped in by mistake)
   25701: Continued implementation of ALF-7230. Bootstrap data amendments and additions for Team.
   This changes the name of DataDictionary/EmailTemplates/NotifyEmailTemplates/notify_user_email.ftl to .../notify_user_email.ftl.sample.
   With this check-in there will now be no .ftl files available for the Rules UI's "send email" action. The "Use Template" dropdown will have no contents. A future check-in will add the new (i18n'd) ftl files.
   25702: Adds options support to Alfresco.widget.Resizer & updates console and calendar templates to use it. Tweaks styling on calendar to make it behave.
   25703: Update the FileFolder localised version tests to do both Standard.html/Standard_fr.html and Another.get.html.ftl/Another_fr.get.html.ftl so we test both cases
   25704: Provide a util helper for building Share and Alfresco (Explorer) urls up from SysAdminParams
   25705: ALF-6628TR23: Preview support for Flash Video and HTML5 video.
   - Customisable plugin architecture added for web-preview component, ootb plugins are:
     * WebPreviewer: for documents (and image & flash movies) in other words the "good ol previewer"
     * FlashFox: .mp4 & .flv videos for users w FlashPlayer 9
     * StrobeMediaPlayer: .mp4 & .flv videos for users w FlashPlayer 10
     * Video: HTML5 <video> element, support depends on the browser, but if youre lucky it might support .webm & .ogv movies
     * Image: Displays images using the <img> tag (if taken from the nodes content and the image is larger than 0.5 mb, a link must be clicked to get the conten displayed).
     * Flash: embeds flash content using swf-object
     * plugin kicks in depending on node's mimeTYpe & thumbnail in combination w rules defined in web-preview.get.config.xml
   - Added new mime types to repo:"video/ogg", "audio/ogg", "application/ogg" & "video/webm"
   25706: ALF-6628TR23: Preview support for Flash Video and HTML5 video. part 2
   - some strange white space characters had made their way in 25705
   25708: Add new notifyPerson method to the Person service. This sends an email to the newly added user telling them their credentials, where to log in etc. 
   (Email template patch to follow)
   25709: Use the new user notification method on the Person Service if requested, through the user CSV upload and person script service. It is on by default for CSV uploads, and off by default for javascript (Share)
   25710: Add security file missing from earlier PersonService.notifyPerson checkin
   25711: Further impl of ALF-7230.
     Ensuring that the (recently renamed) notify_user_email.ftl.sample file has a qname path which is .sample-based.
   25712: ALF-6835, ALF-7093 - Various improvements to Admin Console related to showing appropriate components based on license edition and admin console tool groupings.
    - JMX tools now only available when an appropriate Enterprise license is found
    - Subset of JMX tools available for TEAM edition
   25713: Library updates for rev 25712
   25719: Fix Alfresco.util.DataTable first request after r25693. Slight tweak to console tools list CSS for readability. Also modify how item separators work in social panel.
   25722: Fixes broken links in wiki page within Team sample site
   25732: Added quicktime move to the list of supported previews
   25733: Added localised model title and descriptions for all the cm:person properties
   25735: Revert non-English message bundles
   25736: Document Library folders defaulted to visible on first use.
   25739: Workaround for exceptions during bootstrap of clean db.
   Changes to the email template acp introduced an exception. The changes are related to ALF-7230.
   25740: Added read-write locking around veto code
   25741: Patches runAs 'System' to allow execution even in read-only environment
   25742: Patches runAs 'System' to allow execution even in read-only environment
   25743: Removed some javadoc-style comments within methods
   25744: Enhanced usage GET method
    - Currently, I have problems preventing real data from being returned; so see dummy data
    - Made usage GET a guest operation
    - Included 'level', 'warnings' and 'errors'; see usage.get.desc.xml.
   25745: Fix typo in error message
   25748: ALF-7094: TR24: JSF-based login screens should warn unsupported when in Team mode (final text from Linton/docs)
   25749: Make an unrestricted license available in the build classpath of each version
   25750: ALF-6622 "Comment component redesign and refactor"
   - Current user's avatar is displaye in add comment
   - editor is correctly configured and styled and uses full width
   25751: ALF-6602 - Final drag'n'drop icons and text from Linton/docs.
   25752: Email templates for new user notifications, and a patch for this (applicable to both new and existing installs)
   Note - acp may need a refresh later for tweaked templates, and description tweaks, but it shouldn't be a problem for anyone who gets this version now
   25753: Reduced property path console logging on startup
   25755: More acp hacking for ALF-7230.
     Now the property key is defined in bootstrap-spaces.properties. Oops. Mustn't forget that next time.
   25756: Update the User CSV scripts to use the new titles and descriptions for the person model, in both the template, and in the upload when skipping over title rows
   25757: Tweak the User CSV upload template to show the descriptions properly in all excel versions
   25758: Usage messages for usage web scripts
    - Fixed unit test fallout
    - Added license timeout as a restriction/usage element
   25759: Fix for making "poster" attribute to videos understand the filesuffix of a thumbnail
   25761: Fixed template to remove redundant 'warnings'
   25762: Add a note about why this class generates mail text itself, via dedicated template service calls, instead of following the new pattern of passing a template noderef + model to the Mail Action Executor
   25763: Update the site invitation mail action to enable the use of localised email templates (where present), and update to the new noderef+model pattern (rather than processing the template in the class)
   25764: Fixed bug where it was only possible to upload a new version once on the docuemnt detais page, also small css tweaking in the version list
   25765: Fix for ALF-7337 Email with content shorter than 5 chars causes exception in MailActionExecuter.
   A simple fix that tightens up some string comparison.
   25766: JMX MBean error handling: UI now shows the error message returned from the form processor. As the raw error message is being shown I have also localised the error messages on the server.
   25768: Sample site users are now loaded in a disabled state so they do not count towards the user count. The main wiki page also had a broken link to one of the images in the project library which is now fixed.
   25771: Removed organization id from the CSV upload as it's not used anywhere in the UI
   25772: Added protection for the usage.users or usage.documents properties being null
   25775: Removed unused warning suppress
   25776: Minor formatting
   25777: Added ability to get transactions that don't respect read-only vetos
    - Typically used by doing
          RetryingTransactionHelper txnHelper = transactionService.getRetryingTransactionHelper();
          txnHelper.setForceWritable(true);
          ...
    - This ranks with the 'Run As System' for permissions, but allows a clean separation between permissions and transactions.
    - Don't have to force everything to run as 'System' to get a writable transaction, but 'System' will still have one.
    - ALF-7236 RTEAM 34: Reload Licence fallout
      - ALF-7256: Ensure license reload does not damage server after upgrades
   25778: Allow patches to run against read-only system
    - Made a write-forcing RetryingTransactionHelper available for patches and their offspring worker threads
    - main upgrade thread is already running as 'System' user
    - ALF-7236 RTEAM 34: Reload Licence fallout
      - ALF-7256: Ensure license reload does not damage server after upgrades
   25779: ALF-7257: Changed read-only setting to server.allowWrite to avoid mixing with Spring config
   25780: Further impl of ALF-7230.
     This check-in includes a patch which bootstraps a .html.ftl notification email template and placeholder templates for supported locales es, fr, de, it. (The notification email has a broken link in it. I will fix that today.)
   25781: Inbound Email admin console tool disabled for Team edition
   25782: Agenda View style fixes, non-default theme updates and description expand.
   25784: Added MBean form config for the IMAP susbystem.
   25786: ALF-6635 - Added IMAP admin console component
   ALF-6835 - License component improvements
   25790: ALF-6835 - Show license info warnings/errors. Show SysAdmin JMX console component so share host/port can be set for email templates.
   25791: Build fix for recent changes (labels being added, scripts being renamed and site membership URL cleanup)
   25794: Add missing admin user exclude to the people export with a site
   25795: Further impl of ALF-7230.
     Added a new acp containing a new example JavaScript file & a patch to bootstrap it in.
   25796: Removing unnecessary property values. As part of ALF-7230.
   25799: Improved the order of the fields in the sysAdmin MBean form, fixed typos in a couple of labels and provided more explicit labels (there were 2 fields each called Context, Host, Port and Protocol)
   25800: Removed the loading of the command-*.js files that end up in Data Dictionary/Scripts. If they turn out to be required by something (we can't find any code reference to them anywhere) then they will need to be added back but to a different location.
   25802: ALF-6884 "TR25: Reload license file on live server via JMX operation on LicenseDescriptor mbean."
   25804: Agenda View polishing: Style tweaks, removed refresh jump, added "Today" button (currently uses page refresh), new Sketch icon, etc.
   25805: Fix up license admin component after previous checkin
   25806: Update the new user email template acp to have localised descriptions for the templates
   25808: ALF-6621 "Version History panel"
   - activitiy filed after new version upload
   - fixed bug where revert didn't work
   - components refresh inline instead of page reload
   - made alfresco-macros.lib.ftl work when "page" attribute isn't present
   25811: Update the site invite email templates to be localised and html. For new installs, you will get the html versions from the acp. For old installs, the text version will remain in DD, and you'll get (+ start using) the new html ones.
   (Change also pushes some freemarker model logic from the people invite into template service, so the site import can use it.)
   25812: For new installs, don't bootstrap load the old invite-email.ftl, as we now get the new html ones from an acp patch that always runs
   25813: Merged V3.4-BUG-FIX to V3.4-TEAM (3.4.1 changes)
      24884: adding back runBare over-ride - test was deadlocking
      24894: Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.4-BUG-FIX:
         24892: Fix ALF-6729: Corrected build paths for WQS following upgrade of commons-pool library
      24901: Fix ALF-6590: Requesting details of many assets using a GET request was causing Tomcat to close the socket connection. Changed so that we use a POST for this request.
      24905: Merged V3.3 to V3.4-BUG-FIX
          24904: Fixes ALF-5964: Installer height too small RHEL (records only)
      24928: Merged V3.3 to V3.4-BUG-FIX
         24927: Fixed ALF-5025 (ALF-6206): Support background processing of archiving
             - Added property: xam.archive.forceBackgroundStoreMove=false
      24930: Merged V3.3 to V3.4-BUG-FIX
         24929: Merged DEV/DAVEW/SAP to V3.3
            24925: ALF-6667: Fixed possible deadlock where index merger is never rescheduled under heavy load
      24941: Merged BRANCHES/DEV/BRIAN/wqs-caching to BRANCHES/DEV/V3.4-BUG-FIX:
         24613: WQS: Added caching layer for asset collections. Improves rendering time of homepage by 23% at steady state.
      24944: ALF-6662 - Transfer/replication servers need to be compatible versions
   25814: Convert the activities email templates patch/bootstrap from a single xml + classpath ftl, to an acp containing localised html versions following the new pattern
   25815: Merged V3.4 to V3.4-TEAM (RECORD ONLY)
      24946: Merged V3.4-BUG-FIX to V3.4 (RECORD ONLY)
         24752: Merged V3.4 to V3.4-BUG-FIX
            24751: Merged V3.3-BUG-FIX to V3.4 (RECORD ONLY)
               Restored V3.3-BUG-FIX mergeinfo, somehow truncated in revision 24274
         24757: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX:
            24756: Fix for ALF-6269: WebForm (Edit Web Content Wizard) ERROR on Alfresco Community Edition 3.4.b and 3.4.c
         24771: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX:
            24767: Merged BRANCHES/V3.3 to BRANCHES/V3.4:
               24765: ALF-6547: fix intermittent test failure (AssetServiceImplTest renameFile/renameFolder) - fallout from ALF-1948
         24802: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX:
            24801: Fix for ALF-3055: "SecurityTestSuite hangs when run in DOD5015 context - failed authentication audit hangs on DB connection"
                - do failed audits in a separate thread (from a thread pool)
         24822: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX:
            24821: Fix for ALF-3055: "SecurityTestSuite hangs when run in DOD5015 context - failed authentication audit hangs on DB connection"
               - fix up unit tests
         24838: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-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
         24857: Merged V3.4 to V3.4-BUG-FIX
            24853: Merged V3.3 to V3.4 
               24852: Fixed ALF-6573 "Incorrect name of subgroups on "Groups" page"
         24858: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX:
            24750: Limit installer builds to 2 threads
         24874: Merged V3.4 to V3.4-BUG-FIX
      24948: Merged V3.4-BUG-FIX to V3.4
         24718: Merged V3.3 to V3.4-BUG-FIX
            24717: Fix ALF-5555: It is impossible to edit review date from record's details page
         24719: Fix for ALF-6106: Error on Check In operation with % symbol (SPP)
         24733: Better fix for ALF-6106: Error on Check In operation with % symbol
         24734: Fix for ALF-6089: Incorrect order of fields at 'Create Series', 'Create Category' and 'Create Folder' forms
            The name, title and description fields are now placed in their own group on the server, all other non custom rm fields are put in an 'other' group, the client side config then declares a set for each group and orders them appropriately.
         24753: Merged V3.3-BUG-FIX to V3.4-BUG-FIX
            23870: Merge Dev to V3.3_BUG_FIX
               ALF-4243: F5 load-balancer sending regular HTTP requests to Alfresco server causing Faces Servlet to throw java.lang.NullPointerException (MyFaces upgrade to from 1.1.5 to 1.1.7)
            23897: Additional fixes and tweaks since introduction of MyFaces 1.1.7 library.
            23919: More JSF component id related fixes.
            23945: More MyFaces1.1.7 JSF page fix ups
            23959: Another MyFaces 1.1.7 dup id issue fixed.
            24008: ALF-4243
               - Upgraded MyFaces from 1.1.7 to 1.1.8 to fix a bug seen in 1.1.7
               - Added handling for the fact that valuebound properties that result in null now cause an exception where-as they were perfectly valid in 1.1.5.
            24419: Merge from V3.3 to V3.3-BUG-FIX
               r.24418 Fix for ALF-6075. Running out of /tmp space on the server is causing uploads to fail.
         24768: Fixes ALF-6295: Allows MySQL to not be installed via unattended installer invocation
         24779: Merge V3.3 to V3.4-BUG-FIX
            24497 : ALF-3092 - deployment service - catch Throwable from Begin.
            24684 : Merge DEV/BELARUS/V3.3-BUG-FIX-2010_10_04 to V3.3
               23498 : ALF-5498 In Windows XP, placing a Folder with a Name that already Exists Removes all Content of the Existing Folder
            24749 :  ALF-6174 - Transfer Service fails with double peer assoc custom content type
            24766 : ALF-5603 - It is impossible to assign workflow from workflow console to non-admin user
         24812: Fix ALF-6316: A new "spoof" multivalue text property (cm:tagScopeSummary) is now made available for TagScope nodes when accessed via the getProperty or getProperties operations on the standard node service. The values of this property take the form "<tagname>=<tagcount>". A new interceptor has been added to the node service to do this (TagScopePropertyMethodInterceptor). WQS has been tweaked to make use of this new property, and the now defunct behaviour has been removed.
         24820: Work in progress refactoring transaction handling of transfer unit tests.
         24834: ALF-6468 - Update the scheduled actions folder bootstrap to use localisable names and descriptions, following the normal pattern
         24836: Added system property 'system.cache.disableImmutableSharedCaches' (false by default)
            - Equivalent to disabling Hibernate L2 cache for *immutable* entities
            - Allows distinction between mutable and immutable cache entries
         24850: Fix ALF-6562: Moved property that is used to label the WQS dashlet on the "configure site dashboard" page out of the Slingshot project and into the WQS Share Module project. Corrected its value to "Web Quick Start" rather than "WCM Quick Start".
         24860: ALF-6673 - bootstrap folders and rename
         24870: Removed svn:mergeinfo from root
         24873: Merged V3.3 to V3.4-BUG-FIX (RECORD ONLY)
            21789: ALF-4333: Fix
               - Updated RepoPrimaryManifestProcessorImpl so it can handle deletions that are reported by either pre-delete noderef or archived noderef (previously only handled the latter).
               - Updated TransferManifestNodeFactory so that it handles the case where the status of the node to transfer is "deleted".
               - Updated UnitTestTransferManifestNodeFactory so that it handles the change to TransferManifestNodeFactory above.
               - Added new tests for deletion cases.
            23259: Merged HEAD to V3.3
               23256: Fix ALF-4573: Start Workflow action is absent for edited document and working copy in Share
            23346: Brought WebQS module in (including build process but not installer elements yet)
            23371: "Simply" added wcmqs to installer
            23391: ALF-5367: Copy dlls into tomcat/bin as appropriate.
            23485: Merged V3.4 to V3.3 (fix backported for V3.3.x lines)
               23472: Fixed ALF-5408: SQL Server missing ON DELETE CASCADE declarations
            23515: Merged PATCHES/V3.2.0 to V3.3
               23514: ALF-5554: Merged HEAD to V3.2.0
                  23153: When updating tag scopes following system shutdown/restore, be smarter about quickly skipping tag scopes that another (new) thread is currently working on
                  23283: More debugging level logging for tagging updates, to help identify the problem with periodic multi-threaded test failures on bamboo
            23535: Merged V3.4 to V3.3 (complements 23517: ALF-5552)
               23508: Fixed ALF-5559: Permission interceptors can fail if Lucene returns invalid NodeRefs
            23564: ALF-5600: Merged V3.4 to V3.3
               23424: Fixes: ALF-2989 - Incorrect sideId reference in URL for event in Site Calendar Dashlet
                  Adds support for displaying events that start in the past but finish in the future (previously only events that start in the future were shown)
            23586: MERGED V3.4 to V3.3
               22864: Fix for ALF-5005: "Create and edit functions on AWE become "confused""
               23042: Fix ALF-5127: Impossible to create an article/blog (WCMQS) [Must clear panel hideEvent handler if manually hiding a YUI panel]
               23561: Fixes: ALF-4569 - Removes universal override of input width box and switches the editor form panel to adjust it's width based on content rather than window size. 
                  Fixes: ALF-4570 - Adds an override for the CSS 'top' property of the form dialogue to ensure it's always below the ribbon. (Was being set automatically by the YUI widget.panel call)
               23569: Fixes: ALF-5606 - Ribbon wasn't resizing correctly after the form events.
            23630: Backport of installer
            23631: Added 64-bit & deployment installers
            23664: Fixes ALF-5691: TransferService: Multi-byte characters are not encoded correctly
            23681: Fixes ALF-5699: TransferService: Snapshot file from source repo never contains complete MLText properties
            23695: Fixed bug exposed after fixing ALF-5699. Parsing of MLText properties out of the transfer snapshot file was incorrect, and that was causing multi-lingual property values to be duplicated
            23709: ALF-5699: Fix NPE in ManifestIntegrationTest
            23734: Merged V3.4 to V3.3
               23731: Fixes for ALF-3098 and ALF-3097
                  - Share - Security check on Personal Dashboard - only the owning user can view a user dashboard page
                  - Share - Security issue on Customize Site Dashboard - private and moderated site dashboard pages no longer visible to non-members, customise site and dashboard pages only accessible to SiteManager
            23747: ALF-5696: Merged V3.4 to V3.3
               23585: Fixed ALF-5372 "JavaScript error on Groups management dialog with IE8 : document.getElementById is null"
            23790: Fixed ALF-3823 "Share: RSS feed can't be read: http://cds-srv.sun.com:8700/rss/update/public/sunalert_update.xml - ok with other RSS client."
            23883: Fixes ALF-5759: WQS: Attempt to copy a website section fails
            23907: Merged DEV/BELARUS/V3.3-BUG-FIX-2010_09_20 to V33
               22750: ALF-4846: Update rules are firing on inbound actions 
            23931: Undid rev 23907 (Reverse-merged /alfresco/BRANCHES/DEV/BELARUS/V3.3-BUG-FIX-2010_09_20:r22750)
            23961: Fixed ALF-5686 "Incorrect behaviour of "All" filter in "My Tasks" dashlet"
               - Variables assigned in a <#macro> shall always be assigned using <#local> (using <#assign> makes them globally available which might cause naming collisions)
            24132: Disable intermittent failing unit test
            24148: ALF-6007: Merged HEAD to V3.3
               23049: Fixed ALF-5099: Error when trying to go back in Create Web Content Wizard (only with certain XSDs)
            24263: Merged from V3.3-BUG-FIX to V3.3
            24264: V3.3-BUG-FIX to V3.3
               24262: Stress test code for ALF-5025: Support background processing of archiving
            24287: Added missing import
            24336: Merged V3.4 to V3.3
               23205: Fix for ALF-2111 - Download URLS are different on different pages, authentication fails when URL sent
            24353: Merged V3.4 to V3.3
               24352: Fix SQL fallout from ALF-6078
            24510: Merged V3.4 to V3.3
               21960: First round of date refactoring: Document Library pages now expect XML dates (ISO8601) from Share data webscripts
               21961: Share client-side I18N utility now emulates sever-side handling of doubled-up single quotes.
            24526: Merged V3.4 to V3.3
               24402: Fix for performance degredation related to ALF-3823. 
                  RSS feed processing in JavaScript relies on Rhino impl of regex - this is extreemly slow as Rhino regex is by far the slowest component of the library. 
                  Switched code to use the Java Regex libraries to improve performance and reduce memory usage.
            24587: Merged V3.4 to V3.3
               24564: Fix for ALF-3727: Custom permissions aren't visible in Explorer UI
            24604: Merged V3.4 to V3.3 
               24602: Build fix for RM permission model loading - collateral damage for R 24564
            24774: Merged BRANCHES/V3.4 to BRANCHES/V3.3:
               23492: Fixed ALF-5550: DB2: Unable to insert values into alf_string_value
            24813: Merged BRANCHES/V3.4 to BRANCHES/V3.3:
               24750: Limit installer builds to 2 threads
         24880: Merged V3.3 to V3.4-BUG-FIX
            24463: Fixed ALF-4398 "Path to rule set is not displayed" ($html alias was missing from a merge)
            24465: Merge V3.3 to V3.4 (RECORD ONLY)
               24463: Fixed ALF-4398 "Path to rule set is not displayed" ($html alias was missing from a merge)
            24493: Fix for Mac OS X CIFS logon problem, change UID to start at one as zero has special meaning, plus other minor fixes. JLAN-112.
            24569: Fix for ALF-5333: Webdav - Online editing of files in a folder with German umlauts does not report correct characters
            24611: Fix broken build due to merge #fail (r24460 / ALF-4015)
            24668: ALF-4557 - Upgrade of large repository to latest 3.3 fails on excession of mysql table lock size
            24707: Fix for handling of null first/last name in wiki page list
            24710: ALF-5535 - Fix to correctly format json number values (not as numeric human readable strings)
            24794: Fix for ALF-4984 - Outdated custom-slingshot-application-context.xml.sample file for share
            24798: Fix for ALF-5806: Lucene query does not return expected result.
               - Alfresco FTS now supports the prefixes ~ and = for phrase queries
            24814: Build fix after r24798: Fix for ALF-5806: Lucene query does not return expected result.
            24823: Synchronization improvements to RemoteClient and http proxy hosts
            24825: Fixed #3 of ALF-6308 "Share data issues"
               - Share falls back to use "html uploader" (in all browsers except IE) when "JSESSIONID" cookie is unreachable from javascript (like when "HttpOnly cookies" is activated on the server.
            24835: Fixed ALF-5484: Check-in does not update association
               - Copy code when copying over an existing target node was NOT processing associations
               - Fallout from refactor and subsequent fixes related to ALF-958 (Target associations aren't copied)
               - Some commented-out unit tests reintroduced
            24842: Fix for ALF-6308 item #4 - validate the redirect URL to ensure it is a relative url
            24845: Merged DEV/DAVEW/SAP to V3.3
               23874: ALF-5822: Correct Lucene throttling mechanism to prevent build up of excessive committed deltas
                  - Also correct BatchProcessor's mechanism for single-threading batches with cross dependencies
                  - Single-threaded batches must be sequenced in order
               23876: ALF-5822: Default lucene.indexer.mergerTargetOverlaysBlockingFactor to 2 for better write performance under load
               24022: ALF-5822: Refinement of fix
                  - Don't block a thread that has already entered the prepare phase with another indexer (e.g. a cross-store commit). Otherwise it could block indefinitely and never enter the commit phase
                  - Also added extra debug diagnostics and handle all Throwables on failure
               24023: ALF-5822: Minor correction to debug log message
               24421: ALF-6134: Do not export org.hibernate.jmx.StatisticsService through JMX to avoid excessive blocking under load
               24422: ALF-6135: Remove lock contention from concurrent Lucene searches
                  - Added a RW Lock and Thread local-based solution to org.apache.lucene.store.FSDirectory.FSIndexInput.readInternal() to avoid contention during multiple parallel Lucene searches. This is already recognized as a bottleneck by the Lucene developers, who offer NIOFSDirectory as an alternative, which unfortunately doesn't work on Windows.
                  - Added RW lock to org.apache.lucene.index.TermInfosReader.ensureIndexIsRead()
                  - Threads no longer hanging in lucene searches during load tests. Woohoo!
               24423: ALF-6136: Don't call through to org.apache.log4j.NDC unless debug is enabled as it's heavily synchronized. Also avoid dynamic method invocation by using a delegate.
               24426: ALF-6138 (SURF - PARTIAL): 'Warm' the java.beans.Introspector cache for key Freemarker accessible bean classes on loading in static initializers
               24428: ALF-6139 (SURF - PARTIAL): First log in to Share is expensive due to 'lazy' dashboard creation and excessive synchronization
                  - Added AVMRemoteStore.createDocuments() for creating multiple XML documents at once, all embedded within the same master XML document in the request body 
                  - Added corresponding saveDocuments() methods to Store, RemoteStore, Model, ModelObjectManager and ModelObjectPersister on the Surf side 
                  - Used this in PresetsManager 
                  - Removed excessive synchronization from StoreModelObjectPersister 
               24429: ALF-6140 (SURF - PARTIAL): Surf tweaks to allow concurrent execution of web scripts
                  - Use StrongCacheStorage instead of MruCacheStorage in RepositoryTemplateProcessor to avoid use of a synchronized cache
                  - Tweak cache sizes in FreeMarkerProcessor
                  - Use thread local object wrapper delegates in QNameAwareObjectWrapper and PresentationTemplateProcessor to work around synchronization in DefaultObjectWrapper
                  - Swap in the same object wrapper to WrappingTemplateModel
                  - Use a concurrent HashMap in ModelObjectCache and ModelHelper and remove excessive synchronization
                  - Use RW locks rather than synchronized blocks in AbstractWebScript
               24431: ALF-6141: Improvements to IBatis DAO performance under load
                  - Use lazyLoadingEnabled="false", enhancementEnabled="false" to avoid unnecessary blocking and generation of CGI proxies in IBATIS DAOs
                  - Use useTransactionAwareDataSource="false" to prevent Spring from agressively unwrapping DBCP connections and bypassing the prepared statement cache
               24432: ALF-6142: Remove dependency between RepositoryAuthenticationDAO and Lucene
                  - Reworked RepositoryAuthenticationDAO to use a node service lookup by child association QName
                  - This required adding a patch to 'upgrade' the qnames of existing authentication nodes, which previously all had the same QName
               24433: ALF-6143: Remove net.sf.ehcache.use.classic.lru setting from EhCacheManagerFactoryBean and InternalEhCacheManagerFactoryBean to prevent serialization of accesses to shared caches by multiple executing threads
               24434: ALF-6144:  DirtySessionMethodInterceptor was causing contention between multiple threads calling the same DAO.
                  - Unfortunately method.getAnnotation() is a synchronized call, and thus causes concurrent calls to the same method to contended with each other. 
                  - Added a non-blocking cache so that DAOs can be accessed in multiple threads without contending. 
               24435: ALF-6145: Use RW Locks in Subsystem Framework
                  - The operations relied on by the dynamic proxies wrapping subsystems were synchronized and thus caused contention when multiple threads were calling in to the same subsystem
                  - Replaced synchronized blocks with use of read write locks, thus allowing multiple concurrent readers
               24436: ALF-6146: Regulate PermissionModel accesses with RW locks, rather than synchronized blocks and an excessive number of concurrent hashmaps.
               24438: ALF-6136: Fix build classpath
               24439: ALF-6142: Fixed seeding of admin user password
               24444: ALF-6142: Fix unit test fallout
                  - InviteServiceTest needs a transaction
                  - RepositoryAuthenticationDao must listen for Person username changes and update authentication node qname accordingly
                  - Correction to MT handling in RepositoryAuthenticationDao
                  - Repository Authentication Component must 'normalize' the username before passing it through the DAO
               24445: ALF-6145: Correction to lock handling when propagating destroy() events
               24446: ALF-6142: Add new dependencies to unit test
               24448: ALF-6142: Further fix ups
               24461: ALF-6142: Fix unit test
               24664: ALF-6408: Prevent possible deadlock during reindexing
                  - waitForHeadOfQueue() now only called in beforeCommit() phase rather than afterCommit() to prevent deadlocking with Lucene throttler
                  - indexes are also flushed beforehand in beforeCommit() so that indexing work can still be parallelized
                  - also prevent potential deadlock caused by clearing of IndexInfo.thisThreadPreparing in a nested transaction
               24810: ALF-6653: Use read write lock in Hibernate ReadWriteCache to avoid needless contention on L2 cache reads
               24817: ALF-4725: Avoid excessive lock contention in dbcp by upgrading to 1.4
                  - also upgraded commons pool
               24818: ALF-6658: Remove synchronization from LockService - transaction local collections used anyway
               24844: ALF-6681: Don't let the PostLookup job stack up in multiple threads
                  - Now only executes in one thread at a time and skips scheduled slots where it is already running
            24864: Fix for ALF-5904: Explorer - Space model rights not duplicated when creating a space based on a template
               - copy service no longer uses hasPermission
               - added tests for permission copy scenarios with assorted rights
               - this fix assumed there is nothing special about templates - ie that they should always carry permissions and is the "default" copy behaviour to copy permissions if possible
            24865: ALF-6145: Fix failing unit test
            24878: ALF-6146: Correction to write lock around requiredPermissionsCache
         24881: Increment version revision
         24884: adding back runBare over-ride - test was deadlocking
         24894: Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.4-BUG-FIX:
            24892: Fix ALF-6729: Corrected build paths for WQS following upgrade of commons-pool library
         24898: Fixed merge issue in FixUserQNamesPatch
         24901: Fix ALF-6590: Requesting details of many assets using a GET request was causing Tomcat to close the socket connection. Changed so that we use a POST for this request.
         24905: Merged V3.3 to V3.4-BUG-FIX
            24904: Fixes ALF-5964: Installer height too small RHEL (records only)
         24928: Merged V3.3 to V3.4-BUG-FIX
            24927: Fixed ALF-5025 (ALF-6206): Support background processing of archiving
               - Added property: xam.archive.forceBackgroundStoreMove=false
         24930: Merged V3.3 to V3.4-BUG-FIX
            24929: Merged DEV/DAVEW/SAP to V3.3
               24925: ALF-6667: Fixed possible deadlock where index merger is never rescheduled under heavy load
         24941: Merged BRANCHES/DEV/BRIAN/wqs-caching to BRANCHES/DEV/V3.4-BUG-FIX:
            24613: WQS: Added caching layer for asset collections. Improves rendering time of homepage by 23% at steady state.
         24944: ALF-6662 - Transfer/replication servers need to be compatible versions
   25816: Removed unused config files; superceded by subsystem configuration
   25817: Tweak how the html notification/invite template ACPs are patched/bootstrapped to better fit the pre-existing pattern
   25819: ALF-7230. Fixed the document link sent out in the notification email.
   This document link is now a Share link and requires the admin to have configured SysAdminParams with server config data such as port number etc.
   Added the SysAdminParams bean to the ServiceRegistry
   Added a helper method to TemplateNode to get the Share URL for a (document) node.
   Updated the email templates within the acp to use the helper method in TemplateNode.
   25820: Merged V3.4 to V3.4-TEAM
      24885: Fix ALF-6694: V3.4.0 schema inconsistencies
         - ALF-6712: DB2: alf_authority missing index 'authority' during upgrade
         - ALF-6714: ALL: alf_prop_unique_ctx missing FK index on upgrade from 3.3 and 3.2
      24889: Disabled intermittently failing test (ALF-6700) until it can be made more reliable.
      24951: Merged DEV/DAVEW/SAP to V3.4
         24950: ALF-6698: Allow clearBatchSize and updateBatchSize properties of userUsageTrackingComponent to be controlled through system.usages.clearBatchSize and system.usages.updateBatchSize global properties
      24966: Fixed ALF-6363: Transaction status incorrect during afterCommit phase
         - Covered by unit tests
         - afterCommit or afterRollback will report "Not in transaction"
      24969: Fixed ALF-4372: JavaDocs don't match code for Index Recovery Modes (VALIDATE)
      24970: WQS: Fixed web publishing transfer service Spring definition (hopefully permanently now) following change to TransferService requirements
      24974: Fix ALF-6813: WQS: Specifying the sort order in the query of a dynamic asset collection has no effect
      24978: WebDAV: minor debug logging fixes
         - fix WebDAVHelper logger name to be consistent (with rest of WebDAV and other filesys protocols)
         - log service call as info (separate from rest of debug)
      24983: Step 1 of ALF-3891: Policy beforeDeleteChildAssociation not fired on delete node
         - Clean up deprecated beforeCreateChildAssociation, which could only be used *after* the event
      24985: Attempt to fix ALF-6820: Slow CMIS unit tests on build box
      24994: Fixes: ALF-6815 - terminology change (also fixes encoding bug that was preventing files being loaded into translation memory)
      24995: ALF-6572 - WCM: virt svr - enable "lazyDeploy" by default
         - can be disabled (in server.xml)
      24997: correction/kludge of DescriptorServiceTest.
      25002: Fix up test.
      25029: Merged DEV to V3.4
         25009: ALF-5829: Cannot upload files to Records Management site using WebDav from Mac OS X
             - Configuration constant that maps User-Agent pattern to response status code was added to WebDAVMethod.
             - Method that determines response status for AccessDeniedExeption using ‘User-Agent’ header was added.
             - AccessDeniedException processing was changed to return appropriate status.
      25043: Merged DEV to V3.4
         25012: ALF-6758: Potential JGroups Locking issue requiring jgroups upgrade
         JGroups was upgraded to the latest available stable version 2.11.1 Final:
            - jar was upgraded;
            - sources were upgraded;
            - classpath of the ‘3rd Party’ project was upgraded;
            - AlfrescoJGroupsChannelFactory was upgraded according to extension in superclass 
      25061: Merged DEV to V3.4
         24920: ALF-1787: Slow performances when many workflow are opened
             1. Implementation of a custom query for JBPMEngine.getAssignedTasks.
             2. Uint test for creating and testing neccessary items in DB.
         25014: ALF-1787: Slow performances when many workflow are opened
             1. HQL query for TaskInstance properties chache. 
         Also:
            - Moved back to query.list() - no difference with scroll
            - Checked query plan for batching queries and found no problems
            - Batch queries *have* to be limited in the IN clause
            - Although not using scrolling, there was a missing close statement
      25072: Reversed change 25043: Slow performances when many workflow are opened
      25094: Resolve ALF-6736: CMIS Web Services: getObjectByPath() should return an objectNotFound error if the given path doesn't exist
      25107: Resolve ALF-6754: CMIS nameConstraintViolation errors are not returned to client
      25122: Merged HEAD to BRANCHES/V3.4:
         25115: Fixes: ALF-6336 - resolved incorrectly translated date formatting strings.
      25144: ALF-6841 - IMAP Sync Errors
      25148: ALF-6991: Connection pool causes poor performance in some test suites
         - Added explicit 'forceMultipleResultSetSupport=false' in case someone wants to change it.  
         - This is not a fix (or actually a change at all) just a documentation of the options available
      25149: Added transaction leak checks in security tests.
         - Just helpful for diagnosis when one test fails and brings the others down.
      25182: Merged PATCHES/V3.4.0 to V3.4
         25180: Merged DEV/TEMPORARY to PATCHES/V3.4.0
            25150: ALF-6918: Editing a Share document simultaneously using Share HTTP and Webdav breaks the document - working copy relationship.
               User can't unlock and edit original node that was checked out by him. 
               WebDAVMethod-> checkNode() was changed to return Http Status 423 if node has a working copy
         25181: Merged DEV/TEMPORARY to PATCHES/V3.4.0 (with corrections)
            25102: ALF-6894: Share IMAP - Modifier and date/time incorrect.
               ImapServiceImpl.checkForFlaggableAspect() method was modified to  disable "auditable" behavior before adding "flaggable" aspect and then enable it again.
      25193: Fix ALF-7039: Unable to specify target MIME type for renditions generated by the TemplateRenderingEngine
         The "mime-type" parameter is now exposed by any rendering engine that is derived from the BaseTemplateRenderingEngine
      25205: Merged V2.2 to V3.4
         25184: ALF-6914: Use RetryingTransactionHelper in WorkspaceClipboardItem
            - Also decoded the mysterious looping logic
      25214: Merged BRANCHES/DEV/BELARUS/V3.4-2011_01_13 to BRANCHES/V3.4:
         25045: ALF-6435: SPP doesn't work with MT users
      25216: Merged HEAD to BRANCHES/V3.4:
         25100: Fix for build issue Steve was encountering on new build boxes using Ant 1.8.x
      25219: Fix for ALF-6312: "Incorrect work of AWE functionality"
      25222: Merged BRANCHES/DEV/BELARUS/V3.3-2010_12_20 to BRANCHES/V3.4:
         24943: ALF-6103: Explorer - Version type not set by auto version
      25224: Fixed ALF-6992: PersonUsagePatch is sequenced incorrectly and is too slow
         - Added direct SQL update for cm:sizeCurrent (adds a type NULL property just like the Java patch did)
         - Removed the Java patch; ensured that new patch has the old as an 'alternative' and that the old patch is now a NoOp.
         - Tested with 50K users upgrading from 2.1
         - Can be backported safely to 3.2 and later.
         - Will provide instructions in the JIRA for working around.
      25225:ALF-6992: PersonUsagePatch
         - Fixed alf_applied_patch entry
      25229: Fix for ALF-6661: Fixed issue with navigation handling in JSF client, although seen via WebDAV in the bug description, it's actually the same for any inline editing.
      25237: Fix for ALF-6463: Collaborator and Editor cannot rename items via WebDav
      25244: Fix for ALF-6858: Uninitialized FormUI options parameter causes UI to be unusable
      25245: A new schema version range for 3.4.1
      25246: Merged BRANCHES/DEV/BELARUS/V3.4-2011_01_13 to BRANCHES/V3.4:
         25226: ALF-6348: Edit the event to reccurent and backward doesn't work
      25253: ALF-7059: Excessive webscript loading times in v3.3 and v3.4
         - Corrected escaping of Lucene document searches in RepoStore
         - The '-' character was getting interpreted as an operator when searching for package-desc.xml
      25256: ALF-5143: Eliminate use of non-I18N friendly FileWriter
      25258: Undid fix for ALF-6992 revs 25224 and 25225
      25259: Fixed ALF-6992: PersonUsagePatch is sequenced incorrectly and is too slow
         - Fixes ALF-6954, too: CLONE - Attempt to login into Alfresco fails for previously created users ...
         - Follows previous fix removal
         - Moved SQL from bootstrap to patch execution, but still do a mass update
         - Ensure that QNames are present prior to SQL execution
         - 'patch.authorityDefaultZonesPatch' depends on 'patch.personUsagePatch'
      25261: Merged DEV to V3.4
         25160: ALF-1787: Slow performances when many workflow are opened
             1. Implementation of a custom query for JBPMEngine.getAssignedTasks.
             2. Uint test for creating and testing neccessary items in DB.
             3. HQL query for TaskInstance properties chache.
             4. HQL query for ContextInstance variables chache.
      25270: Fix for ALF-6271. ThumbnailRegistry loading definitions without transaction.
      25275: Merged DEV to V3.4
         25243: ALF-6583: when a LDAP admin removes its own account, account cannot be useed anymore and cannot be recreated
             - Full path to node calculating logic was extracted from ‘org.alfresco.filesys.repo.NodeMonitor.beforeDeleteNode()’ policy handler:
             - ‘NodeMonitor’ performs lookup operations as 'System' user
         25251: ALF-6583: when a LDAP admin removes its own account, account cannot be useed anymore and cannot be recreated
             - Additional persons’ cache controlling was added:
                - currently, ‘org.alfresco.repo.security.person.PersonServiceImpl.getPersonOrNull()’ checks all ‘User Home’ NodeRefs before using;
                - all inexistent NodeRefs will be removed from the cache 
      25281: Attempt to prevent build hang in ChainingUserRegistrySynchronizer
      25287: Merged DEV/TEMPORARY to V3.4 (with correction)
         25284: ALF-5596: Alfresco WebDAV does not work when repository is in read only mode.
      25295: Merged DEV/DAVEW/SAP to V3.4
         25207: ALF-6856: Avoid checkout failures under heavy load
            - Stop absorbing all exceptions in checkin / checkout / cancel-checkout
            - Propagate object wrapping code, message and cause instead
         25208: ALF-7062: Use a shared cache in RepositoryAuthenticationDao
         25209: ALF-7063: Use nodeService.exists() instead of a Lucene search in Search.findNode()
         25210: ALF-7064: Use caching plus a read write lock to avoid contention in SubsystemChainingAuthenticationService under load
         25211: ALF-7065: Use cached authorityService.getContainingAuthorities() method to improve performance of SiteServiceImpl.getPermissionGroups()
         25220: ALF-7062: MT fix
         25221: ALF-7062: Fix AuthenticationTest
         25223: ALF-7065: Refinement to use of cached authorities in SiteServiceImpl.getPermissionGroups() that preserves current 'direct memberships take precedence' semantics.
            - First fetch cached recursive group memberships. If there are zero or one, they can be returned immediately.
            - Otherwise, fetch immediate group memberships and work it out from there.
         25230: Extend ehcache cluster sample with socketTimeoutMillis=10000. Increase timeout from its 1 second default to avoid lots of RMI and cache integrity errors under load.
      25297: Fixed merge issue in 25295
      25302: ALF-6067: Unable to run read-only server without error
        - The latest error could not be reproduced
        - Added double-check to bypass audit if the system is in read-only mode (TransactionService.getAllowWrite())
      25306: ALF-5596: Merged DEV/BM to V3.4
         24726: BM - tweak WebDAV propfind (to use read-only txn)
      25326: Fixes for DB coverage: ALF-1787: Slow performances when many workflow are opened
         - Refactored query to use neat JOIN syntax
         - Added back batch size limiting to prevent Oracle blow-outs
         - Added in parameters to cover boolean query conditions
      25334: Added missing quotes in invitation service properties file
      25336: Merged V3.3 to V3.4:
         - 24918: ALF-6496: Browsing large File Plan is slow			
         - 24940: - Fix up issue with over enthusiastic caching of capability results.
              - Rename troublesome capability test so as not to hold up the build.  				
         - 24947: Fix-up to capabilities test.
         - 24973: Unit test fixes
         - 25046: Build fixes
         - 25080: RM: Fix transaction cache key
         - 25260: ALF-7000: RM: Cuttoff action for folder is missing when record is frozen
      25344: Updated capability tests.  More to come.
      25370: Fix for ALF-3339 - Modifying the properties of a link on a Folder does not show up after pressing the OK button but after pressing the 'close' button
      25374: Fix for ALF-6691 - Incorrect behavior of RSS feed for Wiki. Also fixes other minor RSS feed validation issues (pubdate format).
      25389: RM: Build fixes
      25414: Fix for ALF-3202: ALL field not fully implemented in LuceneQueryParser for wildcards, prefixes, and fuzzy
        - all current fields behave sensibly or throw unsupported
      25424: Fix for ALF-6576 - Search by tags shows not empty results on the site which has no content
      25467: Resolve ALF-7074: CMIS web services do not appear to allow ticket authentication
      25508: Fix for ALF-7110 - JSF custom component Form submit value encoding
      25538: ALF-6497: Updates to disposition schedules in progress do no complete with large record sets
         - Updates to records under the control of an edited disposition schedule is now performed in the background
         - A quartz job manages the record updates
         - UI updates to show whether there is a unpublished update to the disposition action pending 
      25539: RM: Ensure not "all" behaviours are switched off when processing disposition action defintions updates.
         - rm search information is now being populated and shown in the Ui correctly post publish
         - see ALF-6497
      25545: Merged V3.3 to V3.4
         ALF-7196: Records only
      25573: Deleted : /alfresco/BRANCHES/V3.4/root/modules/dod-5015/source/java/org/alfresco/module/org_alfresco_module_dod5015/model/FilePlanComponentAspectTest.java
      25603: Updated Postrgresql install switch
      25608: Fix Eclipse classpath after Postgres driver move
      25620: Fix for escalated issue ALF-7218: Advanced Search in Share breaks with custom type which contains underscores in type name
      25622: Merged BRANCHES/DEV/BELARUS/V3.4-2010_12_14 to BRANCHES/V3.4:
         24647: ALF-6307: Compliance for Third Party jars with Source Modified
      25623: ALF-6309: Changes to notice.txt and addition of license files
      25627: Fixes ALF-7222: Updated linux installer window height (with taller image to hide additonal background)
      25633: Fix intermittent unit test failure - retrying txn in RecordsManagementAuditServiceImplTest
      25637: Merged DEV/TEMPORARY to V3.4
         25215: ALF-6696 : Upgrade from 2.1.7 to 3.3.4 failing Due to "out of memory"  
            All large db scripts for all supported dialects was modified to follow batching approach.
         25325: ALF-6696 : Upgrade from 2.1.7 to 3.3.4 failing Due to "out of memory"
            1. Upgrade scripts for all supported dialects was corrected to follow mysql style after David's review of batching porting work.
         25398: ALF-6696 : Upgrade from 2.1.7 to 3.3.4 failing Due to "out of memory"
            Some errors was corrected in upgrade scripts after David's review.
      25643: Initial commit of reworked Japanese language pack
      25669: Merged BRANCHES/DEV/dwebster/ to BRANCHES/V3.4:
         25665: Spanish Language Pack update from Gloria
      25671: Updated installer with simple Easy install.  Fixed binaries inclusion.
      25684: Fixes: ALF-7102 - minor (consistent) typo in i18n string.
      25692: ALF-7293 - Handle error condition of unsupported RSS XML format (RDF in this case)
      25707: ALF-6993 Fixed AlfrescoTimer so that it no longer ends the task if the Timer is set to repeat.
      25715: Fix intermittent failing unit test by increasing time window
      25718: Merged PATCHES/V3.4.0 to V3.4
         25700: Fix for ALF-7059: Webscripts: Startup: webscript loading takes about 10 minutes to complete.
            - QNAME:simpleToken will go down an optimised route
      25720: Fix for ALF-7318: patch.calendarNamespaceUri fails as the TYPE field no longer supports prefix queries
         Part fix for ALF-6291: Inconsistencies in lucene search queries with wildcards and single letters.
      25721: Fixed ALF-7319.  Removed ';'.
      25734: Updated copyright to 2011
      25738: Fix to issue with groups display and wrong panel returned to after cancel group edit
      25773: Merged BRANCHES/DEV/BELARUS/V3.4-2011_02_16 to BRANCHES/V3.4:
         25747: ALF-6307 Compliance for Third Party jars with Source Modified
      25798: Merged PATCHES/V3.4.0 to V3.4
         25789: Merged DEV/TEMPORARY to PATCHES/V3.4.0
            25783: ALF-7079: concurrent access to share site using the Share web UI and webdav by two users break the copy.
               1. The WebDAV MOVE and DELETE methods were modified to properly handle the "MS Word shuffle" for working copies.
         25793: Merged DEV/TEMPORARY to PATCHES/V3.4.0
            25395: ALF-7079 : concurrent access to share site using the Share web UI and webdav by two users break the copy.
               UnlockMethod (webdav) was modified to correctly handle working copies.
      25803: Merged V3.3 to V3.4 (RECORD ONLY)
         25015: ALF-6749: Merged V3.4 to V3.3
            24601: Fix for ALF-6032: It's impossible to create meeting items
         25062: Merged V3.4 to V3.3
            25061: Merged DEV to V3.4
               24920: ALF-1787: Slow performances when many workflow are opened
                   1. Implementation of a custom query for JBPMEngine.getAssignedTasks.
                   2. Uint test for creating and testing neccessary items in DB.
               25014: ALF-1787: Slow performances when many workflow are opened
                   1. HQL query for TaskInstance properties chache. 
               Also:
                  - Moved back to query.list() - no difference with scroll
                  - Checked query plan for batching queries and found no problems
                  - Batch queries *have* to be limited in the IN clause
                  - Although not using scrolling, there was a missing close statement
         25276: Merged V3.4 to V3.3
            25261: Merged DEV to V3.4
               25160: ALF-1787: Slow performances when many workflow are opened
                   1. Implementation of a custom query for JBPMEngine.getAssignedTasks.
                   2. Uint test for creating and testing neccessary items in DB.
                   3. HQL query for TaskInstance properties chache.
                   4. HQL query for ContextInstance variables chache.
         25328: Merged V3.4 to V3.3
            25326: Fixes for DB coverage: ALF-1787: Slow performances when many workflow are opened
                - Refactored query to use neat JOIN syntax
                - Added back batch size limiting to prevent Oracle blow-outs
                - Added in parameters to cover boolean query conditions
         25373: Merged HEAD to V3.3
            25100: Fix for build issue Steve was encountering on new build boxes using Ant 1.8.x
      25807: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V3.4:
         25785: Add the WQS client API to the "generate-javadoc" build target
         25792: Fix ALF-7345: WQS: Unable to place a WQS on the root context of a web container easily. This fix enables the web context of a WQS website to be set to "/" to indicate that it lives at the root of the URI namespace of the web container.
      25809: Merged V3.3 to V3.4
         24899: (RECORD ONLY) Merged V3.4-BUG-FIX to V3.3
            24898: Fixed merge issue in FixUserQNamesPatch
         24913: Merged BRANCHES/DEV/BELARUS/V3.3-2010_12_20 to BRANCHES/V3.3:
            24890: ALF-837 Firefox: Incorrect behaviour of Insert/Edit image option on creating content based on web form
         24962: (RECORD ONLY) Merged PATCHES/V3.3.3 to V3.3
            24959: ALF-6780: Merged V3.4 to PATCHES/V3.3.3
               23385: Fix for ALF-5166: After restore of indexes - AUTO hangs
                  - bulk deletes are now handled as such during index tracking and rebuild (as they are normally)
         25011: Attempt to resolve latest build deadlock: Specify inputstring="" in junit invocations in order to work around Ant bug https://issues.apache.org/bugzilla/show_bug.cgi?id=37887
         25012: Reverse previous checkin.
         25033: ALF-6535: Changes to enable session sticky sessions for SPP
         25034: Merged DEV/TEMPORARY to V3.3
            25026: ALF-6763 : Malformed web.xml prevents 3.3.5 340 JBoss deployment, org.apache.myfaces.ERROR_HANDLING param should be replaced
               1. Web.xml was modified for web-client to allow bootstrap alfresco on Jboss EAP 5.1.0.
         25060: (RECORD ONLY) ALF-6114: Rules for updated items are triggered before users commit any changes.
         25063: Merged DEV/TEMPORARY to V3.3
            25059: ALF-608 Errors when uploading content via CIFS result in zero byte files
               Closing file operations wrapped by transaction in ContentDiskDriver.
               Catching IOException in NTProtocolHandler.procCloseFile() was changed to catching Throwable to avoid delay.
         25067: For for ALF-6807: TinyMCE: This is a follow up of: http://issues.alfresco.com/jira/browse/ALF-5420 (escalation)
         25177: ALF-6855: Adding versionable aspect as rule in share site causes errors
         25186: Merged PATCHES/V3.3.3 to V3.3
            25065: Fix for ALF-6780 Full re index seems to not ends up under certain circumstances.
               - A full rebuild only creates nodes
               - Fixed issue repeating all previous deletes already processed in the transaction (for deletes and updates to nodes)  with every delete/update in the transaction
               - Closed TermDocs enumerations
         25372: ALF-5933: Updated mysql collate encoding
         25456: Fix for ALF-7078: CLONE -Impossible to reject invitation due to script error
         25478: Fix for ALF-6756 - JSON delete should not pass body for request
         25498: (RECORD ONLY) ALF-5964: Updated installer window height for linux
         25533: ALF-6946: Correction to WAS libraries.xml
         25558: (RECORD ONLY) Fixes ALF-6268
         25560: Fixed ALF-7210: User workflow tasks query fails on RHEL
            - Case-sensitivity in the table aliases cause failure on unix
            - Must be 'processInstance' not 'processinstance'
            - Fallout from ALF-1787: Slow performances when many workflow are opened
      25810: Merged V3.3 to V3.4 (RECORD ONLY)
         25070: Reversed revision 25062
   25822: First embryo of social items on doc details page.
   25823: ALF-7336 - License file to be loadable from configurable location
   25824: ALF-7333: TR24: IMAP, CIFS, WebDAV & FTP should not mount company & user home by default
    - Added global property 'protocols.rootPath' defaulting to protocols.rootPath=/${spaces.company_home.childname}
    - Included 'protocols.rootPath' in file-servers config and IMAP config
    - TODO: Get 'protocols.rootPath' into WebDAVServlet
   25825: Fixed Eclipse classpath which contained a reference to someone's Tomcat directory
    - To avoid having to update the classpath, create a project in Eclipse called "Enterprise Runner"
      and pull in the "Enterprise Repository" into that.  Then run tests in context of "Enterprise Runner".
      Additional jars and paths can be pulled in as required.
   25826: Merged V3.4 to V3.4-TEAM
      25301: (RECORD ONLY) Merged V3.4-TEAM to V3.4
         25189: Expose getAllowWrite on the TransactionService API
      25821: ALF-5841 Applied fix to queryTasks() to stop the process definition hibernate query exceeding the limit of 1000 arguments.
   25828: New i18n labels for social interactions
   25830: Working "likes" added to document header on doc details page, using the Alfresco.Like widget found in share.js
   25831: More work in progress ALF-6593: TR04: Update dashlets to provide consistent look & feel, include thumbnails, help text, action links where applicable
   25832: Remove placeholder text (unused)
   25833: Some improvements on the "likes" in share.js, such as calling it Alfresco.Like instead of Alfresco.Favourite...  :-)
   25835: Build fixes for RM related tests
   25836: Added "favourite" on doc details page's header suing Alfresco.Favourite foun din share.js ALF-6614 "Page redesign and refactor"
   25837: Update the new html templates - remove the share_or_team flag (switching to just being "Alfresco"), and rationalise on shareUrl rather than a mix of shareUrl and share_url
   Also tweaks how shareUrl is injected into the model
   25838: I have no idea why FormServiceImplTest is failing on the build server, it runs fine locally. In the interest of getting a successful build this weekend I'm disabling the failing checks until I have time to investigate the environment difference on the build server.
   25839: Fixes to siteURL macro and param reader following recent refactoring.
   25841: ALF-7358 - RTEAM 38: User count is not decremented when users are removed
   ALF-7378 - RTEAM 39: Excess users error is not accurate for an end-user
   25842: Removed deep permission checks in RepoUsageComponent
   25844: Url fix for "like activity" posted from doc details page ALF-6614 "Page redesign and refactor" activities
   25847: ALF-6614 "Page redesign and refactor" added missing peice "comments" in doc detail header
   25848: Update the InviteSenderTest to work with the new way of passing the template details+model to the MailActionExecutor, rather than rendering the text itself
   25856: Change the User CSV Upload webscript to handle the transaction itself. This means that if the transaction commit fails (eg user limit exceeded, custom person validation fails) then we get to send the client our own error message+status code. 
   (Previously the commit failure was trapped by RepositoryContainer, and so the webscript had no control over the error reporting process, which is required in this case to meet share UI needs)
   25858: When generating WebScriptExceptions from a resource bundle (instead of the more usual system properties), ensure that the underlying cause (if present) is included
   25864: Added back logging of subsystem start/stop.
   25865: Removed unused code and comments
   25871: General license fixes
    - Apply forced read-write to transactions
    - Heartbeat code synchronization around enable/disable
    - Fixed license test to check for heartbeat state correctly
   25872: Merged V3.4 to V3.4-TEAM
      25849: Fixed ALF-7379: PostgreSQL patch.migrateAttrAVMLocks error when upgrading to Enterprise 3.4
         - PostgreSQL doesn't accept column aliases without 'as'
         - Probably version-dependent
      25850: Merged BRANCHES/DEV/dwebster/ to BRANCHES/V3.4:
         25843: Updated FR files received from Gloria 2011-02-25
         25845: Updated IT files received from Gloria 2011-02-25
         25846: Updated DE files received from Gloria 2011-02-25
      25859: Merged PATCHES/V3.4.0 to V3.4
         25857: ALF-7376: Detect concurrency problems in PutMethod
      25867: Fixes: ALF-5628 - Meeting Workspace Calendar Entry issue.
      25868: ALF-7274: Reinstate &characterEncoding=UTF-8 into default MySQL JDBC URL, using proper encoding of & for an XML file (&amp;)
   25882: License tests: Narrow down failures (doesn't fail locally) and also deal with logging problems
   25883: ALF-6593: TR04: Update dashlets to provide consistent look & feel, include thumbnails, help text, action links where applicable.
   New placeholder filetype icons @ 32x32.
   New avatar get URL (internal): /slingshot/profile/avatar/{username} or /slingshot/profile/avatar/{username}/thumbnail/{thumbnailname}
   Added "avatar32" thumbnail preset.
   25885: Remove reference to non-existent file. Add folder icons back into path on the details page.
   25886: Added new avatar photo placeholder icons from Linton
   25893: Fixed Legal and License url in About dialog
   25895: Fix for ALF-6622 "Comment component redesign and refactor"
   * show new comments component where required
   * comments in correct order 
   * displaying ok in 1024x768
   25897: Fix for ALF-6622 "Comment component redesign and refactor" part 2 (#svnuserfail)
   * show new comments component where required
   * comments in correct order 
   * displaying ok in 1024x768
   25907: Clean up redundant javadoc
   25909: Wrapped setup and tearDown work in retries
   25910: More ALF-7120: TR03: Test and integrate sample site into bootstrap process
    - Pulled everything into first-level patch
    - Removed build-time dependencies
    - Fixed authentication wrapping
    - Fixed I18N messages for patch
    - Note: The patch ID has changed, but this will not cause problems on re-application
   25912: Fixed test fallout from rev 25910 (ALF-7120: TR03: Test and integrate sample site into bootstrap process)
   25926: Even more ALF-7120: TR03: Test and integrate sample site into bootstrap process
   - Removed exclusions from build script for XML file no longer present
   - Fixed an re-enabled JavaScript test in SiteServiceImplTest that was disabled earlier
   25928: - Added form config for ActivitiesFeed MBean ready for addition to admin console
   - Made all boolean fields use a checkbox
   - Re-ordered Fileservers fields to tidy up form and fixed labels
   25937: Build fixes, updated counts for groups as there are now more groups in a default repo due to sample site being created.
   25940: Added Activities feed admin console component
   Fixed label reference in IMAP admin console component
   25955: Merged V3.4 to V3.4-TEAM
      25946: ALF-7191: Generate duplicate _en resource bundles, using location of _fr bundles as a guide for ALL bundles under alfresco and share WEB-INF/classes 
      25947: ALF-7191: Reverse accidentally committed changes to WebDAV in 25946!
      25954: ALF-7191 - Generate _en bundles for all message bundles for Explorer and Share - using known location of message bundles
   25959: Extra logging around ALF-7336: License file to be loadable from configurable location
   25962: Updated example JavaScript patch to include an example that starts a pooled review and approve workflow for all the members of the site the document being acted upon belongs to. The script has no effect if the document lives outside a site.
   25965: Fixes and tweaks from Alfresco Team UI review meeting
   25973: Fixed issue where some form field labels were not returned, was caused by a bean in the enterprise forms context file having a duplicated name.
   
   Also re-enabled the forms tests I disabled as these should now be fixed too.
   25977: More TR28: Prevent the IMAP 'Email Actions' folder from being created during bootstrap. The folder structure contains rules that point to the scripts we also no longer bootstrap. This folder is used for optional IMAP functionality which can be enabled by manually importing the ACPs if required.
   25982: Merged V3.4 to V3.4-TEAM
      25890: Fix for ALF-5796 - It's impossible to add tag in Japanese language (IE specific)
      25894: Fixed Legal and License url in About dialog
      25896: ALF-6476 -translation on Transfer Target configuration
      25899: First cut of French transfer properties.  Mostly English! but has 3 lines of French.
      25900: Fix for ALF-6916: More Deployment Reports action causes an error
      25916: Updated support URL in readme
      25925: Fix for ALF-6885: alfresco-enterprise-3.4.0.zip package has 2 issues with apply_amps.sh
      25936: ALF-6469 - transfer folders internationalized
      25949: Fixes: ALF-6521 and ALF-6493 (Site discussion's handling of tags with special characters in them)
      25950: Fixes: ALF-6489 - encodes the content's name to make it safe for a URL.
      25951: Fixes: ALF-6487 Adjusts styling for rename panel
      25956: Allow a bit of leeway with audit timing during delete tests
      25957: Fixed ALF-7341: Upload performance degradation when uploading contents to folders with content rules applied.
         - Action executions were being recorded by the ActionTrackingService for all actions
         - Post-commit updates of the action node was reducing performance
         - Added 'trackStatus' to ActionExecuter, ActionDefinition and Action
         - Default 'trackStatus' is false; exceptions: 'replicationActionExecutor' and 'commit-transfer'
         - Adjusted tests accordingly
         - General cleanup around modifications
      25964: ALF-5625 - When viewing properties in version history hitting close results in loop
      25970: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V3.4:
         25967: Fix ALF-7440: WQS: commons-pool library has been upgraded, but WQS build properties have not been changed accordingly
      25974: Reverted rev 25964 - as fix is scheduled for 3.4.2
      25979: Disabling intermittent failing unit test. ALF-7443 logged.
   25989: ALF-7457: Update to Team UI following 01/03/2011 review
   25990: Fix initial load of my tasks dashlet. Dashlet pagination now hidden if dashlet empty.
   25991: Agenda View: fixes minor bugs & attempts to slightly improve usability of Event Info box.
   25993: Fix for ALF-7444: RTEAM 41: ActivitiesFeedNotifier fails to send emails (when built using exploded target)
   25997: License management debug logging
   25998: Temporary logging for license and heartbeat
   26008: Merged BRANCHES/V3.4/ to BRANCHES/V3.4-TEAM:
      25891: Fixes: ALF-7363 (updated JA translation)
      25901: Fixes: ALF-6847 (Italian Translation)
      25902: Fixes: ALF-6861 (incorrectly encoded German character)
      25904: Fixes: ALF-6755 (translation quoting error)
      25911: Fixes: ALF-6478 - French translation correction
      25915: Updates TinyMCE translation as requested in ALF-6486.
      25917: Fixes: ALF-6482, wrong word order in FR has been corrected.
      25913: Fixes: ALF-6334 and ALF-6477 (Profile Edit style issues - makes mark up consistent, clears floats to allow for foreign languages being a tad more verbose than English and adjusts padding to help input boxes line up.
      25919: Fixes: ALF-6655 updated to allow enough space for verbose languages (e.g. FR, ES)
      25941: Merged BRANCHES/DEV/dwebster/ to BRANCHES/V3.4:
           25939: Latest JA update from Translators, received: 2011-02-28
      25943: Merged BRANCHES/DEV/dwebster/ to BRANCHES/V3.4:
           25942: Language updates for property string changes and additions between 3.4.0 and 3.4.1
   26009: Fixes double byte comma issue in JA.
   26010: License loading: Further use of the license change callback
    - Added notification for license failures
    - Heartbeat uses callbacks
    - ALF-6884, ALF-6905, ALF-6888
   26015: Updated sample site, now contains images that can be distributed.
   26016: Temporarily disable failing test: runs locally
   26018: Final version of English HTML email templates.
   26025: Debug logging to test to trace during builds.
   26029: Team unit test fixes and analysis
    - Reintroduced UserUsageTrackingComponentTest with debug logging to aid trackability
    - Fixed at least one LicenseComponentTest (Trial license generation for forcing read-only mode)
    - Added further logging of failed licenses to aid tracability on build box
    - Removed temporary debug logging (build box debug logging working fine)
   26031: Fixed embedded license loading and logging
   26038: Updated Contents.acp of sample site, fixes the broken image link in the wiki's main page
   26041: Merged V3.4 to V3.4-TEAM
      26024: ALF-7466 - Links do not appear correctly in the management Console (RM)
      26033: Correct database cleaning behaviour of continuous build - dir.test.data was never set. dir.root was never getting cleaned.
         - dir.test.data replaced with dir.root
      26036: ALF-6403: Merged V3.4 to V3.4 (lost revision)
         25627: Fixes ALF-7222: Updated linux installer window height (with taller image to hide additional background)
      26039: Fix intermittent failures in InviteServiceTest.tearDown()
      26040: Fix intermittent failures in InviteServiceTest.setUp()
   26046: Test cleanup of license restrictions
   26047: Prevent real embedded license from being picked up during unit tests of embedded license
   26053: Added in loop to wait for asynchronous post-failure auditing (ALF-3055)
   26054: Separation of embedded license location for HeartbeatTest
   26055: Merged V3.4 to V3.4-TEAM
      26014: ALF-7087 - Cannot override webscript files in case of using jboss 5.1GA
      26043: Sync up run-junit-test with junit macros so that it can be used to run unit tests in an enterprise environment (e.g. DB2 / Oracle)
      26044: Possibly fix intermittent TransferServiceImplTest failures by using org.alfresco.repo.transaction.RetryingTransactionInterceptor
      26052: Do not wait indefinitely for a heartbeat in HeartBeatTest. A broken heartbeat would cause the build to hang forever!
   26062: ALF-7492 - MT support for new Team/Enterprise license info retrieval in web-tier.
   26064: Fixed ALF-7419: RTEAM 40: Duplicate warning and error messages when user limit reached
   26066: Fixed ALF-7489: Team - default outbound email settings need removing
    - Now: mail.host=smtp.example.com
    - Added this to build env. on bamboo and bamboo2: mail.host=smtp.alfresco.com
   26069: Removed unused remote-api bootstrap files
   26070: Use PropertyCheck to check for valid property values
   26071: Extra debugging during 'split person' processing
   26072: ALF-7333: TR24: IMAP, CIFS, WebDAV & FTP should not mount company & user home by default
    - WebDAV obeys 'protocols.rootPath'
      - Use dedicated bean to ingest properties so that Spring takes care of the placeholders
      - Servlet gets the bean instead of using web.xml config values
    - Added global property 'protocols.storeName' and injected it into protocol configurations
   26073: Follow-up on rev 26069: Removed unused remote-api bootstrap files
   26074: ALF-7468: Update to Team UI following 03/03/2011 review
   ALF-7474: Check supported mimetypes for new icon support
   26075: Latest dashlet help balloon and empty content text. Missing file from r26074. Consolidated Site and Repository DocLib renderers.
   26076: Fix to base style for Content I'm Editing dashlet
   26078: Fixed the "RM part" of ALF-7013 "Fix up refactored Document Details page and components for RM and WCMQS modules"
   26079: Merged V3.4-BUG-FIX to V3.4-TEAM
      26057: Fix for ALF-6691 - Incorrect behavior of RSS feed for Wiki. Resolves a number of niggly auth related issues with RSS feeds and auth.
      26060: Improvements to error 500 handling page for Share. Complete exception output as HTML comment for administrators and developers. Web-tier server errors now output to the console again also.
   26080: ALF-7358 - RTEAM 38: User count is not decremented when users are removed
    - Added listening during modification of user (enable/disable)
    - Use common warning and error logging: the same logging that is displayed to admin
    - Also fixed erroneous logging of person splitting when a user was changed (it was not actually doing anything)
   26083: JA file moved to reflect changes made while translation was being done.
   26085: Fixed ALF-7529 "No doclib action on details" - caused by double encoding of vtiServer property
   26086: ALF-6835 - Report license errors to all users and warnings+errors to admin on first login.
   26087: Final implementation of ALF-7230.
    - Changed ImapServiceImpl to look for localised siblings of the Imap Email templates. Using the normal FileFolderService method, email templates for IMAP clients will be selected based on server locale.
    - Added new email templates for locales: de, es, fr, it.
    - Changed existing default locale to use ACP for consistency.
   26090: Updated sample site, now includes a video file to highlight new video previewing capabilities
   26091: Fixed ALF-7013 "Fix up refactored Document Details page and components for RM and WCMQS modules" part 2 - WCMQS
   26092: Addition of patch for non-default locale templates for Imap Clients. (ALF-7230)
   Also stepped the db version number.
   26098: Minor updates to dashlet help text.
   26103: Fixed test after default config for email settings were changed.
   26105: ALF-7533: Drag and Drop no longer works into FF3.6 browser
   ALF-7532: Content Rule on RM site (other than Folder) creates 'GUID' folder in Share (fixed as part of general RM fixes)
   
   Also: RM and WCM QuickStart Document Library extensions patched to latest code. WCM QuickStart toolbar extension removed. Drag and Drop refactored to work in Repository Browser and WCM QuickStart; switched off for RM. English property files created when using Slingshot exploded target. Header conditions updated to use correct Community edition string.
   26106: Remove debug output.
   26108: Fix for ALF-7331. Thumbnails in Share do not change from initial generic filetype icon...
   The fix is to have StreamContent.java use the actual resource's modification timestamp for the Last-Modified header.
   It was using the mod-time of a newly created file, which held a copy of the classpath resource.
   This led to a race condition between putting a timestamp on the placeholder and putting a timestamp on the cm:thumbnail node.
   26113: Fix slingshot-exploded target - missed commit from yesterday.
   26114: Merged V3.4 to V3.4-TEAM
      26077: Upped LOGFILSIZ to avoid failures in unit tests with large transactions on DB2
      26084: Avoid intermittent test failures in AbstractTestFormRestApi by using retrying transactions
      26096: Correction to DB2 drop / create commands
      26097: Fixes: ALF-7102, typo in property string.
      26102: Attempt to avoid intermittent failures in TaggingServiceImplTest by upping wait time
      26109: Another go at executing the db2 creation statements synchronously through db2cmd
      26111: ALF-6764 - Copyright year on Share login page out of date
   26118: Made the JMXFormProcessorTest more resilient to changes in the email configuration.
   26122: Fix customize site page following refactoring in r26078. Added Data List page icon.
   26126: Merged V3.4-BUG-FIX to V3.4-TEAM
      26099: Resolve ALF-7539: Tomcat sessions are created unnecessarily when invoking CMIS web scripts from Web Quick Start
   26129: ALF-6929: RTEAM 21: activities feed notifier - add per user on/off flag
   26149: Removed old System.out
   26150: Fixed ALF-3856: Version History lost when Versionable Content renamed via CIFS
    - Added fileservers property: filesystem.renameShufflePattern=(.*\.tmp)|(.*\.wbk)|(.*\.bak)|(\\~.*)
    - Any rename that does not match the pattern on either the source or target names will not be shuffled
    - Requires retesting of use cases involving CIFS and MS Word.
   26151: ALF-6626 TR15: Email notification preferences
   Cleanup to related components
   26161: Fix full installer.
   26162: Updated calendar help with latest icons and styling to match.
   26168: Use new install builder 7.0.3
   26169: Localized installer.
   26173: Tweak to display of warnings/errors after login - reduced impact on server
   26200: Locate Postgres data within alf_data directory
   26209: Locate Postgres data within alf_data directory for Team
   26210: Set license path to include install dir, and set protocol root to Sites
   26215: The ContentTransformerRegistry and the ContentService used to only expose the 'best' transformer for a given (srcMime, targetMime, options). This check-in adds access to the full list of active transformers for any (srcMime, targetMime, options) to those two classes.
   As part of a subsequent fix for ALF-5084, the ThumbnailService will use this list to improve create-thumbnail retry behaviour for problem files.
   26227: Merged V3.4-BUG-FIX to V3.4-TEAM
      26226: Merged DEV/SWIFT to V3.4-BUG-FIX
         26225: 'renameShuffle' detection pattern needed extending and logic was slightly incorrect
                 - Fallout from fix for ALF-3856 detected by new unit tests
   26235: Merged V3.4 to V3.4-TEAM
      26233: Fixes ALF-6019: Ensure PostGres services deleted after installation cancel
   26264: ALF-7653 - sys-admin panel no longer editable
   26265: Merged V3.4-BUG-FIX to TEAM
      26263: Merged DEV/SWIFT to V3.4-BUG-FIX
         26262: Fixed regex patterns to cater for .properties file escapes (ALF-3856)
   26266: ALF-7651 - WebM and OGG Video have 'unknown' mimetype in Team
   26267: ALF-7578 - When importing from an ACP a node with the versioned aspect on it, have an initial version history created starting at the current version label.
   26268: ALF-7687 - Ability to use wild character in People search - Should add configuration to allow zero characters for all search in Team config.
   26272: ALF-7578 - Add unit test for versionable ACP import, and fix the default aspect includes now that we handle versionable
   26287: Fixes ALF-7439: Prevent check on alfrescowcm component
   26290: Fixes ALF-7439: Ensure that virtual server shortcuts don't get created for Team
   26294: Fixed @since tags and some minor coding standards fixes
   26316: Fix for ALF-5084, ALF-5644 and general thumbnail improvements in the area of failing thumbnails.
   
   This check in adds extra functionality to the create-thumbnail action in order to improve how Alfresco handles failing thumbnails.
   The requirements agreed between Services & Prod Mgt were
    - When thumbnails fail we should limit how often they are retried. So the system should remember when a thumbnail has failed for a node. 
    - The retries will be initiated in the same way they are now: by users navigating to a page that asks for the thumbnail (lazy creation), primarily doclib. 
    - Retries will occur at a throttled rate (all the below parameters to be configurable by sys admin, but not yet by JMX). 
    - Initially, retries will be limited to a maximum rate e.g. 1 per minute. 
    - These retries will be allowed up to a maximum count e.g. 2 failed attempts. 
    - After that count is reached, the content will be considered "difficult" and thumbnail creation should be retried at a much reduced maximum frequency e.g. once a week 
    - Retries of difficult content shall be enabled by default, but can be disabled.
   
   This check-in adds a new aspect and a type to the content model. These hold the thumbnail failure information.
   The create-thumbnail action now has a compensating action which is run when it fails.
     AddFailedThumbnailActionExecuter decorates the content node with failure information.
   create-thumbnail now has an action-condition, which means that it will only run if a node is "eligible" for a thumbnail creation attempt.
   Eligibility is controlled by some new properties and is configurable. Default behaviour is as described above.
   
   There should be no change in behaviour for most content nodes in Alfresco.
   However, for those documents which fail to produce doclib or webpreview thumbnails - and most especially those which consume 100% cpu for some time before failing - we expect to see the same behaviour initially on upload (cpu grind as Alfresco or a 3rd party library attempts to produce a thumbnail), but that as time passes, Alfresco should prevent thumbnail creation that will likely not succeed. This should save cpu on the repo server.
   
   And tests. Of course.
   26323: Upgraded login warning to WARN_ALL when user limit reached
    - This now matches the specification document
    - ALF-6832:TR25: License restriction reporting
   26326: Merged V3.4 to V3.4-TEAM
      26142: Merged PATCHES/V3.4.0 to V3.4
         25999: ALF-7377: Validate and reject partial WebDAV requests sometimes produced by NetDrive
      26143: Merged PATCHES/V3.4.0 to V3.4
         26005: Merged V3.4-BUG-FIX to PATCHES/V3.4.0
            26002: ALF-7282 Updated NodeListConverter so that it now implements the method revert(Object, ProcessDefinition)
      26158: Merged DEV/TEMPORARY to V3.4
         26154: ALF-7571: Create Web Project wizard - Step 3
            Superfluous “cellpadding” elements were removed. Missing space was added.
      26164: ALF-6885: Changed svn:eol-style from native to LF for all .sh scripts
      26178: Merged DEV/TEMPORARY to V3.4
         26172: ALF-7601: 3.4.1 SDK WebServiceSamples multiple problems
            Configuration properties for WebServiceSamples was moved to correct place.
            Dependency to SDK AlfrescoEmbedded was added to classpath. It is required for FileCopyUtils from Spring which is used in WebServiceSamples.
      26190: Reversed 26165 / 26161 - breaks installer building
      26192: Convert TaggingServiceImplTest to use retrying transactions!
      26194: ALF-7045: AVM upgrade - re-implement AVM "rename duplicates" patch as a DB upgrade script
      26195: Update installer overlay files
      26197: Final installer updates - built and tested on OSX
      26199: Allow relocatable data for postgres - part2
      26204: Attempt to avoid intermittent unit test failures in RecordsManagementAuditServiceImplTest by adding some Thread.sleep() calls to allow for asynchronous audit behaviour
      26207: Set site notification to false on install (ALF-6181)
      26212: Merged DEV to V3.4
         26203: ALF-7605 PostgreSQL: Upgrade from 2.1.7 to 3.4.1 is failing - constraint "alf_access_control_entry_acl_id_key" does not exist
             1. The statements which are drop constraints, marked as optional
             2. The alter statements with new constraint names were added
      26256: Fixes ALF-7679: Remove webscript-framework-config-custom.xml file
      26270: License updates from Ashutosh
      26274: Fix intermittent unit test failure with retrying transaction
      26275: Possible fix to intermittent test failure.
      26295: Reduce scope of retrying transaction, in a hope of fixing TaggingServiceImplTest.testOnStartupJob()
      26303: And the prize for the largest number of retrying transactions in a single unit test goes to...
      26307: Fixes: ALF-7704: Japanese language option not appearing in dropdown box on log in page.
      26314: Another defensive sleep() in RecordsManagementAuditServiceImplTest
      26325: Moved defensive sleep() in RecordsManagementAuditServiceImplTest
   26336: Fixes ALF-7713: Prevent folder/documents from being draggable in DocLib
   26348: Fix for ALF-7751 - encode all params on new Team dynamic welcome dashlet
   26351: Removed svn:mergeinfo
   26353: ALF-7745 - Add pop-up balloon validation helper to create site dialog.
   URL Name (shortName) is now also auto-generated from the site name (siteTitle) by removing characters other than 0-9, a-z, A-Z and "-", replacing spaces with "-" and converting to lower case. Auto-generation is stopped if the user edits the URL Name field themselves and restarted if they empty the field.
   Update to Preference Service to allow "-" character in preference keys.
   26355: ALF-7743 - Increase delay on "More actions panel" in document library
   26361: ALF-7758 - Site Dashboard: Welcome widget isn't removed immediately
   26364: Updated UI Text strings following review by Linton.
   26366: Fix for ALF-7757 - Calendar agend view encoding
   26368: Fix for ALF-7739 - Click activity link for a file after DnD upload results in an error
   26369: Merged V3.4-BUG-FIX to V3.4-TEAM
      26340: Fixed ALF-6377 "Incorrect behavior of Overdue filter in My Tasks Dashlet"
   26374: Further UI text updates from Linton
   26377: Updates to ACPs as part of ALF-7382 Translate/Localise HTML email templates.
     This check in adds localisations in de, es, fr, it, ja for the following email templates:
       activities-email
       imap_message_text_html
       imap_message_text_plain
       invite-email
       new-user-email
       notify
   26381: Set site invites on by default for Team.
   26384: ALF-7733 - Data list's type isn't included for deleted activities
   26385: ALF-3709 - User Status on Profile
   26389: Merged V3.4-BUG-FIX to V3.4-TEAM
      26372: Fix for ALF-7791 - no longer spews masses of exceptions when doc details page for a missing node is displayed.
             Node Metadata retrieval service now returns valid JSON in all cases.
   26390: Fixed ALF-7689 "Team: Dashlet names don't match dashlet titles"
   26391: ALF-7718 - Handle excel files without a freezepane, eg those created by hand rather than using the friendly template
   26394: Merged V3.4-BUG-FIX to TEAM
      26392: Removed code which sets the cm:title property to the filename in the upload webscript. This was causing an unnecessary auditable update.
      26393: Line endings
   26403: Fix for ALF-7832 - Licence warning for all users on WARN_ALL
   26409: ALF-7763 - Updates to dashlets in Team following usability studies, including: presentation of "no data" made consistent. Page-level inline JavaScript wrapped in module mark-up.
   26410: Fix license location for Win installs
   26425: Fixed ALF-7726: 'Repository Descriptor (Originally Installed)' form doesn't contain Name and Edition information.
   
   Also updated the 'Heartbeat Disabled' field in the License form to use a checkbox control.
   26426: ALF-7742 - Remove title field on simple edit metadata pop-ups
   26427: ALF-7665 - Team: Duplicate Help links in toolbar
   26434: ALF-7875 - CLONE -Unable to browse into folders in Share Site
   26435: Moved of Ent/Team logos to overlays, empty logos in place
   26437: Merged HEAD to V3.4-TEAM
      24723: ALF-5799: Type-ahead functionality for tags
   26438: Merged BRANCHES/DEV/dwebster to BRANCHES/V3.4-TEAM:
      26431: Latest Spanish language Pack updates
      26429: Latest Italian language Pack updates
      26428: Latest French language Pack updates
      26422: Latest German language Pack updates
   26444: Merged V3.4-BUG-FIX to V3.4-TEAM
      26186: Improvements to tree node handling and Bubbling library following investigation for ALF-6960 and ALF-7296
      26189: (Partial merge due to refactoring) ALF-7077 - Unable to set a Repository library root node by XPATH
             Merged HEAD to V3.4-BUG-FIX
                24021: Share Repository Browser support for xpath starting location. See comments in "RepositoryLibrary" section of share-config-custom.xml.sample.
                26183: ALF-6960 - Actions "Copy to..." and "Move to..." Repository don't display the Path. ALF-7296 - Copy or Move content from a site document library to the repository do not work.
      26191: Prevent MooTools JavaScript library being compressed on every build. Added minimized file to source tree. Added target "minimize-mootools-javascript" which inserts a reminder comment to the top of the minimized file.
             Also reverted inadvertant line-endings swap in build.xml from r25479
      26282: ALF-6728 - Unable to open office documents via Share Site > Document Library > All Documents > Edit Online
             Reworked calculations around the "location" field so that the attributes within are returned more consistently.
      26297: ALF-3113 - Data Lists: Delete/duplicate multiple items should affect only selected items on current page
      26298: ALF-7609 - Items numbering in document library in Share appears quite ambiguous in case of documents with working copies
      26312: ALF-4220 - Alfresco Share - Tag component - Unable to view more than 100 tags
             Object finder-based pickers now look for "maxSearchResults" in the control params (rather than the args property bag)
   26445: Merged V3.4 to V3.4-TEAM:
      26443: Installer build updates
   26447: Merged V3.4-BUG-FIX to V3.4-TEAM
      25975: ALF-5625 - When viewing properties in version history hitting close results in loop
      26174: *Record only* Fix spring-surf library versions after merge in rev 26144
      26175: Fix for ALF-7201 - Unable to create group with other name if group identifier is already exists
      26187: Fix for ALF-7297 - Share Advanced Search does not work if the property name include a minus (or any symbol not supported by SQL92 identifier standard)
      26240: Fix for ALF-7462 - Share - User profile / Non-ASCII characters display (double encoding of user description field)
      26242: ALF-3767 - Creating account with 0 quota in Share gives unlimited quota
      26279: ALF-7682 - Fix to correctly take the 'external-auth' config setting into account when testing for login auth against the default alfresco endpoint.
      26280: Fix for ALF-7391 - In the search properties in share, repository is spelt wrong.
      26401: Fix for ALF-7428 - Share: User cannot add comment to content when the 'admin' user is not in administrator group
      26405: Fixed ALF-7224 "Share - Scrollbar issue on dashboard customization page"
   26451: Merged V3.4-BUG-FIX to V3.4-TEAM
      26399: Fix for ALF-5863 - DOCLIB: large number of tags slows doclib rendering to unusable.
             Number of tags to display in the Tags filters is now configuration and defaults to 100 items. Can be configured with value of -1 to show all tags.
   26456: Merged BRANCHES/DEV/dwebster/ to BRANCHES/V3.4-TEAM:
      26450: Latest Japanese language Pack updates
   26458: Merged BRANCHES/V3.4/ to BRANCHES/V3.4-TEAM:
      26417: Fixes: ALF-7414, confused and hardcoded date-formatting & date formatting translations fixed.
      26414: Fixes: ALF-7697 - Rewording the URL help text on the create site dialogue
      26413: Fixes: ALF-7765 - ensures naming consistency
   26461: Merged V3.4-BUG-FIX to V3.4-TEAM
      26243: Fixes ALF-7301: IE6 CSS updates to prevent layout corruption on datagrid
      26404: Fixes ALF-7348: Copy to/Move to width changes for IE6 & IE7
      26453: Fix unreported issue with the appearance of tags in the object finder being stacked vertically rather than horizontally for IE6 and IE7.
   26464: Merged V3.4-BUG-FIX to V3.4-TEAM
      26463: Follow-up fix to r26453 for full-page edit mode
   26465: ALF-7869 - Layout is broken if many tags are added to the item (Document Library browse view)
   26466: Merged BRANCHES/DEV/dwebster/ to BRANCHES/V3.4-TEAM:
      26459: Fixes incorrectly translated stirngs.
   26467: Merged V3.4-BUG-FIX to V3.4-TEAM
      26334: Fixed ALF-6289 "Contributor is absent in Permissions section at the details page" part 2 - now also on folder details page
   
   26468: Fixed bug when content size was 0, now the "Preparing previewer..." message is replaced with a message saying "This document has no content"
   26469: Fixed ALF-7744: Ensure that new options.limit gets set when updating RSS feed results
   26472: Activity list: css class for each activity type into config
   26473: Remove references to non-existent client-side "document-details.js" file
   26475: Calendar UI Bug fixes & improvements from usability feedback (inc. ALF-7592, ALF-7588, ALF-7590, ALF-7594, ALF-7589, ALF-7595, ALF-6959)
   26477: IE6/IE7 css fixes: Fix footer layout and prevent unnecessary horizontal scrollbar
   26482: Merged BRANCHES/DEV/dwebster/ to BRANCHES/V3.4-TEAM:
      26480: Latest Update from Translators via Gloria.
   26485: Fix for ALF-7728. Incorrect information at the Trash page.
     The 'archived by' as returned from the REST API was not the user who archived the node, but was instead the
     original owner of that node. This has now been corrected.
   26494: Small fix from translator
   26496: Installer NLS updates
   26498: Merged V3.4-BUG-FIX to V3.4-TEAM
      26486: Fix for ALF-7602, ALF-7734 - Incorrect behavior of groups - groups in non-default zone displayed in Share UI
   26501: Added translations for "Contributor" role.
   26506: Merge V3.4 to V3.4-TEAM:
      Fixes ALF-7735: Update to postgres.xml to make use of vcruntime on 64-bit windows (fix dependent upon additional update to ALF-BINARIES)
   26513: Merged V3.4-BUG-FIX to V3.4-TEAM
      26512: Fix for ALF-7921 - Script error occurs when is added 'Image preview' dashlet.
   26516: Fixed ALF-7791 "Clicking the activity link for a file after deleting that file results in an error"
   26517: Removed unused component files since document details page refactor
   26532: ALF-7946 - It's impossble to destinate More+ administrator menu.
   combinePaths() function reworked to maintain trailing "/" if the last argument ends with one.
   26536: ALF-7948 - IE Specific - It's impossible to download document via Download button at the details page
   26541: Fixed ALF-7868: Import site doesn't work (QA were trying a scenario that we aren't supporting, removing the old sample context file to avoid problem/confusion)
   26545: Fixed ALF-7001 "Customize site drag and drop - page item is added to end of list if quickly dragged and dropped"
   26550: Fixes: ALF-7935, typo in message string.
   26556: UI improvements and Ajax-ified performance improvements to Image Summary dashlet
   26561: Fix for ALF-7888. Sites are not recovered.
   The fix applied is to mark site nodes with the sys:temporary aspect within the SiteService in order to have them be fully deleted immediately and not go into the trashcan.
   26562: ALF-7925 - Incorrect behaviour of Categories cloud at the Document Library page
   26563: ALF-7912 - Incorrect behavior of items marked as favorite - IE specific
   26570: Update build to correct installer file names.
   26572: Team installer build tweak (added back project filename removed during merge)
   26573: Merged V3.4-BUG-FIX to V3.4-TEAM
      26564: Fix for ALF-7965 - Content page of user profile not updating properly (modified docs always shown in the recently added list)
             Improvements to show filetype icon - FreeMarker macro to mirror basic functionality of Alfresco.util.getFileIcon
   26574: ALF-7962 - Team: Create Site dialog fields aren't cleared on Cancel
   26575: ALF-7970 - Links 'Show Earlier Events/Show Later Events' don't work in IE browser
   26578: Merged V3.4 to V3.4-TEAM:
      26542: Fixes ALF-7954: Ensure that installer copies SWFTools to correct location
   26586: Added script model object "msg" helper to retrieve I18N messages for template level JS controller (mirroring the support in WebScript component JS model)
   26595: ALF-7982 - Filetype icon isn't displayed for topic's reply in activities
   26597: Fixes ALF-7845: Provide tooltip assistance when DocLib upload dialog launched from site welcome dashlet (when DnD is available)
   26605: Fixed ALF-7681 "Renames of Document Library not reflected in page title."
   26617: removed svn:mergeinfo
   26622: JMX Admin pages UX fixes:
   - The Save & Cancel buttons on the jmx admin console pages have been configured not to be displayed.
   - A a "Cancel" link is present instead. 
   - The "Operations" header has been removed
   - The "save operation" button now has an "Update" label instead of "Save"
   26625: Reduced distribution artifacts to minimum (now no E3.5 planned)
   26653: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V3.4-TEAM:
     26619: ALF-6244 - Creating the initial version of a node shouldn't update the Auditable properties
     26623: Add new Version Service method "ensureVersioningEnabled".
     26624: ALF-6121 + ALF-6244 - When activating lazy versioning for share, use a ScriptNode call to the Version Service
   26654: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V3.4-TEAM:
      26631: Improvement related to ALF-6650. Secured PDFs in Acrobat 9 fail to rendition.
   26657: Merged V3.4-BUG-FIX to V3.4-TEAM
      26655: Add parameter comments around ensureVersioningEnabled() function call.
   26660: Fixes ALF-7955: Update error message when dropping zero byte size files or folders into doc lib
   26662: Merged V3.4-BUG-FIX to V3.4-TEAM
      26661: ALF-8053 - Document Library is attempting to create thumbnails for types that are not subtypes of cm:content. Also prevent thumbnail webscripts from attempting to generate thumbnails for in the same cases.
   26665: Fixed ALF-8042 "Renamed page component reverts to default name when moved (Customize Site page)"
   26673: Merged V3.4-BUG-FIX to V3.4-TEAM
      26672: Consolidate multiple occurrences of "#yui-history-iframe" style into base.css
   
   Also fixed markup issue in console-tools that was confusing MSIE browsers.
   26676: Additional fix for ALF-7687 "Ability to use wild character in People search - Should add configuration to allow zero characters for all search in Team config."
   - start workflow component now picks up global min & max search length config
   26677: ALF-8019 - Delete folder window has incorect name
   26678: Merged V3.4-BUG-FIX to TEAM
      26383: Fixed ALF-7692: Non-admin users can move content into Company Home
      26430: More ALF-7692: Non-admin users can move content into Company Home
      - Handles duplicate ALF-7923
   26679: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V3.4-TEAM:
      26439: Probable fix for ALF-7482. Custom ImageMagick parameters not being accepted on Linux Alfresco server.
   
   26680: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V3.4-TEAM:
      26474: Fix for ALF-6730 Preview and thumbnails are not update with new revision of the document is uploaded.
          Added a compensating action to ensure that renditions are deleted when re-renditions fail on new content.
   26682: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V3.4-TEAM:
      26675: Fix for ALF-7334 Could not upload new Version all Dokuments.
            Issue was resolved by adding "RunAs System" boilerplate to the few places that load (and in the case of the WQS, delete) rendition definitions.
            We purposely did not add this boilerplate within the RenditionServiceImpl.loadRenditionDefiition() method as we want to retain effective permission controls for normal client code.
            Added some javadoc to highlight the permissions issues involved.
            I also took the opportunity to add a convenience method to the RenditionService, namely render(NodeRef, QName) which will allow client code to execute built-in rendition definitions (e.g. thumbnails) without worrying about permissions on Data Dictionary. That method wraps the equivalent render(NodeRef, RenditionDefinition) in a RunAs System.
   
   26685: Fixed ALF-7880 "Download version form version history shows incorrect document name"
   26688: ALF-7919 - Use 'Properties' instead of 'Metadata' in actions, titles etc.
   26690: Partial fox for ALF-8014. thumbnail and file type aren't generated for *.eps files
     A placeholder 'doclib' icon is now available for .eps files.
   26697: ALF-7004: TR28: Create HTML email templates (Implemented Linton's richer HTML email template design)
   
   Also removed the timestamp from the email subject for the Activities email as the timestamp is now within the body of the email.
   
   NOTE: You need to start with a clean database in order to see the new templates.
   26698: Build fix since label change of Start operation button in admin console (JMX) forms.
   26699: Fixed ALF-7886 "Click here to Download gives incorrect document name"
   26700: Fixed ALF-7801 "Incorrect hint for Upload new version action in Versions pane"
   26702: Fixed ALF-7857 "Team: Inconsistency between DocLib action and tooltip text"
   26703: Fixes ALF-7762: Add tooltips to dashlet toolbar actions
   26704: Fix for ALF-7785 - Agenda View doesn't always update list after Edit/Delete of an item
   26708: Merged V3.4-BUG-FIX to TEAM
      26664: Fix build (DOD5015 security context and test refactor)
   26709: Slight reworking (and rewording) of the tooltip on the upload dialogs when drag and drop is available (the "#upload" use case)
   26710: Move style fixes into IE specific CSS files to avoid breaking layout on other browsers
   26712: Merged V3.4-BUG-FIX to V3.4-TEAM
      26711: ALF-3833 - Share - Phrase tags
   26714: ALF-8081 - W3C: a highlighting of drop-down menu (Sites, People) in toolbar is invisible in Safari.
   26715: Tweak to imagesummary dashlet node cloning performance
   26716: ALF-8082 - W3C: it's impossible to select a lot of links in Safari
   ALF-8083 - W3C: it's impossible to select Site Pages in Safari
   26718: Fixes for ALF-7874, ALF-8012 - Mimetype map additions, filetype icons.
   - also replaced worlds-largest if-else freemarker statement with inline map for Forms mimetype lookup
   26719: Further fix for ALF-8014. Thumbnail and filetype not generated for *.eps files.
     I've added a -file-48.png for the .eps mimetype.
     I copied it from one of the other image -48.png files as they're all generic 'img' icons anyway.
   26721: Fix for ALF-7963 Team: Can edit another user's email notification settings
   26722: Collapsed/expanded state of Properties panel wasn't being remembered on Details page. Removed "collapsed" parameter for Alfresco.util.createTwister which won't work with our current implementation. Pre-empted "alfresco-twister" class for slow-loading components.
   26723: Changed component initialisation event from onContentReady to onAvailable which should improve appearance/decoration times slightly.
   26724: ALF-8089 - W3C: a highlighting of "Show Earlier Events" and "Show Later Events" links in toolbar is invisible in Safari
   26731: ALF-8095 - Error shown after clicking the accept or reject link in a site invitation email
   26733: Merged V3.4 to V3.4-TEAM
      26530: Fixes ALF-7949: Remove service script on uninstall
      26610: Fix for: ALF-8007: Lucene index not coherent or not up to date or we can not rely on it to check that a working copy exist.
   26734: Merged V3.4 to V3.4-TEAM (RECORD ONLY)
      25971: ALF-7441: Help URLs pointing to new doc system (1 of 2)
      25972: ALF-7441: Help URLs pointing to new doc system (2 of 2)
      25980: Merged V3.4-BUG-FIX to V3.4
         25978: ALF-7394 - Alfresco Network dashlet, now Alfresco Support information
      26056: Merged V3.4-TEAM to V3.4
         26053: Added in loop to wait for asynchronous post-failure auditing (ALF-3055)
      26100: Merged V3.4-TEAM to V3.4
         25985: Another cycle of fixing installer from Win builds.  Still waiting for official fix from Bitrock.
         26067: Fixes for installer builds on Windows
      26127: Merged V3.4-TEAM to V3.4
         26120: Fix postgres.bki on Win builds
      26165: Merged V3.4-TEAM to V3.4
         26161: Fix full installer.
   26737: Google Docs: Added better handling of unsupported mimetypes
   
     * Meaningful exception raised when mimetype unsupported by GDoc (rather then non-specific error from google)
     * Message not reflected in UI, but log contains details of failure
   
   26738: Clarified browser relevance for "in-memory-limit" config parameter following ALF-8093 being raised.
   26740: Quick build fix following Google Docs updates in r26737
   26741: Build Fix
     * Added missed exception class
     * backout previous fixes
   
   26746: Fixed ALF-8080 "WebM playback not working for Team and Chrome"
   26750: Prettifying the delete url for comments to avoid two ampersands following each other, i.e: "&&". This is NOT a fix for deleting content with "%" in the name.
   26753: Fixed ALF-7807 "It's possible to rename component with spaces"
   26756: ALF-8102 - Edit Properties, Edit tags, Manage permissions, Start workfow icons are not visible - IE 7 specific
   26758: ALF-8106 - "Go Back" button doesn't work on the "User Profile" page
   26763: Fixes: ALF-7815 - Added .ics extension and site name to downloaded file.
   26779: Merged V3.4 to V3.4-TEAM
     26760 : Enterprise unlimited licenses get invalidated turning the system into read-only mode
   26782: Fixed ALF-7001 "Customize site drag and drop - page item is added to end of list if quickly dragged and dropped"
   26784: Minor height adjustment to "My Documents" dashlet on first use
   26786: Correction to merge 26779


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@26795 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-04-11 19:26:26 +00:00