Commit Graph

50 Commits

Author SHA1 Message Date
Derek Hulley
1a6fde33ca Attempt to work around some of the issues associated with ALF-19155 (MT deleteTenant does not work)
- Currently MT's deleteTenant should be regarded as incomplete and avoided


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


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


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@48255 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-03-18 09:52:08 +00:00
Jan Vonka
da8bdafbcc Merged BRANCHES/DEV/CONV_HEAD to HEAD:
47880: Create branch for Cloud Convergence from the latest state of HEAD (Revision 47874)
   47886: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        33052: (RECORD ONLY) Branch for Enterprise 4.0 service pack development
        38002: (RECORD ONLY) Create branch for 4.1 Enterprise releases, based on 4.0.2
        38003: (RECORD ONLY) Update version to 4.1.0
        38079: (RECORD ONLY) Updated schema version to 5100
        38536: (RECORD ONLY) Merged V4.1-BUG-FIX to V4.1
             38219: ALF-14674: DOS voodoo to make start_deployment.bat work, as installed by Bitrock
             38344: ALF-14674: Deployment installer still doesn't work
             - Use ${installdir.escape_backslashes} instead of ${installdir}
             38471: ALF-14674: Deployment installer still doesn't work
             - Correction to use of ${installdir.escape_backslashes}
        39519: (RECORD ONLY) Merged PATCHES/V4.0.2 to V4.1
             38899: ALF-15005: Merged V4.0-BUG-FIX to PATCHES/V4.0.2
                37920: ALF-13816: Permission Denied on web-client browsing if parent does not inherit permissions
                   - FileFolderService getNamePath() now performs toFileInfo() as SystemUser.
             38900: ALF-15005: Merged V4.1-BUG-FIX to PATCHES/V4.0.2
                38549: ALF-11861: Maintain the same defuault root of WebDav for Alfresco 4.0 as was in pre-4.0
                   Removed overriding protocols.rootPath property from installer and enterprise overlay versions of alfresco-global.properties so that correct setting in repository.properties is used.
             39494: ALF-15213 / ALF-15170: Can't change folder permissions in Private or Public-moderated sites
                - Fix by Dmitry V
        44843: (RECORD ONLY) Created hotfix branch off V4.1 build 372 revision 44743 (candidate 4.1.2 release)
        45708: (RECORD ONLY) Merged PATCHES/V4.1.2 to PATCHES/V4.1.3
             45570: Merged V3.4-BUG-FIX to PATCHES/V4.1.2
                43939: ALF-17197 / ALF-16917: Merged PATCHES/V3.4.11 to V3.4-BUG-FIX
                   43896: MNT-198: Activity feeds get not generated in private sites for added files if username in LDAP-AD contains uppercase letters
                   - Now we can cope with a runAs where the username is in the wrong case
        45714: (RECORD ONLY) Merged BRANCHES/DEV/V4.1-BUG-FIX to PATCHES/DEV/V4.1.3
              45513: MNT-279: Use binary search in cached authority search to cut down search time when a group contains an astronomical number of authorities
              - Experimental fix to cut down on severe profiling hit
        45715: (RECORD ONLY) Merged BRANCHES/DEV/V4.1-BUG-FIX to PATCHES/V4.1.3
              44848: Fix for     ALF-17178 SolrLuceneAnalyser.findAnalyser generating InavlidQNameExceptions wher they are easily protected.
        46188: (RECORD ONLY) Merged BRANCHES/DEV/V4.1-BUG-FIX to PATCHES/V4.1.3
             46014: Fix for ALF-17732 - SWF files are considered insecure content and should not be displayed directly in the browser.
             46160: Fix for ALF-17759 - HTML files are stripped from metadata and style information after they are uploaded.
             46165: Fix for ALF-17787 - Site Members 'All Members' link should not run query immediately
             46169: Fix for ALF-17787 - Site Members 'All Members' link should not run query immediately - missing file
             46186: Fix for ALF-17786 - Site dashboard page issues too many requests (Site Members dashlet issues avatar requests when it doesn't need too)
        46242: (RECORD ONLY) Merged BRANCHES/DEV/V4.1-BUG-FIX to PATCHES/V4.1.3:
             46184: Refactoring a test class to use JUnit Rules - as part of attempt to reproduce ALF-17797.
             46192: Enhancement to JUnit Rule TemporaryNodes.java as required by fix for ALF-17797.
             46194: Fix for ALF-17797. AddFailedThumbnailActionExecuter is failing.
        46710: (RECORD ONLY) Create branch for Cloud Convergence from the latest state of 4.1.3 (RC5, Build 85, Revision 46648)
   47908: Merged from DEV/CONV_V143 to DEV/CONV_HEAD
        46788: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              30323: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1:
                 30171: ALF-9613: caching content store. Various improvements and bug fixes. Including:
              30325: THOR-114: S3 content store
              30326: THOR-128: S3 content store
              30333: THOR-139 F101: Get account for user e-mail id
              30335: Merge from THOR0 to THOR1
                 r30274: THOR-135 is email address accepted by Alfresco? Part One.  
              30340: THOR-99: Thor module - enable tests
              30341: Removing duplicate account-service-context.xml file.
              30343: Merge THOR0 to THOR1
                 30339: Test email singup in Share complete
                    30338: New form runtime features:
                       - Yellow background is displayed for mandatory fields without value
                       - Red background dis displayed for fields with validation errors
                       - Error message is displayed in a balloon when fields with error has focus
                       - Using balloons is now the default method of displaying errors
                       - Removed balloon code form create site menu since its now handled automatically
                       - An alternative to balloons are "error containers" (div with clickable red text labels focusing the field): setErrorContainer(divEl)
                       - Its possible to setMultipleErrors(true) to display all the forms/fields errors in the "error container"/ballon.
                       - Its possible to turn of the balloons and error containers complete by setting setErrorContainer(null)
                       - js validation handlers no longer needs to handle the messages OR the css classes for mandatory & invalid
              30344: Missing value check caused js undefined error
              30346: Minor css form fixes
              30347: THOR-126: S3 content store - do not swallow exceptions
              30348: THOR-66: disable unused services/features
              30349: THOR-137 F88: Add existing external user (from another network) checkpoint
              30350: THOR-135 Is email address accepted by Alfresco.
        46789: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35594: Fix merge issue
   47930: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        46762: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46768: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46769: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46778: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46780: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46786: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46791: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46792: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46808: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46809: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46819: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46829: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46839: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46842: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46844: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46846: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46847: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46876: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46877: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46878: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46879: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46880: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46881: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
   47947: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        46737: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             35288: Alfresco Cloud (from BRANCHES/V4.0)
             35389: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  30170: Thor branch based on Swift feature complete
                  30185: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1:
                       28973: THOR-1: verify ability to create DB schema programatically on AWS RDS (for MySQL & Oracle)
                       28999: THOR-3: Tenant Routing Data Source (dynamic tenant-aware DB connection pools)
                       29022: THOR-1: verify ability to create DB schema programatically on AWS RDS (for MySQL & Oracle)
                       29031: THOR-1: verify ability to create DB schema programatically on AWS RDS (for MySQL & Oracle)
                  30186: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: (3 conflicts resolved)
                       29116: THOR-3: Tenant Routing Data Source (dynamic tenant-aware DB connection pools)
                       29174: THOR-24 Set up new Alfresco AMP module project.
                       29186: THOR-25 Copy and refactor Account Service from SambaJAM
                       29193: ImporterComponent - prep for THOR-7
                       29198: THOR-7:  Tenant Service API - Create Tenant (using separate DB schema)
                       29204: THOR-29 Account Type Registry
                       29234: THOR-7:  Tenant Service API - Create Tenant (using separate DB schema)
                       29246: THOR-7:  Tenant Service API - Create Tenant (using separate DB schema)
                       29251: THOR-30 Added AccountDAO interface along with two implementations:
                           AccountDAOImpl (not implemented) which will manage Account data in an RDB via iBatis.
                           AccountDAO_InMemory which manages AccountInfo in simple HashMaps for testing purposes only.
                       29258: THOR-28
                       29259: Addendum to THOR-25. Moved account-service spring config into a subfolder. (trivial)
             35393: (RECORD ONLY) Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                   - fix up classpath (remove mybatis 1.0.0 -> 1.0.1 and chemistry 0.4.0 -> 0.6.0)
             35411: (RECORD ONLY) Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/CLOUD1:
                  35409: Merged HEAD to BRANCHES/DEV/V4.0-BUG-FIX:
                       35399: ALF-12874: Schema reference files are out of date.
             35452: (RECORD ONLY) Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/CLOUD1:
                   34219: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/V4.0-BUG-FIX:
                       32096: THOR-429: Fix "MT: Thumbnail + Preview are not updated (after uploading new version)"
                       32125: THOR-429: Fix "MT: Thumbnail + Preview are not updated (after uploading new version)"
                   34220: Minor: follow-on to r34219 (ALF-11563)
                   34747: ALF-13262: adding missing indexes for new schema's (activiti-schema create) + schema patch for existing schema
                   35417: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/V4.0-BUG-FIX: (THOR-6 / ALF-13755)
                       29356: THOR-6: MT is configured (but not enabled) by default - will be auto-enabled when first tenant is created
                       29455: THOR-6: build test/fix
                       29471: THOR-6: build test/fix
                   35423: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/V4.0-BUG-FIX: (THOR-4 / ALF-13756)
                       29500: THOR-4: Replace Tenant attributes with Tenant table (alf_tenant)
                       29501: THOR-4: Replace Tenant attributes with Tenant table (alf_tenant)
                       29503: THOR-4: Replace Tenant attributes with Tenant table (alf_tenant)
   47949: Merged HEAD to BRANCHES/DEV/CONV_HEAD:
        47914: Merge fix for org.alfresco.repo.cache.AbstractAsynchronouslyRefreshedCache<T> R 46078, 46079, 46121
   47958: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        46746: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             35455: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  30187: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1:
                       29260: THOR: Initial Tenant Admin Service REST API - create, delete, get (list) web scripts
                       29356: THOR-6: MT is configured by default
                       29366: THOR-59: selectively disable certain test suites (for THOR dev build plan)
                       29377: THOR-59: selectively disable certain test suites (for THOR dev build plan)
                       29398: Refactoring of code to remove deprecation warnings. Replaced lots of object.field accesses with object.getField() calls.Trivial changes, but with so many warnings I can't see the wood for the trees.
                       29400: THOR-59: selectively disable certain test suites (for THOR dev build plan)
             35456: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  30188: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: 
                       29442: THOR-59: selectively disable certain test suites (for THOR dev build plan)
                       29453: THOR-59: selectively disable certain test suites (for THOR dev build plan)
                       29455: THOR-76: track THOR build test failures and fix-up
                       29471: THOR-76: track THOR build test failures and fix-up
             35459: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  30189: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1:
                       29473: Preliminary checkin for THOR-44. Created placeholder interface/impl/spring config for a new UserService.
                       29497: THOR-76: track THOR build test failures and fix-up ( LicenseComponentTest)
                       29500: THOR-4: Replace Tenant attributes with Tenant table (alf_tenant)
                       29501: THOR-4: Replace Tenant attributes with Tenant table (alf_tenant)
                       29503: THOR-4: Replace Tenant attributes with Tenant table (alf_tenant)
                       29511: THOR-59: selectively disable certain test suites (for THOR dev build plan)
                       29512: Adding a new JUnit4 test class with an @Ignore'd test in it - to see how Bamboo reports these.
                       29514: THOR: Initial Tenant Admin Service REST API - create, delete, list web scripts
                       29515: THOR-59: selectively disable certain test suites (for THOR dev build plan)
                       29521: THOR-79 - mark AVM sitestore as unindexed
             35461: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  30190: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1:
                       29533: THOR-59: exclude certain N/A tests
                       29555: THOR-76: track THOR build test failures
                       29630: Added ant build targets for Cloud Module and a new executable for the Alfresco devenv.
                       29664: THOR-76: exclude system test suites
                       29667: THOR-64: add initial support for tenant routing data source
                       29676: THOR-76: exclude intermittent ActionTrackingServiceImplTest (pending ALF-9773 & ALF-9774)
                       29677: THOR-80: MT-aware S3 content store
                       29678: THOR-80: MT-aware S3 content store
                       29680: THOR-80: MT-aware S3 content store
                       29693: THOR-80: MT-aware S3 content store
                       29694: THOR-80: MT-aware S3 content store
   47959: CONV_HEAD: CLOUD-1348 - comment back in MultiTDemoTest.testDeleteAllTenants
   47967: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        46748: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             35464: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  30195: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1:
                       29774: Refactor Account DAO and Service. Boost Tests. Add appropriate headers.
                       29776: THOR-76: exclude intermittent ActionTrackingServiceImplTest (pending ALF-9773 & ALF-9774)
                       29795: Implemented MyBatis-backed Account DAO:
                       29817: Move (and rename) user service from repository to thor
                  30196: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1:
                       29827: THOR-69: TenantAdminDAO
                       29832: THOR-78: fix tenantEntityCache (shared)
                       29834: THOR-111: experimental config option for S3 content store to support flat root (ie. all tenant files in single folder)
                       29856: THOR updates
                       29857: THOR-76: exclude build components/projects
        46761: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             35478: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  30198: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1:
                       29869: THOR-92. BPMN2.0 workflow definition for account self-signup.
                       29871: THOR-93. REST API for self signup (and miscellaneous related items).
                       29882: THOR-102: Faster CreateTenant
                       29888: THOR-95. Placeholder email template for self-signup.
                       29889: Completion of THOR-95. Placeholder emails for self-signup.
                            Added a 'you've already registered' template.
                       29896: THOR-89F100: Create User Foundation API…
                       29912: Fix issue where module believed it was still executed after delete tenant
                       29940: THOR-96. First cut of a signup email sender delegate. This will be refined later - probably both in this sprint and the next.
                       29966: Fixing InvitationServiceImplTest failing tests, which are failing because the email templates are not there.
                       29978: THOR-89: Switch tenant for person creation
                       29982: THOR-89: Fix multi-domain account creation test after review with Jan
                       29983: THOR-102: Faster CreateTenant
                       29985: THOR-90: F99 Is email address already registred foundation API
                       29991: THOR-99: Thor module build/packaging
                       29994: Changes for THOR-92, THOR-93 and THOR-96.
                  30199: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1:
                       29995: THOR-93. Use the proper sspring config in the test case.
                       29996: THOR-99: Thor module build/packaging
                       29997: Consolidated DaveC's EmailAddressService and my EMailUtil into a single feature.
                       29998: Follow-on to previous check-in (29997). Deletion of now-unused folder.
                       30000: Blatant attempt to get svn r=30k. Removing some dead config.
                       30001: THOR-96. Ensure that we get a meaningful exception when attempting to activate an account with no pending workflow for that email.
                       30036: Resolve issues with tenant-independent user store - can now login via Share
                       30041: Package and auto deploy of license with Thor module
                       30048: Ensure that when a duplicate email prevents a workflow from creating an account, that the workflow still ends gracefully.
                       30049: Removing a dead class that I'd used to see how our Bamboo handles @Ignore(message=msg) @Test annotations.
                       30054: THOR-84 F82: List Accounts Foundation API
                       30067: THOR-87 List Accounts REST API.
                       30069: THOR-87. Completion of listAccounts REST API.
                           Fixed the problems in the JUnit test case and tweaked the FTL slightly.
                       30071: Cosmetic changes as part of THOR-93.
                       30072: Oops. Broke a test case. Follow-on to previous (30071) check-in which cosmetically changed JSON as part of THOR-93.
                       30073: As part of THOR-93 (REST API signup) I have made the 2 webscripts usable without any authentication.
                       30074: Trivial fix to an error string.
                       30076: THOR-93. The account-activation.post webscript now includes the provided workflowInstanceId when identifying the ongoing workflow. 
                       30077: Fix Email validator to allow for example domains
                   30202: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1:
                       30140: Refactor of account signup workflow
                       30142: No longer require email address for activation step of sign-up
                       30143: Remove use of task query in account signup workflow
                       30146: thor-share project structure
                       30147: Buildfix (removed modules not used by THOR)
                       30151: Incorporate already registered use case into account signup workflow
                       30152: Finally resolve license loading in Eclipse based tests
                   30203: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1:
                       30184: Build box fix as a result of not including certian components
                   30206: Fix blatant merge issues
   47972: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        46766: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             35497: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/CLOUD1:
                  29723: THOR-31: MT-aware shared caches
                  29749: THOR-5: MT-aware immutable singletons
                  29762: THOR-31: MT-aware shared cache
        46767: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             35507: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  30237: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1:
                       29532: THOR-79 - add ability to disable Lucene indexes (so that IndexInfo / IndexInfoBackup files are not created per store per tenant)
                       29723: THOR-31: MT-aware shared caches
                       29749: THOR-5: MT-aware immutable singletons
                       29762: THOR-31: MT-aware shared cache
   47973: CONV_HEAD: CLOUD-1348 - comment back in MultiTDemoTest tests (testNonSharedGroupDeletion & testSharedGroupDeletion)
   47975: CONV_HEAD: CLOUD-1348 - comment back in FeedNotifierTest.testFailedNotifications
   47988: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        46775: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             35531: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                   30449: F66: add option to configure a common "contentRootContainerPath"
                   30564: THOR-156: prep - consolidate runAsSystemTenant/runAsPrimaryTenant
             35532: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  30777: THOR-201: temporarily comment-out MultiTDemoTest.testDeleteArchiveAndRestoreContent (pending fix for THOR-201)
   48008: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        46844: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46895: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46903: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46907: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46922: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46974: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46991: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46992: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46994: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47107: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47265: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47267: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47272: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47277: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47284: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47286: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47289: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47292: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
   48009: Merged DEV/CONV_V413 to DEV/CONV_HEAD
        46801: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35602: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              30513: Cloud Share module
              30515: Fix issue with person replication between tenants.
              30516: Slight mod to email validation web script response.
              30518: Quick fix for workflow id generation in sign email
              30534: THOR-163: Unable to get license file
              30535: Fix Thor build process.
              30536: Refine user's home site name and description
              30539: THOR-96. When sending the signup email, execute the mail action asynchronously.
              30542: Replace placeholder text in sign-up email
              30543: Account Activation
        46802: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35643: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              30544: Account activation
              30545: Account activation
              30550: AMP build targets
              30554: THOR-94. Cloud site invitation workflow.
              30555: AMP build targets - added client side resources
   48011: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        47056: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47087: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47228: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47271: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47297: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47299: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47300: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47301: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47304: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47328: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47330: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        47339: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
   48013: Merged DEV/CONV_V413 to DEV/CONV_HEAD (commiting the missing merge info for r48009)
        46801: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35602: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              30513: Cloud Share module
              30515: Fix issue with person replication between tenants.
              30516: Slight mod to email validation web script response.
              30518: Quick fix for workflow id generation in sign email
              30534: THOR-163: Unable to get license file
              30535: Fix Thor build process.
              30536: Refine user's home site name and description
              30539: THOR-96. When sending the signup email, execute the mail action asynchronously.
              30542: Replace placeholder text in sign-up email
              30543: Account Activation
        46802: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35643: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              30544: Account activation
              30545: Account activation
              30550: AMP build targets
              30554: THOR-94. Cloud site invitation workflow.
              30555: AMP build targets - added client side resources
   48015: Merged DEV/CONV_V413 to DEV/CONV_HEAD
        46841: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35684: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              30904: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1:
                 30270  ALF-9492 Can now update task properties through the Workflow JavaScript API. ALF-10087 Fixed failing Multi-tenancy tests.
                 30288  ALF-9492 Can now update task properties through the Workflow JavaScript API.
                 30309  Fixed failing MultiTDemoTest and re-enabled.
                 30356  ALF-10117: JBPM workflows should be hidden.
                 30358  Build fix, fallout from ALF-10117 (JBPM workflows should be hidden)
                 30415  Added parseRootElement() method to Activiti's BPMNParseListener.
                 30452  ALF-10276: Reject flow didn't set bpm_assignee property properly
                 30563  Added tests to ensure multi-tenancy works and fixed several multi-tenancy issues in workflow.
                 30698  ALF-9541: Fixed HistoricTaskEntity update when TaskEntity is loaded from DB
                 30699  ALF-10084, ALF-10242. Fixed issues and added WorkflowService methods to get workflow instances without filtering by definition id.
                 30750  ALF-10197, Added the ability to auto-complete Start Tasks in Activiti. If a start task extends the bpm:activitiStartTask type or implements the bpm:endAutomatically aspect then the task will be ended as soon as the workflow instance is started.
                 30796  ALF-10374 Fixed failing MultiTDemoTest
              30908: Add logging for failed email domain lookups:
              30922: Rolling back .classpath changes to Data Model.
              30930: Basic version of site invite working
              30931: THOR-172: Switch Tenant via public API
              30936: Allow for repo web scripts to switch to user's default tenant via -default- tenant id:
              30937: Implementation of THOR-214. There is now a new repo webscript to retrieve signup status for a given {id, key} pair.
              30938: Allow dev email address to be specified in properties file:
              30945: THOR-221: Add (EntityLookup) cache to AccountDAO
              30946: Build fix. Renaming a test infrastructure class so that it doesn't get picked up by the ant test targets.
              30955: THOR-222. Added inviter first and last name to invitation-status.get webscript.
        46843: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35694: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              30997: Firefox scrollbars removed on "invitation" and "signup" pages (now using new helper method Alfresco.util.createYUIOverlay)
              31001: Impl of THOR-223. Webscripts for getting pending invitations.
              31002: Invite - redirect bug fixed, removed old code matching previous webscript api, email picker style fixes
              31003: Addendum for THOR-223. I've added an explicit test to record the fact that pending-invitations.get to a non-existent site returns 200 and an empty collection rather than a 404.
              31004: Adding REST-client .rcq files as part of THOR-223
        46848: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35700: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              31014: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1:
                   30999: ALF-9957 - MT: test and fix subscriptions (followers)
              31020: Update invite email template to bring in line with wireframe and text
              31021: Apply latest sanitized email blacklist:
              31030: Fixed THOR-226 "DocLib "Detailed View" (default) does not list items - note: "Simple View" seems to be OK"
              31033: THOR-228: Update aws sample file with quota config for cachingcontentstore
              31036: Fixed THOR-236 "Webscript URL clash in signup"
              31037: THOR-175: set and enforce per-tenant quota
              31043: Fixed THOR-174 "F27: User can switch between networks they belong to"   
        46854: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413
           35725: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              31124: Fix for THOR-145. This check-in makes the Cloud Signup and Invitation workflows hidden within Share - users can't initiate them via "Start workflow..."
   48016: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        46793: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46795: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46796: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
   48030: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        46820: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             35657: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  30556: THOR-135F103: Is e-mail address accepted by Alfresco?
                  30562: Fixing a typo in the email-validation FTL. It was returning invalid JSON - no opening " on a string.
                  30569: THOR-156: switch to secondary tenant (initially via @@login)
                  30571: THOR-99: Thor build
   48037: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD:
        46821: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
             35659: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  30586: THOR-166. I've added an additional check at the start of the signup workflow that checks if the email is blocked.
                  30587: THOR-163: S3ContentReader fails to getObjectDetails
                  30592: THOR-156: switch to secondary tenant (initially via @@login)
             35660: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
                  30607: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1:
                       30208: Remaining commits for ALF-9510
                       30218: Fix build - add missing files
                       30254: Encryption related documentation, source code comments
                       30392: Fix for ALF-10205
                       30405: Fix for ALF-10189
                       30406: Fix for ALF-10189: part 2 - minor update
                  30613: THOR-148. The cloud test target was accidentally excluding *RestTest.java.
                  30613: THOR-148. The cloud test target was accidentally excluding *RestTest.java.
                  30614: Revert some of the additional email checks in registration process
                  30615: Set ignore patterns for build dir in thor module
                  30619: Merged HEAD to BRANCHES/DEV/THOR1:
                       30618: Additional test classes that allow for easier testing of Notifications (emails mostly).
                  30622: Ensure use of System user, not system user
                  30624: Removed deep merge info
                  30625: Switch off creation of missing people, use Admin instead of System
        46824: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
        46828: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
   48038: Merged DEV/CONV_V413 to DEV/CONV_HEAD (ui-only)
        46830: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
           Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
           30737: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1:
                30736: ALF-6706 - MT: activities not generated (for tenants)
           30738: Site invite (rough version, not finished)
           30741: THOR-175: Set and enforce file space quota for tenant
           30752: Site invite - added som padding to user suggestion list
           30753: Disabling 2 tests while I fix them.
           30758: THOR-172 F63: Switch Tenant via public REST API:
           30764: Tweak to Activiti integration code to prevent it from trying to create person nodes for the System user.
           30766: Implementation of THOR-196. Inviting multiple email addresses in a single call.
           30769: Re-enable MultiTDemoTest 
           30775: Site invite 
           30776: THOR-172: Switch Tenant via public API
           30785: Add tenant id to account info returned in Thor responses
   48043: Merged DEV/CONV_V413 to DEV/CONV_HEAD
        46831: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
           Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1:
              30813: Add Eclipse project for Thor-Share module:
              30815: THOR-175: Set and enforce file space quota for tenant
              30817: Switch network skeleton code and minor fixes
              30818: Update Share Node Browser (at least for THOR) to allow option to retrieve "storeroot" via DB query
              30826: Add distribute-solr to Thor builds
   48045: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413:
       Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 
           30737: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1: 
           30736: ALF-6706 - MT: activities not generated (for tenants) 
           30738: Site invite (rough version, not finished) 
           30741: THOR-175: Set and enforce file space quota for tenant 
           30752: Site invite - added som padding to user suggestion list 
           30753: Disabling 2 tests while I fix them. 
           30758: THOR-172 F63: Switch Tenant via public REST API: 
           30764: Tweak to Activiti integration code to prevent it from trying to create person nodes for the System user. 
           30766: Implementation of THOR-196. Inviting multiple email addresses in a single call. 
           30769: Re-enable MultiTDemoTest 
           30775: Site invite 
           30776: THOR-172: Switch Tenant via public API 
           30785: Add tenant id to account info returned in Thor responses 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@48251 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-03-18 09:23:29 +00:00
Dave Ward
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
Jan Vonka
363a129f60 Merged BRANCHES/DEV/CONV_V413 to HEAD:
47044: CLOUD-1349: Fix MultiTDemoTest.testDeleteArchiveAndRestoreContent


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@47045 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-02-25 12:22:24 +00:00
Jan Vonka
dc60a53187 More merge/test fallout ...
- some of it build specific - possibly due to test inter-dependencies ?
- comment-out broken unit tests for now and re-open CLOUD-1348 to ensure that these get revisited and fixed

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@46623 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-02-14 12:13:40 +00:00
Jan Vonka
a20e3a2134 Follow-on to r46551
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@46552 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-02-13 09:44:48 +00:00
Jan Vonka
1616d63a25 Merged BRANCHES/DEV/THOR1 to HEAD:
=> CLOUD-1347 / CLOUD-1348 
   30569: THOR-156
   30776: THOR-172


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@46551 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-02-13 09:42:13 +00:00
Samuel Langlois
cd4983f8fa JDK7: re-enable disabled test methods, and make sure JUnit executes them in the order of the source file
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@42061 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-09-26 17:30:57 +00:00
Kevin Roast
dbd9d842a6 Disabled the following test methods as they depend on existing method state/ordering until issues are fixed:
testCreateUsers
testLoginTenantUsers
testCreateCategories

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@42024 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-09-26 10:29:13 +00:00
Jan Vonka
2a30f9b22f Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD:
41642: MT: fix unit test/build (ALF-12732)


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


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@41620 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-09-14 15:44:23 +00:00
Jan Vonka
6ec5fe4f27 Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD:
41591: MT: ALF-12732 - fix move between two sites (via Share -> ScriptSiteService)


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


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@41543 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-09-12 19:10:54 +00:00
Dave Ward
2e826e9e26 Merged V4.0-BUG-FIX to HEAD
35394: ALF-13394: Allow administrators to gain SiteManager role
   35407: ALF-12740: Updated XHR request processing for IE to ensure no caching (had previously thought IE9 was not affected but apparently it is)
   35408: Fix for ALF-13286 who_can_create_site mention and bad error message
   - explicitly declare public interface on SiteService
   35412: Merged DEV to V4.0-BUG-FIX
      35153: ALF-1834: Renaming folders breaks web form content
             Original solution by Ivan has been reimplemented as per Derek's requirements and against 4.0. 
             [DH: Did some minor legibility changes and fixed LF for AVMDiskDriver]
   35414: Incremented version.revision for 4.0.2
   35417: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/V4.0-BUG-FIX: (THOR-6 / ALF-13755)
      29356: THOR-6: MT is configured (but not enabled) by default - will be auto-enabled when first tenant is created
      29455: THOR-6: build test/fix
      29471: THOR-6: build test/fix
   35423: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/V4.0-BUG-FIX: (THOR-4 / ALF-13756)
      29500: THOR-4: Replace Tenant attributes with Tenant table (alf_tenant)
      29501: THOR-4: Replace Tenant attributes with Tenant table (alf_tenant)
      29503: THOR-4: Replace Tenant attributes with Tenant table (alf_tenant)
      TODO: ALF-13757 - patch to migrate Tenant attributes to Tenant table (for existing customers)
   35431: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
      35367: ALF-13382: WorkflowService Returning Incorrect Values When Using Native jBPM API to set Local Task Variables
      - Fix by Alex Bykov
      35400: Fix for ALF-13557 - Share forms selectmany.ftl template does not work with Share search query parser; should do a logical OR or AND but does a concatenation
      35416: Incremented version.revision for 3.4.10
      35429: Merged V4.0-BUG-FIX to V3.4-BUG-FIX (partial)
         35328: ALF-13409: Avoid concurrency issues in unit test tear downs by deleting users before sites. User deletion deletes invitations synchronously. Site deletion deletes invitations concurrently to avoid UI timeouts. The potential to access invitations that are being concurrently deleted still exists, but always did!
      35430: ALF-13409: Avoid concurrency issues in unit test tear downs by deleting users before sites - another instance.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@35434 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-04-19 15:43:03 +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
N Smith
f4830cff15 ALF-10374 Fixed failing MultiTDemoTest.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30796 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-09-27 11:43:52 +00:00
Gavin Cornwell
4ca838b761 Build fixes:
- ALF-10374: Test disabled: MultiTDemoTest.testCustomModels
- Removed unused abstract base class that didn't follow naming conventions so got picked up as a test to run

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30593 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-09-19 09:59:44 +00:00
N Smith
6d46ef90ec Added tests to ensure multi-tenancy works and fixed several multi-tenancy issues in workflow.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30563 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-09-16 09:34:02 +00:00
Jan Vonka
ba4fb00961 ALF-8805 (RINF 40) - PersonService getPeople
- return PagingResults<PersonInfo> (follow CQ results pattern)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28627 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-06-27 16:30:53 +00:00
Derek Hulley
f2eab4d8d9 Merged DEV/SWIFT to HEAD
28029: Added more tests for PublishingEventHelper and PublishingQueueImpl. Also added WebPublishingTestSuite.
   28034: Support for ALF-8792: RSOLR 036: SOLR APIs to support index integrity checking
          - ACL and ACLTX support
   28036: WCM QS ML UI tweaks for marking something as the initial translation
   28038: ALF-8548: WPUB: F165: Foundation API: Cancel a scheduled publishing event
          - Code and initial test cases
   28051: Fix for ALF-8836: No permission checks for SolrJSONResultSet
   28057: WCM QS ML support for claiming intermediate non-translated folders when translating documents, with tests
   28058: ML-WQS: Slight refactoring to remove RootNavInterceptor.
          This functionality has been brought into the ApplicationDataInterceptor.
		  The effective root section is now made available to templates and components in the model.
   28059: ALF-8499. SVC 10: Action Forms.
          This checkin adds an ActionFormProcessor which supports the generation and persistence of Forms based on
          Alfresco spring-injected action beans. The form processor produces a form field for each defined action parameter
          as well as the ubiquitous executeAsynchronously boolean for action execution.
          There is no styling of configuration of these forms and therefore NodeRef parameters will allow selection of any
		  cm:cmobject nodes and action constraints like ac-aspects will return every aspect defined in the system.
          To expose these forms in the product, we would need to add form configuration for the built-in actions in order to manage and control such data.
   28064: Fix for ALF-8857: Fix SOLR query caching to respect locale for ordering
   28067: ALF-8846 : Intermittent: DMDeploymentTargetTest
          added more debug logging and throw an explicit exception on trying to create a duplicate directory.
   28068: Publishing: Tidy-up (javadoc and removal of a few unnecessary operations) prior to sprint 1 demo.
   28069: Implemented EnvironmentImpl.checkStatus() method. Also created an AbstractWebPublishingIntegrationTest
          and extended many of the web publishing tests from htis class.
   28076: Publishing: More javadoc
   28078: RINF 11: Canned queries
          - minor: rename CannedQuery "query" to "queryAndFilter" and update/fix related JavaDoc (ALF-8827)
          - update PagingRequest - precursor to merge with (Script) PagingDetails (ALF-8855)
   28079: RINF 40: Lucene Removal: PersonService API (ALF-8805) - W.I.P.
          - add GetChildren CQ support for (initially string) property filtering, including unit tests
          - update GetChildren CQ to allow up to three filter and/or sort props
          - add GetChildren CQ unit test for existing DB-based filtering of child types
          - fix GetChildren CQ sorting, for spoofed referenceable props (including missing name)
   28083: Fix for ALF-8858: Fix cache bugs (TX and ACLTX docs not tracked)
   28097: Fix hard-coded checks for aspect counts following sys:localized changes
   28126: Build/test fix (GetChildrenCannedQueryTest.testPropertyStringFiltering)
   28147: RINF 40: Lucene Removal: PersonService API
          - initial impl w/ unit tests
          - note: separate task required to update JavaScript API (People.getPeople)
   28157: RINF 40: Lucene Removal: PersonService API (ALF-8805)
          - fix People.getPeople - put back FTS option (pending ALF-8924)
   28162: Added PublishWebContentJbpmTest to test the Jbpm publish web content process definiion.
   28178: Build fix. Removing a trailing comma that my ant build objects to.
   28180: Preventing a NPE within TikaCharsetFinder. Was observed as part of tests for ALF-3757.
   28182: RSOLR 037: Integrate CMIS Dictionary into SOLR engine
   28183: ALF-8846 - fix DMDeploymentTarget(Test)
          - make system auth explicit
          - minor: fixup debug logging
   28187: Fix for ALF-7308. The imgpreview thumbnail ... scale up small images...
          I've exposed an ImageMagick configuration option ('>') as a new ImageRenderingEngine parameter, "allowEnlargement".
          It's not mandatory, defaults to true, and is set to false for doclib and imgpreview thumbnails.
          The net result is that doclib and imgpreview thumbnails of small graphics files (e.g. icons) will never have sizes exceeding their original size.
   28191: RINF 09: Update FileFolderService (ALF-7168)
          - minor: clean-up debug/trace logging
   28192: Fix MT for GetChildren CQ
          - FileFolderService -> list (ALF-7168)
          - PersonService -> getPeople (ALF-8805)
   28194: RINF 09: CMIS getChildren sorting fixes (part of ALF-7168)
          - fix sorting by cmis:contentStreamMimeType and/or cmis:contentStreamLength
          - add warning + debug (if some orderBy sort props need to be ignored - eg. too many or unknown)
          - reviewed w/ Florian
   28195: ALF-8910: RSOLR 037: Integrate CMIS Query Parser into SOLR engine
   28211: Changes for ALF-8646: "RINF 38: Text data encryption"
   28227: Changes for ALF-8646: "RINF 38: Text data encryption"
          o fix build issue relating to missing property definition
   28232: ALF-8928 - Performance degradation when loading documents from RepoStore
   28233: Attempt to resolve OOM hangs in SWIFT builds
          - Set mem.size.max=2048m
   28234: Implementation of ALF-8986. Add support for transformation of Apple iWorks files.
             A new transformer transforms (pages, numbers, keynote) iWorks 09 files to image or SWF for doclib & webpreview thumbnailing.
             This transformer extracts an embedded JPEG or PDF file from a well-known location within the iWorks zip structure & uses that
			 to create Alfresco thumbnails. If these zip entries are not present for whatever reason, then the transformation fails in the usual way.
             All of our iWorks 09 test files have an embedded JPEG and more than half have embedded PDFs.
   28243: Init/refresh repo webscripts in single txn
          - found whilst investigating ALF-8928
   28268: Started implementing PublishEventAction. Also updated mapping of nodes from source to live environment to use associations.
   28308: PublishEventAction now supports updating of nodes that have already been published.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28321 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-06-10 00:21:55 +00:00
Derek Hulley
25632c2a96 Merged DEV/SWIFT to HEAD
25960: RepoBM: improve configurability
          - add option to configure base folder path
          - enable params (base urls, threads, base folder path, ...) to be configured via ant build.properties
   25961: Merged BRANCHES/DEV/BM to BRANCHES/DEV/SWIFT:
      24568: WebDAV - use fileInfo props (instead of nodeRef + getProp(s)) - resolve conflict
      24727: SPP/WebDAV - compile fix (follow-on to r24568)
      24855: BM - WebDAV - fix litmus -> locks -> 7. discover FAIL (fallout from r24568)
             + ran litmus 0.12.1
   25963: Merged BRANCHES/DEV/BM to BRANCHES/DEV/SWIFT:
      24784: Log stack trace when reporting exception
   25966: Merged BRANCHES/DEV/BM to BRANCHES/DEV/SWIFT:
      24725: BM - tweak validate (to use read-only txn)
   25968: Merged BRANCHES/DEV/BM to BRANCHES/DEV/SWIFT:
      24736: BM - getChildByName optimisation (add reverse-lookup for parentAssocs)
   25992: RepoBM: add TPS
          - extend default ant-jmeter report to show approx/rounded test Time & TPS (note: not done for detailed report)
          - comment out detailed report
          - also expose "duration" param in ant build.xml / build.properties
   26035: RepoBM: ALF-6796 - fix perf of report generation (switch from xalan to saxon)
          - also do not fail on error
   26042: RepoBM: update readme (for ALF-6796) + add zip target
   26045: (RECORD ONLY) Merged DEV/BM to DEV/SWIFT (RECORD ONLY) - already resolved for V3.4 & SWIFT
        Merged BRANCHES/V3.4 to BRANCHES/DEV/BM:
           23613: Merged BRANCHES/DEV/BELARUS/HEAD_2010_10_21 to BRANCHES/V3.4:
              23601: ALF-5447: It's impossible to save the MS Office 2010 document via webdav.
        Merged BRANCHES/V3.4 to BRANCHES/DEV/BM:
           23618: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.4:
              23617: Merged BRANCHES/DEV/BELARUS/V3.3-2010_11_10 to BRANCHES/DEV/V3.3-BUG-FIX:
                 23602: ALF-5517: Webdav "supportedlock" propfind request fails if locking enabled
        Merged BRANCHES/V3.4 to BRANCHES/DEV/BM:
           23997: Fix ALF-5731: Saving a doc from Office 2003 via WebDAV fails
   26049: RepoBM: add "folder create" unit test
          - ALF-7309 (WebDAV)
          - ALF-7310 (CMIS)
   26147: RepoBM: update WebDAV test
          - add patched sardine (thanks Florian) 
          - adds "getResources(String url, int depth, boolean allProps)"
   26219: RepoBM: test additions & improvements
          - add "itemRename" (document or folder) - for CMIS (ALF-7362) and WebDAV (ALF-7630)
          - update mixed scenario (add "folderCreate" & "itemRename") - for CMIS (ALF-7546) and WebDAV (ALF-7545)
          - cleanup of common code
   26269: RepoBM: fix mixed scenarios (# of threads & weighted distribution)
          - use single thread group and interleave controllers
          - for CMIS (ALF-7546) and WebDAV (ALF-7545)
   26271: (RECORD ONLY) Merged BRANCHES/DEV/BM to BRANCHES/DEV/SWIFT (RECORD-ONLY)
          - NOTE: verified w/ florian
          - NOTE: OpenCMIS and cmis-client-api are already on SWIFT
          - NOTE: cmis-bm has been superceded by repository-bm
   26273: (RECORD ONLY) Merged BRANCHES/DEV/BM to BRANCHES/DEV/SWIFT (RECORD-ONLY)
      24326: OpenCMIS update
   26395: ALF-7755: add "system-build-test" project (and related RepoBM updates)
          - add ability to run "remote" tests (ie. selected *SystemTest)  against embedded Jetty
          - initially run sanity builds test for RepoBM (RepositoryBenchmarkWebDAVSystemTest + RepositoryBenchmarkCMISSystemTest) & also SiteActivitySystemTest
          - RepoBM enhanced to import test data if not present (also added additional testItemDelete unit test)
          - using local copy of Spring 3.0.5 (requires at least 3.0.2) - can be rationalised once rest of Alfresco (ie. 3rd-party libs) moves up to a higher Spring version
   26420: ALF-7755: tweak "system-build-test" for build box
          - also includes minor fixes to RepoBM (+ readme)
   26448: ALF-7755: tweak "system-build-test"
          - for ant scripts (eg. running on build box)
   26457: ALF-7898 - Alfresco Web Services: fix-up broken/regressed tests (WebServiceSuiteSystemTest)
          - revert default url context ... from "contentspaces" -> "alfresco" (broken during merge from ADB LC branch)
          - fix AuthoringServiceSystemTest.testVersionMethods() - when deleting version history
          - fix RepositoryServiceSystemTest.testPropertySetGet() - when creating dynamic model
   26462: ALF-7898 / ALF-7755: add additional 'system' tests
          - effectively runs Alf Web Service build sanity tests (~= WebServiceSuiteSystemTest)
   26478: ALF-7898 / ALF-7755: additional classpath fiddling (to get around limitation on Windows)
          - see also r26093
   26487: Build fix: cut-and-paste formatting issue
   26502: RepoBM: add "itemUpdate" (update props for doc or folder)
          - for CMIS (ALF-7633) - use Alfresco OpenCMIS Extension to update aspect props
          - for WebDAV (ALF-7631) - patch Sardine to allow custom namespaces
   26526: ALF-7755: use temp classpaths
   26528: ALF-7755: comment out for now
          - seems to work locally and on build boxes when run separately, but fails during full build
          - pending further investigation and testing (eg. when bamboo agents become free)
   26567: ALF-7755: remove test-repository-bm since not used
          - was breaking the test classpath (for following tests)
   26571: ALF-7755: re-enable RepoBenchmarkSystemTestSuite
   26600: ALF-7755: test-system-build-test
          - add user.home (for build box env)
          - re-enable MiscSystemTestSuite (includes Alf WS* tests)
   26609: ALF-7755: fix build/test (RepositoryServiceSystemTest.testPropertySetGet)
          - due to earlier MT test

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28217 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-06-06 18:31:52 +00:00
Dave Ward
9c563e35c6 Merged V3.4-BUG-FIX to HEAD
24662: 3.4.1 bug fix branch
   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.
   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
   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
   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
   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
   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)
   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.
   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
   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".
   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"
   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
   24874: Merged V3.4 to V3.4-BUG-FIX
      24667: Resolve ALF-6202 - MT: fix offline edit (Share)
      24672: Fixes from Gloria for: ALF-6339 and ALF-6337
      24673: Merge V3.3 to V3.4
         24668 : Upgrade of large repository to latest 3.3 fails on excession of mysql table lock size
      24674: Fixes ALF-6294: Remove illegal CLI option
      24675: Fix ALF-6099: CLONE - IE6: Sometimes errors occur on almost actions in Office Add-ins. Removed linebreaks from JSON response template & prevented "undefined" entries in URL.
      24680: ALF-6120 : Version notes are lost for versioned items migrated from 2.2 to 3.4.0
      24681: Merged BRANCHES/DEV/BELARUS/V3.4-2010_12_14 to BRANCHES/V3.4:
         24609: MT - ALF-3563
         24640: MT - ALF-3563
         (merged w/ minor improvement)
      24685: Fixes ALF-6403: Change installer window height on Linux
      24688: Fix ALF-6029 (part II) 
              - MT: cannot "Show Folders" for "Data Dictionary" in Afresco Share
              - part II adds patch and removes workaround
      24689: Fixes: ALF-6219 - Incorrectly formatted variable in translation
      24691: MT: ALF-3263
              - Explorer login now fails with consistent error message ("Unable to login - unknown username/password.") if tenant does not exist or is disabled
      24692: Fixes: ALF-6370 and ALF-6225 among others - sweep of FR and DE resource bundles for quote escaping.
      24694: Fixes ALF-6424.  Erased erroneous equals sign
      24695: Fixes: ALF-6320 - removed the country specific portion of the language pack suffixes for French, German and Spanish. This enables speakers of those languages outside of those countries to benefit from the language packs.
      24696: Fix for ALF-6299: XSS attack on editing blog post with XSS data in IE6&IE7
      24700: Swaps _it_IT for _it to make Italian language pack available to Italian speakers outside of Italy.
      24703: Avoid DB2 query failure if someone passes in a made-up UUID
              - Test RunningActionRestApiTest was making up a long node UUID
              - DB2 fails to set the parameter with SQLSTATE=22001
      24706: Merged V3.4-BUG-FIX to V3.4
         24705: Fix for ALF-6365, ALF-6335
      24708: Fix ALF-6386: View Details and Edit Metadata icons are incorrect for folder
      24709: Missing first/last name handling.
      24711: Merged V3.3 to V3.4
         24710: ALF-5535 - Fix to correctly format json number values (not as numeric human readable strings)
      24713: Fix ALF-5404: It is now possible to configure who receives notifications of "Contact Us" requests by setting a configuration property on the WQS website node, such as "feedbackAssignee.Contact Request=brian"
             Also added missing Spring MVC source to 3rd Party.
      24715: Fix for ALF-6412. OOoDirect always tries to connect to port 8100.
               Formerly the ooo.port property did not exist for the OOoDirect connector. It was added in r.23182 for the soffice process, but not for the connector bean. Now added for the connector too.
      24721: Fix for ALF-6351 - Simple search breaks if override config is used and does not contain new 'repository-search' element
      24728: Fixes: ALF-5685 - Incorrect encoding of Japanese Characters
      24732: Fixes ALF-6381 and others - calendar strings appearing incorrectly. Problem was an unicode encoded comma preventing the property string being broken up into different days of the weeks or months.
      24739: Fix ALF-6545: DB2: SQLCODE=-302, SQLSTATE=22001 (testCreateMultiLingualCategoryRoots)
              - Shortened Japanese name to 14 characters
      24740: Fixes: ALF-6413 (with some translations still pending).
      24742: Update readmes.
      24744: Merged HEAD to BRANCHES/V3.4:
         24137: Fixes: ALF-5642, ALF-3892, ALF-5043 & Brings Add Event dialog in line with other forms in share by disabling the popup validation error box.
      24746: Build/test fix: PostgreSQL -AssetServiceImplTest.renameFolder
      24755: Merged V3.3 to V3.4 (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: Merged 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
      24775: Merged BRANCHES/V3.3 to BRANCHES/V3.4: (RECORD-ONLY) - already in V3.4
         24774: (RECORD-ONLY) Merged BRANCHES/V3.4 to BRANCHES/V3.3:
            23492: Fixed ALF-5550: DB2: Unable to insert values into alf_string_value
      24788: Add evaluation use message for OSX installer
      24790: Removed svn:mergeinfo on root
      24791: Fixed ALF-6560: MIME type not detected (set to application/octet-stream) when content written via FileFolderService
             - First access of content on a new file (FileFolderService.getWriter) guesses a mimetype
             - The initial mimetype guess *was* done during create, but that was expensive.
             - Added unit test to cover regression
      24803: Merged BRANCHES/DEV/dwebster/ to BRANCHES/V3.4:
         24773: DE bug fixes received from translators 10th Jan.
         24776: ES files received from translators 10th Jan
         24793: FR files received from translators 10th Jan
         24792: IT files received from translators 10th Jan
      24804: Temporarily removing Japanese language bundle
      24856: Merged BRANCHES/DEV/dwebster/ to BRANCHES/V3.4:
         24848: Latest Language updates from Translators
      24863: ALF-6029 (MT Share - repo' view after upg)
   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


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@26792 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-04-11 15:57:26 +00:00
Jan Vonka
f3b8452415 Merged V3.2 to HEAD
19507: ALF-955: deletion of dynamic custom model
   19553: Follow-on to r19507 (ALF-955) - fix testAutoRemovalOfVersionHistory


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19569 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-03-25 09:30:11 +00:00
Paul Holmes-Higgin
cefda8c965 Updated header to LGPL
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18931 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-03-01 22:48:39 +00:00
Paul Holmes-Higgin
43e93f3c14 Updated header to LGPL
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18926 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-03-01 22:09:17 +00:00
Dave Ward
1c1a35e500 Merged V3.2 to HEAD
17475: ETHREEOH-3295: Fix to AuthorityMigrationPatch
      - Forces transaction retry if worker thread reaches child authority before a parent authority
      - Tested on Kev's 3.1.1 repository with ~20,000 bulk loaded users and ~2,000 Share sites
      - Now completes in 5 minutes as opposed to 45
   17461: ETHREEOH-3268: Added MutableAuthenticationService.isAuthenticationCreationAllowed () to allow conditional display of external user invitation UI
   17450: ETHREEOH-2762: Correction to previous fix. Do not generate new name when working copy copied back on check in.
   17440: ETHREEOH-3295: Fixed logging in FixNameCrcValuesPatch
   17439: ETHREEOH-2762: Improved behaviour when a working copy is copied
      - Working copy aspect already removed the working copy aspect on copy
      - Now derives a new name from the node checked out from and a UUID, preserving the extension
   17438: ETHREEOH-2690: Fix sequencing of jgroups system property setting
      - declared dependency between internalEHCacheManager and jgroupsPropertySetter
   17436: ETHREEOH-3295: Further performance improvements to AuthorityMigrationPatch
      - authority created at same time as all its parent associations to save lots of reindexing, as per LDAP sync
      - multi-threaded BatchProcessor (as used by LDAP sync, FixNameCrcValuesPatch) used to process work in 2 threads in batches of 20, report progress every 100 entries and handle transaction retries
      - BatchProcessor now promoted to its own package
   17394: Fix for license issue in local enterprise builds.
      - Replace Community with Enterprise in version.properties during enterprise war building
   17365: ETHREEOH-3229: Visited and fixed all SearchService result set leaks
   17362: ETHREEOH-3254: Eliminate needless ping to LDAP server in LDAPAuthenticationComponentImpl.implementationAllowsGuestLogin()
   17348: ETHREEOH-3003: Fix NPE in Hyperic when LicenseDescriptor has null fields
   17316: Merged V3.1 to V3.2
      17315: ETHREEOH-3092: PersonService won't let you create duplicate persons anymore.
      17314: ETHREEOH-3158: Fix RepoServerMgmt to work with external authentication methods
         - AuthenticationService.getCurrentTicket / getNewTicket now call pre authentication check before issuing a new ticket, thus still allowing ticket enforcement when external authentication is in use.
      17312: ETHREEOH-3219: Enable resolution of JMX server password file path on JBoss 5
      17299: Merged V3.2 to V3.1 (Record only)
         17297: ETHREEOH-1593: Changed name of username cookie and fixed login.jsp to decode it properly
         17248: ETHREEOH-1593: alfUser cookie value should be base 64 encoded to allow for non-ASCII characters
   17297: ETHREEOH-1593: Changed name of username cookie and fixed login.jsp to decode it properly
      - thanks Kev!
   17292: ETHREEOH-1842: Ticket association with HttpSession IDs tracked so that we don't invalidate a ticket in use by multiple sessions prematurely
      - AuthenticationService validate, getCurrentTicket, etc. methods now take optional sessionId arguments
   17269: Fix failing unit test
      - reinstate original behaviour of AbstractChainingAuthenticationService.getAuthenticationEnabled()
   17268: Fix InvitationService
      - Runs as system to do privileged AuthenticationService actions


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18105 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-01-18 17:41:59 +00:00
Kevin Roast
7f24c8c4e7 Merged V3.2E to HEAD
17246: ETHREEOH-3208: User profiles for users authenticated by immutable subsystems are now read only
         - Introduced MutableAuthenticationService interface, only implemented by Alfresco native authentication service
         - Split out those methods from AuthenticationService that mutate the user store and added isAuthenticationMutable()
         - Now both Alfresco Explorer and Share user profile / password edit link rendering is conditional on isAuthenticationMutable
         - Works with authentication chain containing mixture of internally and externally authenticated users
   17247: Fix failing unit tests
         - rm-public-services-security-context.xml needed to be brought in line with public-services-security-context.xml (and will forever more!)
   17248: ETHREEOH-1593: alfUser cookie value should be base 64 encoded to allow for non-ASCII characters
   17253: *RECORD ONLY* ETHREEOH-2885: web.xml must conform to the schema to work on JBoss

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18098 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-01-18 15:32:57 +00:00
Dave Ward
be0482f06e Integrated Spring v3 snapshot CI-477
- Fixes SPR-6411 and SPR-6412
- Removes dependency on Hibernate v3.3

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17664 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-11-30 09:36:40 +00:00
Dave Ward
1a481a63c2 Merged BRANCHES/DEV/DAVEW/SPRING3 to HEAD
15422: Fix deploy-virtual-tomcat macro for Spring 3
   15391: Fix ContentStoreReplicatorTest for Spring 3
   15390: Upgrade CXF to version 2.2.2 for Spring 3 compatibility
   15385: Correction to previous checkin
   15384: Fix ClassPathStore.createRelative() to work with Spring 3
      - Relative resource path resolution with directory resources has changed
   15346: Merged V3.3_SPRING3 to SPRING3
      15310: Spring 3: Change to the way that FileContentStore broadcasts its existence to interested parties (for enterprise-only monitoring)
         - Introduced new SafeEventPublisher singleton that queues up events until after the application context has finished refreshing
      15309: Use AUTODETECT_NONE auto detect mode for JMX exporters to be compatible with Spring 3
      15308: Fix IBATIS integration to be compatible with Spring 3
      15307: Added missing runtime dependencies
         - org.springframework.expression-3.0.0.RC2.jar
         - org.springframework.asm-3.0.0.RC2.jar
      15289: Move Alfresco stack to Spring 3
         - Stage 1: get it compiling in eclipse and update ant scripts
         - Still requires Web Framework contributions from Uzi


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17624 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-11-23 20:20:06 +00:00
Jan Vonka
bd9fe31142 Merged V3.2 to HEAD
16029: ALFCOM-3293 - MT: group management broken with domain mismatch error (fallout from CHK-7357)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16036 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-09-02 09:25:50 +00:00
Dave Ward
9974e627e8 Merged V3.2 to HEAD
15646: Merged V3.1 to V3.2
      15454: Fixed org.alfresco.repo.tenant.MultiTDemoTest that caused build failed.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@15823 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-08-19 16:56:35 +00:00
Dave Ward
d5e0432589 Merged BRANCHES/DEV/DAVEW/LDAP to HEAD
14587: Added new node service method getNodesWithoutParentAssocsOfType to public-services-security-context.xml (or at least my best guess at it!)
   14586: Use US spelling of synchronization in filenames for consistency
   14585: Lower the default user registry sync frequency to daily instead of hourly. Now users and groups are pulled over incrementally on login of missing users.
   14583: Unit test for ChainingUserRegistrySynchronizer
   14571: Migration patch for existing authorities previously held in users store
      - Uses AuthorityService to recreate authorities in spaces store with new structure
   14555: Authority service changes for LDAP sync improvements
      - Moved sys:authorities container to spaces store
      - All authorities now stored directly under sys:authorities
      - Authorities can now be looked up directly by node service
      - Secondary child associations used to model group relationships
      - 'Root' groups for UI navigation determined dynamically by node service query
      - cm:member association used to relate both authority containers and persons to other authorities
      - New cm:inZone association relates persons and authority containers to synchronization 'zones' stored under sys:zones
      - Look up of authority zone and all authorities in a zone to enable multi-zone LDAP sync
   14524: Dev branch for finishing LDAP zones and upgrade impact

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14588 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-06-08 16:16:32 +00:00
Jan Vonka
70d66c0f8c Merged V3.1 to HEAD
13902: Merged V2.2 to V3.1
        13900: Fixed ETHREEOH-1846: NullPointerException in ADMLuceneIndexerImpl if localized string is null
    14167: MT - fix ETHREEOH-2015
    14198: MT - fix ETHREEOH-210 and add unit tests (will also fix ALFCOM-2823 when merged forward to HEAD)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14204 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-05-06 11:40:13 +00:00
Jan Vonka
f28579cc8e MOB-659 (part 2 of 2) - improve dictionary cache reset (should work even with null / cache)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14059 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-04-23 10:29:32 +00:00
Jan Vonka
3774f9ed01 Merged V3.1 to HEAD
13965: Line-endings only
   13967: Enable upgrade of MT env from 3.0.x to 3.1.1+ (with out-of-date config warning on startup rather than errors later)
   13976: Line-endings only
   13977: MT - add unit test (for dynamic models)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13980 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-04-16 12:51:43 +00:00
Derek Hulley
fec1149d8c Merged V3.1 to HEAD
- incl. taking Hibernate libs from 3.1 and adding missing file from earlier merge
   13321: Fix ETHREEOH-1407: System error occur during "Undo Selected" action if no items are selected
   13322: ETHREEOH-1206: Throwing Alfresco Exception on OnUpdateProperties behaviour resets Encoding field to Big (first entry)
   13326: (RECORD ONLY) Removed 'dev' from version label.
   13330: Fix ETHREEOH-1408: Incorrect button name at "Manage Task: Submitted" page
   13337: Fix for ETHREEOH-1409 and further fix for ETHREEOH-1408
   13338: Removed svn:mergeinfo
   13346: Make startup bat script check JAVA can be found.
   13351: ETHREEOH-1386 validate ASR and FSR hostname.
   13359: ETHREEOH-1435: Share doesn't extract document metadata correctly
   13360: Fix ETHREEOH-821: SDK dependencies
   13369: Fixed distribute-sdk target for when it's run locally
   13382: ETHREEOH-1437: Container creation induces an unexpected permission allocation in Share
   13391: Shutdown backstop continues if logging throws errors.
   13394: Fix ETHREEOH-1457 - MT coci issue with bootstrap (eg. data dictionary) content
   13400: Activate JAWS-223: Adobe LC Hibernate Dialect Loading
   13401: Support for JAWS-215, mysql and oracle
   13413: Fix ETHREEOH-1458 - MT delete->archive
   ___________________________________________________________________
   Modified: svn:mergeinfo
      Merged /alfresco/BRANCHES/V3.1:r
                           13321-13322,13326-13327,13330,13337-13339,13341-13347,13351,13354-13355,13358-13363,
                           13365,13367,13369,13382,13385-13392,13394,13400-13403,13405-13406,13413


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13617 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-03-13 00:51:43 +00:00
Derek Hulley
198ebe371e Merged V3.1 to HEAD
13256: Fix ETHREEOH-1221   Hard-coded use of "admin" username
   ___________________________________________________________________
   Modified: svn:mergeinfo
      Merged /alfresco/BRANCHES/V3.1:r13256


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13613 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-03-12 21:48:15 +00:00
Jan Vonka
862e3b671f Merged V3.1 to HEAD
12904: Partial fix for ETHREEOH-1221


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13539 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-03-10 18:05:28 +00:00
Jan Vonka
18b1342c57 Build/test fix (MultiTDemoTest)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13463 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-03-04 10:11:52 +00:00
Jan Vonka
c4e9d6f97b Merged V3.0 to HEAD
12349: Tweaked the Hibernate session helper to prevent initially-large sessions from drowning the flush code
  12452: MT - fix ETHREEOH-1056
  12453: MT - fix ETHREEOH-886
  12460: MT - fix ETHREEOH-1013


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12536 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-12-22 16:42:39 +00:00
Jan Vonka
90d1f80fce Merged V3.0 to HEAD
12178: Authenticate now required since introduction of public service usage in 3.0 test and authentication util changes.
  12180: Build fix for updating person properties - set all existing to keep quota properties.
  12187: MT - fix missing merge and fallout post authentication util changes
  12199: Usage Service - fix unit test fallout post authentication util changes
  12204: Authenticate now required since introduction of public service usage in 3.0 test and authentication util changes
  12206: Authenticate now required since authentication util changes
  12210: Module fixes - to use new authentication util api changes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12515 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-12-19 13:22:28 +00:00
Jan Vonka
cd09266213 Merged V3.0 to HEAD
12145: Merged V2.2 to V3.0 (AuthenticationUtil)
    12109: AuthenticationUtil and AuthenticationComponent refactor
  12152: Removed Lucene usage from lookup of 'sites' root folder
  12153: Fix InviteServiceTest by cleaning up leaking authentications
  12159: Fix for broken usage pattern of the Threadlocal values in recent AuthenticationUtil refactor.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12508 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-12-19 12:15:59 +00:00
Kevin Roast
c07be19e36 Merged V3.0 to HEAD
11943: Fix for ETHREEOH-879 & ETHREEOH-783: Multi-valued properties not allowed in Alfresco 3.0 (due to java.lang.UnsupportedOperationException)
   11944: Fix for ETHREEOH-865
   11947: Build fix for site service unit test failures.  This will be reviewed since it works round the issue rather than tackle why runAs is now failing.
   11952: ETHREEOH-845, ETHREEOH-871, ETHREEOH-853, ETHREEOH-839
   11953: ETHREEOH-483 Unable to upload files [with Flash 10 installed] Fixed to fit into yui 2.6.0
   11954: Added missing 'protocolOrder' configuration value.
   11956: Fix for ETHREEOH-895
   11957: Fix for ETHREEOH-891.
   11958: Readded generated source line for RemoteAPI project.
   11959: ETHREEOH-483 Unable to upload files [with Flash 10 installed] Missed to add this image
   11960: Removed JDK6 specific method.
   11962: Fixed missing setup of the share mapper class name when the <class> config tag is used. ALFCOM-2060.
   11964: fix for ETHREEOH-266 - restrict length of webapp to 150 chars.
   11965: Merged 2.2 to 3.0
      11926: Fox for ETHREEOH-725 User doesn't receive email to his box when rule 'Send an Email to specified users' is created 
   11966: ETHREEOH-872: Editing Email-notify-rules fails w/ ClassCastException
   11967: MT - test fixes (post runAs merge)
   11968: Changed Windows x64 NetBIOS warning message to be a debug message. ETHREEOH-897.
   11971: ETHREEOH-829 Case issue when inserting Document Share links into a discussion using richtext editor
   11973: Fix for ETHREEOH-890 - users with apostrophe in their login name can now login to Alfresco Explorer (and Share).

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12490 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-12-18 13:58:20 +00:00
Derek Hulley
f74699749b Merged V3.0 to HEAD
11410: Activity Service - iBatis mapping files for MS SQL Server (using AlfrescoSQLServerDialect)
          Can be Enterprised when dual build is set up
   11414: Fix for missing servlet reference in repo web.xml
   11415: Activity Service - iBatis mapping files for new Oracle dialects (using AlfrescoOracle10gDialect or AlfrescoOracle9iDialect)
          Can be Entperprised when dual build is up
   11424: Remove conflicting java mail libraries.
          NOTE: Might affect 'CMIS web service implementation'
   11426: Activity Service - use lower-case columns
   11428: ETHREEOH-300: Site contributor can not delete his own blog posts
   11431: Removed tutorial from Guest home
   11432: ETHREEOH-198: SiteService is not MT enabled
   11440: Close all ScrollableResults in try{} finally{}
   11442: Fix for ETHREEOH-268, ETHREEOH-269, ETHREEOH-431, ETHREEOH-438, ETHREEOH-456, ETHREEOH-468, ETHREEOH-532
   11443: Update to JSF client Help URL
   11444: Build fix
   11447: MT - fix ETHREEOH-530
   11448: Fix for ETHREEOH-424: Edit Web Content: dojo.data.fromrfc3339 is not a function
   11449: Fix for ETHREEOH-218: DM forms should be disabled


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12427 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-12-17 06:49:28 +00:00
Derek Hulley
0445571a45 Merged V3.0 to HEAD
11259: MT - make new PersonDao MT-aware, re-enable MT demo/test
   11261: MT - fix ETHREEOH-190, partial fix for ETHREEOH-189


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12392 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-12-15 15:36:36 +00:00
Jan Vonka
2f5abd7e0d MT - fixes for version2Store + MT interceptor
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@11001 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-09-24 11:57:29 +00:00
Jan Vonka
40e706f14f MT - fixes for new MT interceptor (create/login tenant admin, get stores)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10995 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-09-23 22:48:08 +00:00
Jan Vonka
f1aaf99674 MT - enable simple MT tests
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10966 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-09-22 15:45:08 +00:00