81 Commits

Author SHA1 Message Date
Andrew Hind
d9deb51e29 Build fix - remove tests that use meta-data query +multi-tenancy
- fix 3.4 CMIS api to use metadata query

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55965 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-25 13:35:19 +00:00
Samuel Langlois
ab4ca7177f Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)
51903 to 54309 


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


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@48347 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-03-19 14:16:01 +00:00
Dave Ward
c1d11e0f3a Merged V4.1-BUG-FIX to HEAD
47745: ALF-18302: Merged V4.0.2 (4.0.2.29) to V4.1-BUG-FIX (4.1.5)
      47498: MNT-317: CIFS: Image document version history lost intermittently after saving content in Preview on Mac Mountain Lion
      - Candidate fix by Dmitry Vaserin
   47753: ALF-12264: Domain-filtering also done with new approach of fetching WorklfowTasks
   47778: Merged DEV to V4.1-BUG-FIX
      ALF-18151: CMIS cannot delete folders that have rules applied
                 - Will throw 'CMISConstraintException' exception only if 'ContentModel.ASSOC_CONTAINS'
                   child association exist for the folder what is deleted.
                 - Added and succesfully executed two unit test for openCMIS and CMIS.
   47794: ALF-18302: Merged DEV to V4.1-BUG-FIX
      47631: MNT-317: CIFS: Image document version history lost intermittently after saving content in Preview on Mac Mountain Lion
      Add class description describing the shuffle on ScenarioRenameDeleteMove.
      Add proper unit test.
   47795: Merged back build fix from HEAD (thanks Neil)
   47803: Merged PATCHES/V4.1.4 to V4.1-BUG-FIX
      47680: Merged DEV to PATCHES/V4.1.4
         47677: ALF-18270 Cannot open properties of model
         In FormUIGet.processFieldConstraints() was added check: (fieldConfig != null && fieldConfig.getConstraintDefinitionMap() != null).
      47738: ALF-18301: Alfresco fails to start up because of NPE error, when debug logging for 'org.alfresco.repo.cache.AbstractAsynchronouslyRefreshedCache' is enabled
      - Fix by Dmitry Velichkevich 
      47754: Merged DEV to PATCHES/V4.1.4
         47751: ALF-17644 : Document version was increased after canceling editing.
         Unnecessary calls for property deletion was removed.
      47767: ALF-18088: Add Implementation-Edition + limit Specification-Version to 3 digits in war MANIFEST files
      47786: Fixed ALF-18137 "It's impossible to create a new item in the data list."
   47804: Merged PATCHES/V4.1.4 to V4.1-BUG-FIX (RECORD ONLY)
      47755: Merged V4.1-BUG-FIX to PATCHES/V4.1.4
         47753: ALF-12264: Domain-filtering also done with new approach of fetching WorklfowTasks


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@47807 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-03-08 14:10:56 +00:00
Dave Ward
380bd69941 Merged V4.1-BUG-FIX to HEAD
47256: Merged DEV to V4.1-BUG-FIX
      47145: ALF-17877 : CLONE - The deleted via Sharepoint document is not removed from Alfresco but hidden aspect is added for it
      Setting webdav client for all webdav requests in SPP module.
   47257: ALF-17816 (Incorrect tooltip 'Locked by' icon for other user)
   47285: ALF-17635: Incorrect behavior of Move action in Update rule and Outbound rule in Share
   - Altered MoveActionExcecuter so that it doesn't fire on a working copy and will hence wait for checkin
   47287: Fixes ALF-2590: Calendar doesn't handle 401 errors properly:
      - callUtils now pass on non 200 status codes (rather than swallowing errors)
      - updates create-event template to handle missing data.
   47288: ALF-17057: SPP: Extra version is created when add new document via Document Connection on MacOS X Lion
   - Now we ignore empty content when we create the initial version
   47290: ALF-16931: Bootstrapped users with Uppercase name cannot see site they have been invited to
   - Changed the code to be conditional on association type
   47296: ALF-4565: Incorrect behaviour of Edit Online action if document's name contains wildcards
   - URLs were incorrectly being double decoded in DefaultAuthenticationHandler
   47308: Merged DEV to V4.1-BUG-FIX
      47298: ALF-17907 : specified index does not exist during upgrade to 4.1.2
         The droppping of alf_node.store_id index was marked as optional to support the upgrades from originally Alfresco 2.2 for Oracle DB.
   47314: Fixed ALF-13679 "Cannot play a movie file in Preview, which has double byte characters in the file name"
   47322: ALL LANGS: Translation updates based on EN r47138
   47325: ALL LANGS: Translation updates based on EN r47138
   47327: Removes unused TinyMCE files (as part of ALF-17451 )
   47329: FR, IT, NL: Fixes ALF-17413
   47331: Implements fix suggested in ALF-17451, updates fixes for ALF-8486, ALF-10690 and ALF-11000.
   47334: ALF-16991: Editing Rich Text files in TinyMCE loses some formatting.
   47340: Merged DEV to V4.1-BUG-FIX
      47306: ALF-17907 : specified index does not exist during upgrade to 4.1.2
      The droppping of alf_node.store_id index was marked as optional to support the upgrades from originally Alfresco 2.2 for MS SQL Server.
   47353: Merged V4.1-BUG-FIX-2012_11_26 to V4.1-BUG-FIX
      44182: ALF-15970: OpenOffice form not found
         Show error message if form definition could not be found
   47383: ALF-17222: "Protected attribute not take into account for target of associations"
   47392: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2013_02_26 to BRANCHES/DEV/V4.1-BUG-FIX:
      47313: ALF-18006 : Sending a PUT request without a Content-Type header resets the contents mimetype to application/octet-stream
   47402: ALF-18212: SOLR OOTB cache sizes are too big and require >20GB heap space
   - Reduced default cache sizes from 512 to 64
   47405: Fixes: ALF-14412 - Tag filtering in blogs
   47407: Fix failing unit tests - use public services where transactions are required
   47410: Merged V3.4-BUG-FIX to V4.1-BUG-FIX
      47293: (RECORD ONLY) Merged DEV to V3.4-BUG-FIX
         43417: ALF-14710 JUnit test for WebServiceSuiteSystemTest project fails
         - testPropertySetGet() method was updated in RepositoryServiceSystemTest class
      47311: ALF-18213 / ALF-18005: webscript guestDownload does not set Content-Dispositon HTTP header
      - Follow on from ALF-9817
      - Now it does it properly
   47414: Merged V3.4-BUG-FIX to V4.1-BUG-FIX (RECORD ONLY)
      47332: ALF-17640: Merged V4.1-BUG-FIX to V3.4-BUG-FIX   
         45828: Additional fix for     ALF-17153  FTS query parser FTSQueryParser is not debuggable
      47385: ALF-17935: Merged PATCHES/V4.0.2 to V3.4-BUG-FIX
         42969: Merged DEV to PATCHES/V4.0.2
            42967: MNT-158: SharePoint Protocol Opening Documents in Read-Only for Site Consumer with Collaborator Privileges
               Remove manual throwing of AccessDeniedException is user has "consumer" or "contributor" role.
               Create "links" container from system user.


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


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


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@37196 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-05-30 08:27:10 +00:00
Dave Ward
6155c6ec15 Merged V4.0-BUG-FIX to HEAD
37067: ALF-13294	CIFS: When versionable aspect is active, using the Microsoft Word for Mac 2008 option "always create a backup copy" leads to document versions loss
   37073: ALF-14319 Add a unit test for using the real remote credentials shared container (most use a test one to avoid issues/clashing), and tweak the qname to match other similar ones
   37074: Merged V3.4-BUG-FIX to V4.0-BUG_FIX
      36881: Merged DEV to V3.4-BUG-FIX
         36759: Fix to Checkin failing to distinguish between 'null' and 'unset' properties
         - Some minor ammendments to unit test as well
      36898: Merge HEAD to V3.4-BUG-FIX:
         33668: ALF-12541 / ALF-14254: AMP files need to be able to be pinned to specific "edition(s)" of Alfresco. It is now possible to specify a module.editions property (eg. community) which is checked by the MMT. Also, the version is checked on install. Also, started refactoring some of the code for better reuse.
         33793: ALF-12541 / ALF-14254: Better fix for ALF-12541 - AMP files need to be able to be pinned to specific "edition(s)" of Alfresco Share doesn't have a version.properties file so I need to cater for that scenario. I didn't want to create the LogOutput interface but its a stop-gap until the MMT gets re-worked.
         33695: ALF-12531 / ALF-14255: MMT needs to properly support upgrading of AMP files
         33725: ALF-12532 / ALF-14256: MMT should fail with an error if the target war file doesn't exist
         33735: ALF-12533 / ALF-14257: When run with -directory, MMT should only backup the alfresco.war file once
         33781: ALF-12540 / ALF-14258: AMP - file-mapping.properties: white space at end of line is significant
         33880: ALF-12777 / ALF-14259: MMT should not install AMPs which override pre-existing files in the war file, unless -force is provided. The MMT is moving toward more of a validation phase (checks things, calculate changes) then an execution phase (makes the changes).
         33707: ALF-12541 / ALF-14254: Fix for failing unit tests
      37030: ALF-12511 Allow debugging of the authentication chain at a high level
         - enable with log4j.loggerorg.alfresco.repo.security.authentication.AbstractChainingAuthenticationService=debug
      37066: Merged DEV to V3.4-BUG-FIX (3.4.10)
         37063: ALF-11956: WCM accessibility
            New Tab focus plugin is added for TinyMCE:
            - plugin covers the RTE changes special for 'XForms';
            - configuration for custom appearance has been set in 'web-client-config-wcm.xml'
      37069: ALF-13379: READ_ONLY_LOCK prevents access via deprecated CMIS API
      - Fix by Alex Bykov
   37075: Fix for ALF-14267 SOLR index check - First transaction time used instead of first ACL time - indexCheck, checkInitialState
   37076: Merged V3.4-BUG-FIX to V4.0-BUG-FIX (RECORD ONLY)
      36942: ALF-12081: Cancel Editing button should only be shown for documents that are checked out for offline editing.
      36957: ALF-12081: Reverse-merging r36942 pending UI team review


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


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@33758 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-02-08 11:06:09 +00:00
Steven Glover
bf7181452c Fix for ALF-10826
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32797 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-12-15 18:09:53 +00:00
Jan Vonka
eb8f85a4fd Merged DEV to HEAD: (ALF-11606)
31637: THOR-358: update CMIS getChildren (V3.x => CMISServicesImpl)
   31700: THOR-358: update CMIS getChildren (V3.x => CMISServicesImpl)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32155 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-11-21 16:56:26 +00:00
Dave Ward
e18ab791d7 Merged V3.4-BUG-FIX to HEAD
31072: Incremented version.revision for 3.4.7
   31082: Merged DEV to V3.4-BUG-FIX
      31077: ALF-9661: Adding or removing associations does not trigger 'update' rule.
             1. Unit test for replicating.
             2. SingleAssocRefPolicyRuleTrigger now handles trigger of the rules on the list of parents.
   31115: Merged DEV/TEMPORARY to V3.4-BUG-FIX
      30992: ALF-10029 : Webdav error when document type is missing
         Correcting directory listing. Display reader's mimetype if display label for mimetype couldn't be found.
   31116: Merged DEV/TEMPORARY to V3.4-BUG-FIX
      31114: ALF-10309 : CLONE -WebDAV - Canceling "save as" upload will create 0 byte content
         Logic was added to PutMethod that removes empty files if a save operation is cancelled or fails.
   31157: ALF-10757: Merged HEAD to V3.4-BUG-FIX
      31154: Synchronize file writes from CIFS. ALF-10721.
   31188: Merged DEV/TEMPORARY to V3.4-BUG-FIX
      31176: ALF-9979: Error thrown when adding user(s) to group in explorer if user already exists in group
         Implemented checking of the user presence in the particular group using getAuthService().getContainedAuthorities()
   31189: Merged DEV/TEMPORARY to V3.4-BUG-FIX
      31174: ALF-9684: CMIS AtomPub: The combination of includeRelationships=both and returnVersion=latestmajor returns an internal server error
         Try-catch block was added for nodeService.getSourceAssocs(node, RegexQNamePattern.MATCH_ALL) operation. This operation is not supported for a version store.
   31190: Merged DEV/TEMPORARY to V3.4-BUG-FIX
      20694: ALF-925: "title" property always gets populated with the name of a file when content without a file extension is added via Webdav.
         When user creates file through webdav, "title" property was populated with "name" property value.
         The code that was doing it has been removed. Now the title will be empty in such a case.
         This makes things consistent with CIFS and FTP, where you have to create a rule with action "Extract common metadata fields from content". 
   31217: ALF-10807: Share document download with SSL
   - Fix from Bitrock
   31226: ALF-10632: Added a sample configuration fragment for war-deployers-jboss-beans.xml because it's rather tricky to publish the correct configuration in the docs!
   31265: ALF-9999 Cannot search pdf files, which are written vertically.
      Sample configures PdfMiner as the pdf -> text and ??? -> pdf -> text transformer rather than PDFBox.
      PdfMiner is slower but does handle vertical text.
   31268: ALF-9093 Alfresco incapable of previewing text files including non Western European characters
      Sample file that configures OpenOffice as the default handler for text to PDF conversions
   31304: Merged BRANCHES/DEV/BELARUS/HEAD-2011_10_05 to BRANCHES/DEV/V3.4-BUG-FIX:
      31291: ALF-9460 : Archived discussion posts break display of the discussed node when users do not have access to the trash can
   31313: Fix for JBPM security issues with timers and async tasks.
   ALF-10776: Workflow timer fires a policy that causes a AuthenticationCredentialsNotFoundException
   ALF-6405: SecureContext issue if task node async property is set to "true"
   31314: Fixed ALF-10373 "There is no path to the folder for "Move" action inside the rule's description."
   31361: Fixed ALF-10930. Incorrect description of 'xam.archive.forceBackgroundStoreMove'
   31366: ALF-3756 - original fix didn't cope with existing MLText having one or more language variants. 
   ...upgrading to the fix would therefore not solve the problem properly. For example, if a property has en_GB text in it, then 'updating' that property with a locale of en_US will result in the addition of the en_US text rather than a true update (they're both English, and using two slightly differently configured browsers in this way leads to confusion).
   31387: ALF-10740: Flash upload - Working Copy label not removed on check in if non english locale is used in Share client   
   Two separate problems were fixed:   
   * Locale string as supplied by the flash uploader was being placed into the language portion of the Locale object in java, therefore no proper match was made when looking up the working copy label (e.g. "(Working Copy)") - fixed by using a proper locale string parser as supplied by Surf.   
   * Working copy label could still fail to be removed if document was checked out under one locale and checked in using another. Fix provided by recording the *original* working copy label against the cm:workingcopy aspect.   
   31395: ALF-3756: fixes broken FullNodeServiceTest
   31399: ALF-3756: fixing build failures from -c31366 (VersionServiceImplText.testRevert()) 
   A ConcurrentModificationException was being thrown, have changed the way that the hashmap is processed to avoid this.
   31401: Fix for ALF-2980
   31410: Fix for ALF-10961 - Share - Sites not displayed on dashboard
   31418: ALF-10768 Environment variables are being used to replace property placeholders in xml configuration files
      Modified ALL spring beans that are a PropertyPlaceholderConfigurer (including sub classes) and the 
      PropertyPlaceholderConfigurer created ChildApplicationContextFactory so that OS environment variables
      are not used in property place holder substitutions. Spring 3 started allowing OS environment variables
      to be used by default. This may explain why we have so many install problems.
   31420: ALF-3756 another compile error: This time StoreSelectorAspectContentStoreTest
   31425: ALF-10740: Fix from -c 31387 (compilation error)   
   This fix is in addition to -c31420. The compilation error was due to me not having the bug fix branch configured as an enterprise project.
   31458: Fix for ALF-10916
   31459: Fix for ALF-10915
   31482: ALF-10915
     - Fix build
   31491: Various oplock, access mode and CIFS protocol fixes ported from v4/HEAD. ALF-10331.
   31492: File open access mode checks ported from v4/HEAD. ALF-10331.
   31529: ALF-11144: NPE during incremental LDAP sync
   31530: Fixed ALF-11139: Audit concurrency exceptions do not trigger transaction retries
    - AuditMethodInterceptor allows audit exceptions to propagate out
   31606: ALF-10309 CLONE -WebDAV - Cancelling "save as" upload will create 0 byte content
       Changed name of aspect to be WebDAV specific (rather than using a CIFS value), so that it might be possible to tidy these up in future.
   31638: Fix for ALF-10597 - Share - Upload new version issue - OK button displayed during refresh
   31639: Fix for ALF-10297 JSF - Sort by First/Last Name in Groups Management not working
   31641: ALF-9776 - Fix for WCM - it allows users to submit contents to Staging with past Launch and Expiration Date
   31653: ALF-8906: Ensure entire IMAP service startup transaction runs as system, to allow for any auto-aspect adding / versioning during cache warming
   31654: Merged V3.4 to V3.4-BUG-FIX
      31327: ALF-10878 Merged HEAD to V3.4
           30225: ALF-10001 Update SiteService.listMembers to check group display names as well as group names, plus test
      31329: Merged V3.4-BUG-FIX (3.4.7) to V3.4 (3.4.6)
         30992: ALF-10029 : Webdav error when document type is missing
            Correcting directory listing. Display reader's mimetype if display label for mimetype couldn't be found.
      31462: ALF-10010 Document can not be found even after a full reindex.
         Sample configures xpdf as the pdf -> text and ??? -> pdf -> text transformer rather than PDFBox.
      31478: Merged BELARUS/V3.4-BUG-FIX-2011_10_13 to V3.4 (3.4.6)
         31460: ALF-10952: User is unable to edit own profile using Alfresco Share
            To compare two objects it needs to use equals() method instead of ==.
            Such a check was changed in UsageQuotaProtector.onUpdateProperties() method.
      31502: ALF-10324 Cannot disable Home Folder Creation
         2nd part to the problem. Folders were being created when "Show all" was pressed in the UI
      31504: Fix for ALF-9589 - Share - Advanced Search is not IE7 compatible for other themes
      31531: ALF-10324 Cannot disable Home Folder Creation
         There is a knock on effect to ContentUsageService when the user does not exist and we are not allowed to create missing users.
         Resulted in 2 DMDeploymentTargetTest failures
      31532: ALF-10955 No pooled task created for moderated site managers if any user requested to join
         Going with David Wards suggestion of still using getContainingAuthoritiesInZone with a null zone and a cut off at 100.
         The 100 might be too small, but probably is okay.
   31655: ALF-10187: Merged V3.3 to V3.4-BUG-FIX
      31180: ALF-9898: CIFS packet pool leaks
      - File state manager op lock break expiry thread was never getting started so some deferred packets were never getting released!
      - Synchronize around m_borrowed to prevent ConcurrentModificationExceptions in diagnostics
      - Synchronize around m_selector.keys() to prevent ConcurrentModificationExceptions during session reaping
      31244: Merged DEV/BELARUS/V3.4-BUG-FIX-2011_09_29_CIFS to V3.3
         ALF-10831: CIFS concurrency issues under load
            - Atomic synchronized write AND read operations in FileStateCache, TreeConnection, SrvSessionList, VirtualCircuit, VirtualCircuitList, ContentQuotaManager
      31245: Merged DEV/BELARUS/V3.4-BUG-FIX-2011_09_29_CIFS to V3.3
         ALF-9540: copy from drive to CIFS is slower than direct drive to drive copy by a factor of ~ 15
         - batchRemoveRequest added to ThreadRequestQueue, meaning that not all incoming packets are scatter-gunned across different worker threads and reducing context switching
         - Arseny's tests show that combined with 3.4.6 changes, the factor is now under 2!
      31246: ALF-9898: Merged HEAD to V3.3
         31154: Synchronize file writes from CIFS. ALF-10721.
         31233: Fixed a possible memory leak in the CIFS oplock timeout handler.
      31273: ALF-9540: Reversed batchRemoveRequest changes
      - Review by Gary. Thread pool may not be utilized properly when multiple virtual connections are being handled at once.
      31576: Changes to the CIFS idle session reaper so that it runs in the main socket event thread. ALF-9898.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@31657 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-11-02 23:22:24 +00:00
Andrew Hind
47b39283e2 ALF-9933: RSOLR 042: Add query support for new CMIS object ids
- Part 1: fix and test the old implementation (non opencmis)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30007 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-08-23 20:20:09 +00:00
Florian Mü
4b507ee7d8 OpenCMIS server refactoring
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@29544 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-08-04 08:50:53 +00:00
Derek Hulley
6ec3f44c29 Merged DEV to HEAD
- ALF-8806 RINF 41: Lucene Removal: Fix CopyService
     - ALF-9028: RINF 41: Fix Aspect cm:copiedFrom
   - ALF-9029 RINF 49: Lucene Removal: CheckOutCheckInService API
     - ALF-9032: RINF 49: fixes to cm:workingcopy aspect

   28996: Dev branch for De-Lucene work pending patches
   29004: Evaluator runs in read-only txn
   29006: Additional PermissionCheckedCollection.create method
          - Use an existing collection's permission check data (cut-off, etc) to wrap a new collection
   29007:
          CopyService and CheckOutCheckInService refactors to remove Lucene
          
          CopyService:
          
          Removed cm:source property from cm:copiedfrom aspect and replaced with a cm:original association.
          Added CQ-based APIs to query for copies
          Added APIs to support bi-directional walking of copy association
          Fixed sundry uses of cm:copiedfrom esp. all uses related to cm:workingcopy
          
          CheckOutCheckInService:
          
          Check-out now creates a source aspect cm:checkedOut with 1:1 relationship to cm:workingcopy via cm:workingcopylink
          Removed explicit use of cm:workingcopy aspect and replaced it with calls to COCI API
          
   29083: Audit tests fail when indexing is turned off.
          Also removed a getReader() call during rule evaluation, leading to a 'sub-action' read being recorded.
   29113: NodeDAO.getNodesWithAspects supports paging
   29135: Removed unused patch queries
   29139: Basic patch (still terminates with error) to upgrade cm:copiedfrom and cm:workingcopy
   29157: Tested patch for cm:copiedfrom and cm:workingcopy aspects


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@29159 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-07-19 03:22:11 +00:00
Andrew Hind
9f0ab3d127 ALF-8990: RSOLR 032: Model track and build from SOLR
- sort out SOLR per core analyzer properties
- required DD refactoring for loading these particular properties and not using I18NUtils as SOLR needs to over-ride the class loader used ....
- dictionary DAO now supports over-riding the default datatype behaviour (much easier to change the analyser properties file used)
- property added in repositoy.properties
   - lucene.defaultAnalyserResourceBundleName=alfresco/model/dataTypeAnalyzers
- models can define per property, class(type and aspects)  and model analysis behaviour by specifying an analyser bundle - see the data type model for model level config 
   - the same notation is used elsewhere
- SOLR and Repository config for this has to be kept in sync by hand - consider syncing these later

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28826 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-07-06 09:34:20 +00:00
Derek Hulley
1714397cac Changed metadata encryption to have a new dictionary type: d:encrypted
- Properties have to be encrypted and decrypted in code using MetadataEncryptor ('metadataEncryptor')
   - No conversion, encryption or decryption is done by Alfresco
   - Unencrypted values cannot be persisted and get thrown out
   - ALF-8646: RINF 38: Text data encryption
   - ALF-8956: RINF 38: Encryption key password specified by installer
   - ALF-9055: RINF 38: Support encryption against existing data


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28480 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-06-20 11:50:37 +00:00
Derek Hulley
f0f74b86f1 Merged DEV/SWIFT to HEAD
27600: ALF-8522: MyBatis: Performance: ensure <association> elements are properly keyed
   27608: RINF 09 / RINF 10: DB-based paged query for get children (DocLib & CMIS) 
          - update FileFolder paging API
          - update GetChildren canned query sorting (to return sort props prior to batched pre-load)
   27614: RINF 09 / RINF 10: DB-based paged query for get children (DocLib & CMIS) 
          - add missing file (and fix my SmartSVN ignore unversioned list ;-)
          - follow-on to r27608
   27621: RINF 11: Extended generalized CannedQueryDAO to support common selects
          - MyBatis resultset termination included
          - RINF 11: Integrate existing CannedQueryDAO (ALF-8417)
          - RINF 11: Canned queries (ALF-7167)
   27623: RINF 09 / RINF 10: DB-based paged query for get children (DocLib & CMIS) 
          - if total count not requested then can cut-off permission checks (based on max items) and instead set "hasMore" flag (if applicable)
          - now used by Share DocLib folder tree listing (on LHS) - see ALF-6570
   27636: RINF 09 / RINF 10: DB-based getChildren
          - improvements to treenode (push down sort by name, get subfolders with max 1, remove redundant max check) - re: ALF-6570
          - add default child assoc sort (if no sort requested)
          - minor tweak to getChildren CQ trace logging
   27641: RINF 11: Extended generalized CannedQueryDAO
          - add temporary MyBatis workarounds for ResultHandler-based queries
            --> support unlimited queries for nested results maps (MyBatis #129)
            --> clear cache to return results on subsequent calls (MyBatis #58 ...)
   27642: RINF 16: Ordered associations: Added NodeService.setAssociations
          - All reordering, deleting and adding node by NodeService impl.
          - ALF-7405 (ALF-7404 RINF 16: Peer association enhancements)
   27643: ALF-8183 SVC 01: I18N List of values constraint.
          Added ListOfValuesConstraint.getDisplayLabel(constraintAllowableValue) method which uses the usual I18NUtil methods
             to retrieve a localised display-label for the LoV constraint values.
          These can be added to resource bundles in the usual way using a key as follows:
             listconstraint.test_list1.ABC=ABC display where "listconstraint." is a fixed prefix.
             "test_list1" is the shortform QName for the constraint with colon replaced by underscore.
             "ABC" is one of the allowed values for the named constraint.
          The test case changes & the associated model & property changes should make things clear.
   27644: Test cases for ChannelService.createChannel and ChannelService.getChannels
   27645: ALF-8183. I18N LIST constraint.
          This check-in ensures that requests for a LIST.value display label for:
             a non-existent value returns null
             an unlocalised value returns the allowableValue String from the model (backwards compatibility).
   27651: Fixing compile errors caused by moving NodeLocator classes.
   27652: RINF 09 / RINF 10: DB-based getChildren CQ
          - replace direct use of "sqlSessionTemplate" with "cannedQueryDAO"(RINF 11)
   27657: RINF 09: GetChildren CQ
          - temp fix for cm:modified (when qname does not exist) - TODO review
   27666: Support for ALF-8594: RSOLR 039: SOLR sorting
          - sorting for all single valued types
   27671: Ignore virtual tomcat build
   27673: Projects core, datamodel and solr now explicitly list their library dependencies and no longer include the 3rd party project
   27681: Added pub:channelInfo aspect tows:webasset and ws:section.
          Also ws:website now extends pub:DeliveryChannel.
		  Added new behaviours to section and website to ensure the channel info is populated.
   27682: Added example SOLR config dir and instructions on how to set up - simple dev set up only subject to lots of change
   27685: Cleanup: Removed non-javadoc; Removed unused methods; Added @override
   27689: Update SOLR test instance dependencies
   27692: ALF-8183 SVC 01: I18N Lost of values constraint.
          Added code to the FormService's PropertyFieldProcessor so that the allowedValues for a ListOfValuesConstraint
		  have both the allowed value and its localised display label, if there is one.
          Added English property values for the bpm:allowedStatus constraint and also for the LIST constraint in the FDK.
   27693: WCM-QS ML work - Have the webscript return more details on the node and its parents,
          and begin to use this in the UI to allow you to create as well as manage translations
   27695: Workaround/fix for ALF-5747. Incompatibilities with OpenOffice 3.3
          It looks like OOo 3.3.0 shipped with a missing component. The ConfigurationRegistry, which is used to remotely query the
		  OOo version, was not implemented in 3.3.0 and therefore gives an ugly (and unavoidable) exception on OOo startup.
          There's not much we can do here, beyond getting users to upgrade their OOo install.
          I've added a catch clause that detects this problem and emits a slightly friendlier warning to the log.
   27720: ALF-8532: WPUB: F148: Foundation API: Request that a node be published to the live environment
   27727: Removed duplicates
   27734: WCM-QS ML Updates to handle marking a node as an initial translation, and a start on creating translations
   27735: Fixed generics warning
   27736: Added PermissionService.getReaders(List<Long> aclIds)
          - Support for ALF-8335: RSOLR 013: DAOs and remote APIs for ACL changesets (ALF-7072)
          - Also cleaned up empty javadoc
   27739: Implemented NodeFilters and NodeFinders for AbstractChannelType and ChannelServiceImpl.
   27741: RINF 09: GetChildren CQ - fix sorting - with unit tests (for default Share DocLib fields)
          - partial ALF-8638
          - ALF-8584 (follow-on for r27657)
   27746: Start on linking the WCM-QS ML ui and the forms service for creating the translation
   27747: Added --INCLUDE: directive to SQL scripts to allow importing of DB-specific snippets
          - ALF-8498: SVC 06: Property holding comment count for a node
   27748: Web scripts for ACLs and ACL readers
          - Unit tests at all levels (Webscripts, Service and DAO)
          - Tweaks to the DB queries to support index-based sorting
          - Support for ALF-8335: RSOLR 013: DAOs and remote APIs for ACL changesets (ALF-7072)
   27753: Fixed enum naming
   27754: Undo changes to ChannelServiceImplIntegratedTest made in 27739 that broke the build
   27762: Part I: ALF-7992: RSOLR 024: Locale support for query: SOLR
          - restructure and split localisation from generic query parsing
          - Lucene impl migrated and tested
          - No SOLR impl yet
          - Fix CMIS QueyTest 
          - Fix references for LuceneQueryParser mostly to AbstractLuceneQueryParser
   27763: Initial implementation of ALF-8498. SVC 06: Property holding comment count for a node.
          This check-in adds a rollup property to hold the commentCount (fm:commentCount under fm:discussable).
          It adds registered behaviours for fm:post deletion/creation that will decrement/increment the commentCount for the discussable ancestor node.
          I've also added a new test class to test this rollup property. There was no existing test class at this level and indeed there is no
		  CommentService or DiscussionService. Instead the REST API of comment.put.desc.xml uses the ScriptNodeService to create the correct node structure.
		  Therefore the test code has had to do the same thing.
   27766: Slight reimpl of ALF-8498. Moved the rollup property onto its own aspect.
          So now we have fm:discussable, as before, for generic discussions and posts (including Explorer comments).
          And we have fm:commentsRollup which is only for rolling up Share comments.
   27777: WCM QS ML Forms config and related tweaks to support having newly created nodes made multilingual where required
   27781: Add repository project dependency for test context and debug
          - fixes model issue with SOLRAPIClientTest
   27782: SOLR - move back to dynamic catch all field which seems to be working
          -> simpler build and model management
   27810: ALF-8405 SiteAspect needs to handle child types of Site as well as Site itself
   27821: ALF-7070: Fixed SOLRSerializer to handle residual properties (not in dictionary)
   27828: RINF 11: Canned Queries (CQ)
          - update API post review .
          - add underlying pageRequest/pageResult for single page (or max items if skip is 0)
          - add hasMoreItems (ALF-8470) and update unit tests
          - return total count range - accurate count (if lower=upper), approximation (lower<upper) or more than (lower known, upper unknown)
          - update option to request total count with max (if cutoff/trimmed then returns unknown upper count)
   27829: RINF 09: GetChildren CQ - paging support for FileFolderService list
          - update impl wrt CQ API changes (follow-on to r27828)
          - add factory method to return CQ with common params & update FileFolderService
          - update CMIS getChildren (AlrescoCmisService)
          - update scripting layer (ScriptNode, ScriptPagingNodes)
          - update Share DocLib (including doclist & treenode)
          - ALF-8641 - add proto (UI subject to review) to demo Share DocLib requesting max total count (eg. "Showing items 1 - 50 of 1000++")
   27837: Moving the pdfbox, fontbox, jempbox libs from 1.3.1 to 1.5.0, which adds various bugfixes.
   27838: Web scripts for ACLs and ACL readers
           - Simplification of paging API for ACLs
           - Support for ALF-8335: RSOLR 013: DAOs and remote APIs for ACL changesets (ALF-7072)
   27839: SOLR ACL tracking client code and tests
           - Support for ALF-8335: RSOLR 013: ACL changesets client APIs (ALF-8463)
   27844: Build fix. Making SiteServiceImplTest more tolerant of preexisting sites.
   27845: Build fix. Making SiteServiceTest more tolerant of preexisting sites in databse.
   27846: Build fix relating to ALF-8183. An extra test constraint requires an increment to a assertion expectedValue in this test.
   27849: ALF-8532: WPUB: F148: Foundation API: Request that a node be published to the live environment
           - Added more necessary interfaces and framework code
   27850: RINF 09: GetChildren CQ - update sorting unit test + fixes
          - nulls sort 'low'
          - fix multi sort props
   27858: ALF-8532: WPUB: F148: Foundation API: Request that a node be published to the live environment
          - Initial cut of persisting publishing events (not tested yet) 
   27861: WCM QS ML webscript work - fix some issues, and start on webscript unit test
          Also updates a failing test with details of why it's failing (switch from JSON to XML some time ago)
   27864: Fix context minimal tests - web publishing context is already included from the high level context, and shouldn't be in the core one
   27867: ALF-8184: SVC 02: Encode and decode of forms itemId should be done in the REST layer and not in each individual form processor.
   27868: Sample Adobe Illustrator files from Linton, for use in testing future metadata/transformer support
   27869: Fixed ChannelServiceImplTest failures.
   27870: Created JBPM process definition to publish scheduled Publishing Events.
   27872: Sample Adobe Illustrator 3 file (PS not PDF based) from Linton, for use in testing future metadata/transformer support
   27874: OpenCMIS update
   27875: Change the Tika auto transformer to register aliases of mime types, as well as the canonical ones, for when Alfresco uses the alias
   27876: RINF 11: Permission checking in canned queries (ALF-8419)
   27877: RINF 39: Optimise GetChildren CQ for unsorted maxItems (ALF-8576)
   27878: RINF 09: Update FileFolderService - all list methods should use GetChildren CQ (ALF-8733)
   27882: ALF-8532: WPUB: F148: Foundation API: Request that a node be published to the live environment
          - Unit test for the publishing package serializer/deserializer 
   27885: Change order of publishing context so it comes after transfer service context. 
   27886: Fix for ALF-7992: RSOLR 024: Locale support for query: SOLR
          - d:mltext, d:text. d:content
          - phrase, term, prefix, wild, ranges, fuzzy etc
          - localised tokenisation
          - consistent tokenisation for cross language support ( phrase, term, prefix, wild, ranges, fuzzy etc)
          - CMIS related stuff to be tested later
   27897: Minor tweak to prevent repeated gets of the default locale when writing properties
   27900: WCM QS ML webscript tests
   27905: Fixed PostgreSQL HeartbeatTest: WorkflowDeployer was checking for read-only server too late
   27906: Remove unused imports
   27907: Used common SQL snippets for DB2 node inserts.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28319 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-06-09 21:14:18 +00:00
Derek Hulley
2f697cebb9 Merged DEV/SWIFT to HEAD
26373: WIP: ALF-7339: RSOLR 009: Index track and build from SOLR
          - track content, track dates, basic sorting
   26388: WIP: ALF-7339: RSOLR 009: Index track and build from SOLR
          - basic tracking of d:text and d:mltext (not dual tokenisation and identifier support)
   26527: WIP ALF-7339: RSOLR 009: Index track and build from SOLR
          - track d:content, d:mltext, d:text
          - start of cross locale search and ordering support int the index (not at query time yet)
          - no dual tokenisation support yet - currently adding all fields for tokenized BOTH
          - .sort needs additional tokenisation support to use a different separator (\u0000 used to indicate locale and split stuff - better toe use {en}woof style with \u0000 split
   26822: ALF-8166: RINF 10: treenode.get.js - tweak to use "childFileFolders"
   26825: ALF-8133: RINF 10: ScriptNode - update "childByNamePath" to use optimised NodeService.getChildByName
   26850: ALF-8133: RINF 10: ScriptNode - update "childByNamePath" to use optimised NodeService.getChildByName
          - follow-on to r26825
   26862: ALF-8110: RINF 10: doclist.get.js - update "path" filter to use DB-based queries (by default)
          - milestone check-in for review and comparison (note: sorting will be pushed down as part of paging support in lower layers)
   26872: Updated SOLR dev env
   26915: ALF-8224: part 1: encapsulate cmis dictionary for SOLR usage
   27017: Javadoc: removed uncommented param
   27018: Added 'namePattern' property to NamedObjectRegistry to enforce naming conventions where required
   27019: CannedQuery interface and related infrastructure
           - Provides basic support for query, sort, filter and page
           - CannedQueryFactory allows more complex implementations where required
           - Should be enough of a starter for tasks requiring miscellaneous queries
           - ALF-7167: Canned queries
   27037: WCM QS Needs the Web-Client, so define the dependency to Eclipse
   27041: Move WCM-QS test setup to a common base class
   27044: Start to conver the WCM QS behaviour from JS to Java
   27080: Added comment section for NodeLocator script declarations
   27081: General cleanup: Removed non-javadocs, empty javadocs, unused code, etc
   27104: Fixed ALF-7476: Typo in output from MMT
   27114: ALF-7479: RSOLR 016: Query Handler
          ALF-7480: RSOLR 017: SOLR result set
          ALF-7481: RSOLR 018: Execute query against SOLR
          - First working stack

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28286 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-06-08 15:38:14 +00:00
Derek Hulley
e118211bd3 Merged DEV/SWIFT to HEAD (FTP Tests, Tika and Poi)
26059: ALF-5900 - IMAP creates winmail.dat in attachment folder (Add support for Microsoft Transport Neutral Encapsulation Format.)
          - added attachment extraction for TNEF documents - goodbye winmail.dat !
   26063: javadoc for imap.
   26088: ALF-7408 - addition of commons-net for ftp client library.
          First test of end to end ftp.   Just a simple test of connection now, will be followed by more detailed tests.
   26176: ALF-7408 - FTP tests + disabled failing test case for ALF-7618
   26180: ALF-7618 - correction of unit test error.
   26188: ALF-7618 - added a test of paths
   26229: Added back simple '\~.*' pattern
   26288: ALF-7676 - Test to stress different user rights.
          - FTPServerTest.testTwoUserUpdate added for the FTP server.
   26304: Corrected spelling name in private class.
   26408: addming minimal package infos.
   26416: ALF-5082 / ALF-2183 / ALF-4448 - When guessing the mimetype for a file, add the option to supply a ContentReader to enhance the accuracy.
          Enable this for a few key places that do mimetype guessing,
          which should avoid issues for files with the wrong extension (either renamed accidently, or for .TMP)
   26433: Re-order the mimetype guess step to ensure that the Content Reader is always valid
   26440: Added another test for word 2003 save as.
   26441: Test resource for ContentDiskDriver
   26446: ALF-5082 - Back out a FileFolderService change to mimetype guessing, which had broken things, pending a better way to do it with ContentWriter
   26490: Small change for ContentDiskDriverTes.fileExists.  Leaky transaction causing problems in automated build.
   26497: ContentDiskDriver - commented out two of the problematic leaky transaction tests.
   26503: Add new interface methods + documentation for asking a ContentWriter to guess the mimetype and encoding for you.
          (Code will be migrated from places that currently do this themselves later)
   26504: Add an extension interface in the DataModel project for some of the extra ContentReader methods that FileContentReader provides
   26505: When ContentWriter.putContent(String) is called with no encoding specified, record what the system default encoding was that was used.
          (Prevents issues if the system default is ever changed)
   26509: When calling Tika to do file detection, if we have a file based reader then give Tika the File rather than an InputStream
   26522: More debug logging while debugging ALF-5260
   26546: Have one copy of the Tika Config in spring, rather than several places fetching their own copy of the default one (either explicitly or implicitly).
   26522: More debug logging while diagnosing ALF-5260
   26548: Add another mimetype check - ensures that truncated/corrup container files which can't be fully processed can still get the container type without failure
   26549: Implement the mimetype and encoding guessers on ContentWriter (either immediately or as a listener, as required), and update FileFolderServer to make use of this (+test this)
   26553: Replace explicit mimetype and encoding guess calls with ContentWriter requests to have the work done
   26554: Replace explicit mimetype and encoding guess calls with ContentWriter requests to have the work done
   26579: Switch the transformer to use Tika

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28224 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-06-07 07:36:37 +00:00
Derek Hulley
00b8f4a002 Merged DEV/SWIFT to HEAD
25458: added OpenCMIS server
   25555: Don't initialize servlet context if it is not present


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28000 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-05-24 02:23:57 +00:00
Dave Ward
5346073135 Merged V3.4-BUG-FIX to HEAD
25384: ALF-5352 - user usages
   - re-apply r19862 (ALF-713 fix) that was lost (probably due to merge conflict)
   25440: Merged DEV/TEMPORARY to V3.4-BUG-FIX
      25232: ALF-4300: DB2: Review schema (eg. VARCHAR columns) with respect to multi-byte support (when using DB2 / UTF-8)
      25371: ALF-4300: DB2: Review schema (eg. VARCHAR columns) with respect to multi-byte support (when using DB2 / UTF-8)
      - All VARCHAR fields quadrupled for DB2 relative to MySQL to support UTF-8 character sets
      - ‘varchar-field-sizes-quadruple-increasing.sql’ introduced by patch
      - Minor conflict anticipated on AlfrescoSchemaUpdate-2.1-A--to--2.2-ACL.sql; ensure larger column size is kept.
      - Schema number now at 4201.
   25444: Fix ALF-6689: WQS: Incorrect work of email field on contact page
   Fix ALF-7058: WQS: Blog article page of custom type gives an error
   25447: Fix ALF-5198: WQS: Error while Name field filled with more than 70 characters or special characters
   25506: ALF-6281: Actions for folder do not work (Quickr connector plug-in)
   25534: ALF-646: Alfresco Logo isn't displayed in SPP Open window
   25590: Merged DEV/TEMPORARY to V3.4-BUG-FIX
      25582: ALF-6282: Incorrect behavior of Propertiesa
         - Add "Created", "Modified" and "Label" tags to document/folder entries in AlfrescoAtomBasedFeedServiceImpl.createEntry()
   25595: Merged DEV/TEMPORARY to V3.4-BUG-FIX
      25592:ALF-7194: Saving a Excel file with CIFS reset permissions.
         - Copy value of "Inherit Parent Space Permissions" flag to the new node in ContentDiskDriver.cloneNode() method.
   25635: Merged DEV/TEMPORARY to V3.4-BUG-FIX
      25574: ALF-6288: Action 'Send Link' is not worked
      25616: ALF-6288: Action 'Send Link' is not worked
         - AlfrescoQuickrPathHelper.getNodePath() method was modified to return full node path, e.g. "/Company Home/Sites/TestSite/documentLibrary/test.odt".
         - AlfrescoQuickrPathHelper.removeSlashesAndRoot(String value) method was renamed to AlfrescoQuickrPathHelper.resolveNodePath(String path, boolean isRelative).
   25638: Merged DEV/TEMPORARY to V3.4-BUG-FIX (with feedback from Gary)
      25376: ALF-684: Ftp requests to the IPv6 resolved hostname are failing
         The ftp.ipv6.enabled property was removed, and a ServerSocket is opened without InetAddress parameter. It allows Java to determine if a IPv6 is used and bind "::" any local address to the server socket. It allows to connect to the Alfresco FTP using both IPv4 and IPv6 addresses regardless to server OS.
   25639: ALF-5115: Removed circular dependency from non-continuous builds
   - No need to use -f continuous.xml anymore when building enterprise or community
   - Added assemble-command-extras stub to community build.xml, overridden by enterprise build.xml and called by continuous.xml
   25699: MERGE DEV to V3.4-BUG-FIX
     ALF-5745 : AVMTemplateNode d:date properties are wrong.
   25770: Investigation tests for ALF-6904: Wrong behaviour when overriding a constraint in content model
   25774: Fixed ALF-7193: XAM Connector: xam.archive.nodePropertiesToWrite must not make properties mandatory
    - The property had to be set to null - achievable because it is MLText
    - Added full d:mltext expansion
    - Added double checks for nulls creeping in
   25851: Fixed ALF-7381: OOM when Debug logging on ReferenceCountingReadOnlyIndexReaderFactory
    - Use a WeakHashMap
   25853: Merged DEV/TEMPORARY to V3.4-BUG-FIX
      25852: ALF-6373: Preview isn't generated for content added by quickr
         Added AlfrescoQuickrDocumentHelper.getMimeType(NodeRef fileRef) method that resolves the mime type using the node name.
         Set the mime type of nodes created in AlfrescoDocumentServiceImpl and AlfrescoAtomBasedFeedServiceImpl.
   25860: Resolve ALF-7286: CMIS UP link for document doesn't contain all parents
   25866: Fix for ALF-6312
     - moved configuration to the correct file to be picked up by Spring Surf
   25870: Merged DEV/TEMPORARY to V3.4-BUG-FIX
      25840: ALF-6279: Failed to save properties in Symphony documents.
         AlfrescoDocumentServiceImpl.setDocType() method was modified to check for existence of document type in provided ClbDraft object.
   25908: Set 3.4.2 revision
   25931: Fix for ALF-6565: Explorer UI allows duplication of Replication targets which in effects breaks Alfresco
   25987: DOC-238: Sharepoint (VTI) Protocol Configuration Documentation is outdated - have added comments in the properties file to indicate what they do
   25994: WQS: Added a little more information to the log message when a 404 is returned
   26003: ALF-7663: NPEs when using PermissionService with AVM stores
   - added unit tests for regression testing
   - no longer an issue
   26004: ALF-7662: AVM permissions - access denied exception when trying to create file in a layered directory, when no explicit permissions set (on root dir node)
   - test passes on 3.4.2 - updated test to reflect 2.1 state
   26011: ALF-6372 Now when the package manager adds items to a package it does not mark the items as modified.
   26026: ALF-6350: Add support for Ideographic Space to the Full Text Search -
   - added full set of Unicode characters for letters and digits (0x0000 - 0xFFFF)
   - added fill set of Unicode whitespace
   - class to generate Unicode types -> ranges
   - upgraded antlr to 3.3. (required to resolve 3.2 bug)
   - fixed Lexer and parser test 
   - much still depends on the tokeniser ....
   26048: Fix for ALF-7507 - Manage Deleted Items - Recover All Icon Missing
   26050: Fixed failing tests WorkflowFormProcessorTest and TaskFormProcessorTest.
   26068: Resolve ALF-7342 - dynamic Models - unable to add new properties to an aspect if the aspect is a mandatory aspect of another aspect
   26082: WQS: Improved debug-level logging to track WQS-to-repo interaction better.
   26094: Some formatting
   26095: Fixed ALF-7531: alfresco.jgroups.bind_interface is not taken into account
    - Added 'bind_interface' property to TCP config
    - Value injected into system properties: alfresco.jgroups.bind_interface
   26130: Fix for CIFS multitenancy not working. ALF-6816.
   Need to search the global share list for admin named pipe shares.
   26131: Fix for CIFS cut/paste write-protected error. ALF-1822
   26132: Solairs/NFS ReadDir issue, cannot list folder more than once. ALF-5386
   Search resume id/cookie value of zero has special meaning for NFS.
   26133: Changed FTP return status for MKD command to 257, for RFC compliance. ALF-7501.
   26136: Fix for FTP CWD-MKD-CWD sequence failing. ALF-7530
   Trim filesystem path to make sure there is no trailing backslash.
   26144: Merged V3.4 to V3.4-BUG-FIX
      25890: Fix for ALF-5796 - It's impossible to add tag in Japanese language (IE specific)
      25891: Fixes: ALF-7363 (updated JA translation)
      25894: Fixed Legal and License url in About dialog
      25896: ALF-6476 -translation on Transfer Target configuration
      25899: First cut of French transfer properties.  Mostly English! but has 3 lines of French.
      25900: Fix for ALF-6916: More Deployment Reports action causes an error
      25901: Fixes: ALF-6847 (Italian Translation)
      25902: Fixes: ALF-6861 (incorrectly encoded German character)
      25904: Fixes: ALF-6755 (translation quoting error)
      25911: Fixes: ALF-6478 - French translation correction
      25913: Fixes: ALF-6334 and ALF-6477 (Profile Edit style issues - makes mark up consistent, clears floats to allow for foreign languages being a tad more verbose than English and adjusts padding to help input boxes line up.
      25914: Help URL for 3.4 enterprise docs
      25915: Updates TinyMCE translation as requested in ALF-6486.
      25916: Updated support URL in readme
      25917: Fixes: ALF-6482, wrong word order in FR has been corrected.
      25919: Fixes: ALF-6655 updated to allow enough space for verbose languages (e.g. FR, ES)
      25925: Fix for ALF-6885: alfresco-enterprise-3.4.0.zip package has 2 issues with apply_amps.sh
      25936: ALF-6469 - transfer folders internationalized
      25941: Merged BRANCHES/DEV/dwebster/ to BRANCHES/V3.4:
         25939: Latest JA update from Translators, received: 2011-02-28
      25943: Merged BRANCHES/DEV/dwebster/ to BRANCHES/V3.4:
         25942: Language updates for property string changes and additions between 3.4.0 and 3.4.1
      25946: ALF-7191: Generate duplicate _en resource bundles, using location of _fr bundles as a guide for ALL bundles under alfresco and share WEB-INF/classes
      25947: ALF-7191: Reverse accidentally committed changes to WebDAV in 25946!
      25949: Fixes: ALF-6521 and ALF-6493 (Site discussion's handling of tags with special characters in them)
      25950: Fixes: ALF-6489 - encodes the content's name to make it safe for a URL.
      25951: Fixes: ALF-6487 Adjusts styling for rename panel
      25954: ALF-7191 - Generate _en bundles for all message bundles for Explorer and Share - using known location of message bundles
      25956: Allow a bit of leeway with audit timing during delete tests
      25957: Fixed ALF-7341: Upload performance degradation when uploading contents to folders with content rules applied.
         - Action executions were being recorded by the ActionTrackingService for all actions
         - Post-commit updates of the action node was reducing performance
         - Added 'trackStatus' to ActionExecuter, ActionDefinition and Action
         - Default 'trackStatus' is false; exceptions: 'replicationActionExecutor' and 'commit-transfer'
         - Adjusted tests accordingly
         - General cleanup around modifications
      25964: ALF-5625 - When viewing properties in version history hitting close results in loop
      25970: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V3.4:
         25967: Fix ALF-7440: WQS: commons-pool library has been upgraded, but WQS build properties have not been changed accordingly
      25971: ALF-7441: Help URLs pointing to new doc system (1 of 2)
      25972: ALF-7441: Help URLs pointing to new doc system (2 of 2)
      25974: Reverted rev 25964 - as fix is scheduled for 3.4.2
      25979: Disabling intermittent failing unit test. ALF-7443 logged.
      25980: Merged V3.4-BUG-FIX to V3.4
         25978: ALF-7394 - Alfresco Network dashlet, now Alfresco Support information
      26014: ALF-7087 - Cannot override webscript files in case of using jboss 5.1GA
      26024: ALF-7466 - Links do not appear correctly in the management Console (RM)
      26036: ALF-6403: Merged V3.4 to V3.4 (lost revision)
         25627: Fixes ALF-7222: Updated linux installer window height (with taller image to hide additonal background)
      26039: Fix intermittent failures in InviteServiceTest.tearDown()
      26040: Fix intermittent failures in InviteServiceTest.setUp()
      26043: Sync up run-junit-test with junit macros so that it can be used to run unit tests in an enterprise environment (e.g. DB2 / Oracle)
      26044: Possibly fix intermittent TransferServiceImplTest failures by using org.alfresco.repo.transaction.RetryingTransactionInterceptor
      26052: Do not wait indefinitely for a heartbeat in HeartBeatTest. A broken heartbeat would cause the build to hang forever!
      26056: Merged V3.4-TEAM to V3.4
         26053: Added in loop to wait for asynchronous post-failure auditing (ALF-3055)
      26077: Upped LOGFILSIZ to avoid failures in unit tests with large transactions on DB2
      26084: Avoid intermittent test failures in AbstractTestFormRestApi by using retrying transactions
      26096: Correction to DB2 drop / create commands
      26097: Fixes: ALF-7102, typo in property string.
      26100: Merged V3.4-TEAM to V3.4
         25985: Another cycle of fixing installer from Win builds.  Still waiting for official fix from Bitrock.
         26067: Fixes for installer builds on Windows
      26102: Attempt to avoid intermittent failures in TaggingServiceImplTest by upping wait time
      26109: Another go at executing the db2 creation statements synchronously through db2cmd
      26111: ALF-6764 - Copyright year on Share login page out of date
      26127: Merged V3.4-TEAM to V3.4
         26120: Fix postgres.bki on Win builds
      26142: Merged PATCHES/V3.4.0 to V3.4
         25999: ALF-7377: Validate and reject partial WebDAV requests sometimes produced by NetDrive
   26145: Merged V3.4 to V3.4-BUG-FIX (RECORD ONLY)
      26143: Merged PATCHES/V3.4.0 to V3.4
         26005: Merged V3.4-BUG-FIX to PATCHES/V3.4.0
            26002: ALF-7282 Updated NodeListConverter so that it now implements the method revert(Object, ProcessDefinition)
   26153: Fix for CIFS concurrent folder listing returns wrong list of files. ALF-6385.
   Synchronize the VirtualCircuit.allocateSearchSlot() method and put a marker object in the allocated slot so it does not get reused before the real search is put into the slot.
   26156: Merged /BRANCHES/DEV/BELARUS/V3.3-2010_12_20 to BRANCHES/DEV/V3.4-BUG-FIX:
      24902: ALF-5985: Users with an apostrophe in their username cannot cancel their own workflow no action button shown
   26177: ALF-6686 - DOCLIB - add 'add-default-resource' as enhancement.
   26181: Fix for ALF-7179 - NPE on Check in action when define lockable aspect as mandatory.
   26182: ALF-3145 - Caller of CopyBehaviorCallback.getCopyProperties should ensure modifiability of properties map  
     - Copy Service was already done.   Merged similar changes to CopyBehaviourCallback.
   26185: ALF-7238 - Value for $fieldHtmlId changes after metadata refresh
   26196: Fixed ALF-3383: range slider does not honor xs:fractionDigits
   26202: ALF-6947: RM LOV Constraint values are not returned in alphabetic order
   
     * RM list of values are now shown in the UI as ordered
     * this can be overridden in the constrant definition but isn't exposed in the admin UI
   
   26206: Fixed ALF-6538 "My Tasks Dashlet needs to use Page URL" (code contribution from Jeff Potts)
   26211: Fixed ALF-1289 "Search for groups on "Add Group" form works incorrectly"
   26213: Fixes ALF-6697: Updates to flash and html uploaders to prevent files named with (Windows) illegal characters from being uploaded
   26220: Fixed CopyServicePolicies javadoc
   26221: Fixed ALF-4926: Incorrect behavior of update and move rule for the same folder
    - Pulled rule-specific code out of FileFolderService
    - Added detection for new nodes and renamed nodes in current transaction
    - New nodes will only fire inbound properties, renamed nodes won't fire outbound, etc
    - Added in coverage tests:
      - testCheckThatModifyNameDoesNotTriggerInboundRule
      - testCheckThatModifyNameDoesNotTriggerOutboundRule
      - testUpdateAndMoveRuleOnSameFolder
    - Requires regression tests of ALF-4846 and rule-based test cases
      - Inbound, update and outbound have to be respected for all clients
   26222: Confirmed 3.4 fix presence for ALF-5001: cm:name uniqueness check can fail if the property is not set
    - Unit test the condition
    - Checked that code now uses the node UUID as a cm:name substitute
   26228: Test fix after rev 25770 for ALF-6904
   26232: Fixes ALF-6697: Improved error handling for HTML uploader
   26236: Fixes ALF-6697: Re-use forms validation logic
   26237: Build fix for lexer tests (character encoding issues on build box + using unfixed antlr test environment for one test)
   26244: Merged BRANCHES/DEV/BELARUS/V3.3-2011_01_18 to BRANCHES/DEV/V3.4-BUG-FIX: (with modifications)
      25071: ALF-1846: Workflow validation is not perfomed when tasks progression are requested
   26259: Fix for ALF-7520: Upgrading from "old permission model" to "new permission model" (DmPermissionsPatch)
   - include generic patch to fix up permission inheritance issues 
   Probable work around for ALF-7453: ACL Propagation issue for large number of users/ACLs
   26276: Unit test fix for ALF-4926: Incorrect behavior of update and move rule for the same folder
    - Content update trigger now ignores nodes that are created in the same transaction
   26277: Fix for ALF-7636, the onLoggedOut function was being called directly rather than an event being triggered, which made it impossible for plugins to use the event.
   26278: Fix ALF-7568: Thumbnails should not go into the trash can
    - For 3.4: Just the content model setting for cm:thumbnail
    - Relates to TEAM rev 25038
   26283: If we're not doing action tracking during execution and completion, then don't do the pending step either (ALF-7341)
   26284: ALF-5998 - German language pack error in Explorer - Incorrect layout of Manage Task button in My tasks component in alfresco explorer
   26285: Hopefully avoid intermittent failures caused by either slow machines (by ensuring locks are held during slow execution), and fixing up the action tracking parts of the test (broken by ALF-7341 changes)
   26286: ALF-5889 - Italian translation errors in Explorer and Share - Aspects
   26299: Fixed ALF-6289 "Contributor is absent in Permissions section at the details page"
   26305: ALF-7264 - Improve error messages when there are no valid email addresses to send an email too (avoids a null pointer, instead gives a helpful one), and also a provisional fix for @localhost email validation (pending a proper fix via VALIDATOR-292)
   26308: ALF-6073 - *.docx document is displayed on all views (Document List portlet)
   26309: ALF-7532 - Content Rule on RM site (other than Folder) creates 'GUID' folder in Share
   Note: Fixed on Team, but along with many other unrelated fixes; hence not merged directly.
   26311: Fixed ALF-7162: Bulk import NPE
   26317: ALF-5560 - Incorrect behaviour on import.
   RM FilePlan now tolerates (but does not render) non-RM content which was causing the original issue.
   26318: Fixes ALF-7321: Ensure that WCM and Share groups don't appear as options in Repository web-client start workflow wizard for group and pooled review workflows
   26327: Merged V3.4 to V3.4-BUG-FIX
      26158: Merged DEV/TEMPORARY to V3.4
         26154: ALF-7571: Create Web Project wizard - Step 3
            Superfluous “cellpadding” elements were removed. Missing space was added.
      26164: ALF-6885: Changed svn:eol-style from native to LF for all .sh scripts
      26165: Merged V3.4-TEAM to V3.4
         26161: Fix full installer.
      26178: Merged DEV/TEMPORARY to V3.4
         26172: ALF-7601: 3.4.1 SDK WebServiceSamples multiple problems
            Configuration properties for WebServiceSamples was moved to correct place.
            Dependency to SDK AlfrescoEmbedded was added to classpath. It is required for FileCopyUtils from Spring which is used in WebServiceSamples.
      26190: Reversed 26165 / 26161 - breaks installer building
      26192: Convert TaggingServiceImplTest to use retrying transactions!
      26194: ALF-7045: AVM upgrade - re-implement AVM "rename duplicates" patch as a DB upgrade script
      26195: Update installer overlay files
      26197: Final installer updates - built and tested on OSX
      26199: Allow relocatable data for postgres - part2
      26204: Attempt to avoid intermittent unit test failures in RecordsManagementAuditServiceImplTest by adding some Thread.sleep() calls to allow for asynchronous audit behaviour
      26207: Set site notification to false on install (ALF-6181)
      26212: Merged DEV to V3.4
         26203: ALF-7605 PostgreSQL: Upgrade from 2.1.7 to 3.4.1 is failing - constraint "alf_access_control_entry_acl_id_key" does not exist
             1. The statements which are drop constraints, marked as optional
             2. The alter statements with new constraint names were added
      26245: Added OOo port number configuration
      26256: Fixes ALF-7679: Remove webscript-framework-config-custom.xml file
      26270: License updates from Ashutosh
      26274: Fix intermittent unit test failure with retrying transaction
      26275: Possible fix to intermittent test failure.
      26295: Reduce scope of retrying transaction, in a hope of fixing TaggingServiceImplTest.testOnStartupJob()
      26303: And the prize for the largest number of retrying transactions in a single unit test goes to...
      26307: Fixes: ALF-7704: Japanese language option not appearing in dropdown box on log in page.
      26314: Another defensive sleep() in RecordsManagementAuditServiceImplTest
      26325: Moved defensive sleep() in RecordsManagementAuditServiceImplTest
   26329: Resolved merge issue in TaggingServiceImplTest
   26332: ALF-7499: DOD5015 PublishUpdatesJob is not resilient to missing nodes
   
   26337: Build fix - Added checks for new "sorted" parameter on ListOfValuesConstraint
   26338: ALF-6004 - Verisonable aspect applied to content in Web Quick Start does not result in version information being exposed
   26341: ALF-5394 Fixed issue where pooled actors (users not groups) were not working properly.
   26352: Removed svn:mergeinfo
   26357: ALF-5369: Disposition errors when importing FilePlan which includes custom event
   
   * missing events are now created with the information available
   * prevents exception when browsing imported file plan
   * TODO make sure sufficient information is stored in the export file so that events missing can be correctly recreated
   
   26358: Found and fixed javascript error/bug when date-picker was used in form w read-only="true"
   26360: Fixed ALF-5980 "Language pack errors in Share - Incorrect layout on Manage permissions page"
   26362: Fixed ALF-5894 "Italian language pack in Share - Incorrect layout of My Profile dashlet"
   26367: MERGE SWIFT to V3.4 BUG-FIX for ALF-5125  word offfice 2007 creates permanent temporary files on 3.2.2.1, and possible wrong ownership
     26001
     26081
     26208
     26216
     26261
     26315
     26339
   26370: MERGE DEV To V3.4-BUG FIX
     26342 : ALF-5125 - word office 2007 creates permanent temporary files on 3.2.2.1, and possible wrong ownership
   26382: Using predefined statics and neatening
   26387: ALF-4101: Blog Archive filter has duplicate dates
   26396: Fix for ALF-7834: CLONE -ACL Propagation issue for large number of users/ACLs
   - final part of fix for locking ACL changes (avoid simultaneous changes to the ACEs associated with an ACL)
   26397: ALF-7823 - CIFS shuffle looses "mime type" of attachment.
   ALF-7670 - MS Word 2003 'Save As' to CIFS in a folder with a rule 'extract common metadata' does NOT extract the metadata
   26398: Fixed ALF-6384 "Share - 'Insert Image Library' function in WIKI not working properly in IE8"
   26407: Merged V3.4-2010_11_29 to V3.4-BUG-FIX
      24159: ALF-413: Incorrect notification is displayed on Manage deleted items page when deleting an item that is already recovered
   26412: Fix for ALF-4400: Share Search - Not Finding Document When Search Uses More Than One Tag in the Search Criteria
   - added TAG field - UI no longer has to do ugly query build and TAG is part of the default macro
   - Fixed unreported AND OR precedence issue and added grouping
   26424: Fix for ALF-7795: Greater than (>) operator does not work with untokenised String properties in CMIS Query
   - fixed with issues will be resolved in SOLR/SWIFT
   - any term starting with { (used to encode locale) will be excluded from the range.
   - range queries not supported for urls ....
   26449: Fixed ALF-5385 "Unable to edit groups on ts.alfresco.com"
   26454: Fix for ALF-7852:  Query consuming all heap and receiving an OOM exception
   - missing close on TermDocs and TermPositions
   26460: ALF-634, ALF-7103 Externalized the JBPM Config location, so it can now be set as a property in repository.properties.
   26470: Fixed ALF-7744: Ensure that new options.limit gets set when updating RSS feed results
   26479: ALF-6533 - GROUP_EVERYONE is a special group, so when looking up the members to send an email, we need to call a different authority service method to get everyone
   26484: ALF-7715 - Switch from the old Ant ZipFile to the new Commons Compress one, which supports the new file encoding zip extension
   26488: ALF-7192 - Invitation code should support subtypes of Site in addition
   26489: ALF-7192 - Update the Browse Bean and Site Aspect policy to support subtypes of Site
   26493: ALF-7192 - When handling permissions and roles on sites, allow for sites which are a subtype of the default site type, rather than only supporting SiteModel.TYPE_SITE. (Unit test to follow)
   26499: Fixes ALF-6415: Ensure that labels on installer radio buttons doesn't flow outside the window
   26511: Merged DEV to V3.4-BUG-FIX
      26406: ALF-7680: Check out of document allows users to create Working-Copy into Spaces where they do not have write access
             - Unit tests for ALF-7680 and ETHREEOH-535 were added. 
      26442: ALF-7680: Check out of document allows users to create Working-Copy into Spaces where they do not have write access
             - If destination folder for working copy is the same as the parent folder of the source node then working copy should be created even if the user has no permissions to create children in the parent of the source node. The following logic was added for Check Out operation to apply it:
             - if the target folder node is the same as the parent folder of the source document then working copy is created using 'System' user
             - if the target folder is a different parent, then working copy is created using current user. 
   26515: Partially fixes ALF-5774: Set correct Japanese date formatting on Repo Web Client summary panels
   26529: Fix for ALF-6722 MT: Cancel workflow button isn't available for tenant users
   26533: Fixed ALF-6563: Can't properly expose categories or associations on AWE forms
   26534: Added correct source files for jbpm-jpdl-3.3.1
   26535: Updated disabled testAsynchronousTaskExecutes as part of investigation into ALF-6405
   26537: Fixed ALF-7927: Script error on Step 3 of Create Web Project Wizard - IE6/IE7
   26540: ALF-7192 - Add unit test for custom site type
   26559: Merged DEV to V3.4-BUG-FIX
      26547: ALF-7528 : JSF - Edit online with Office 2010 causes the document mimetype to be lost
             - PutMethod was modified to use only guessed mime type for documents and completely ignore the Content-Type header from client.
   26560: Fixes ALF-7931: Ensure checkboxes render correctly in IE6 for forms and replication job
   26565: ALF-7232 - remove temporary (unit test) debug from log4j.properties
   26566: Add a couple more site service checks for roles
   26568: Fixes: ALF-7950 - escaped apostrophe
   26576: Fix for: ALF-7996: Error when applying patch.fixAclInheritance
   - removed having clause for nasty where clause - hopefully optimised out ....
   26580: Fixed ALF-7915 "Cannot delete rules created with check-in perform action."
   26591: ALF-7995 - Repo tier web script get dataLists returns rule folder. Also fixed incorrect folder path rendering on non-Site rules page and removed reference to non-existent file.
   26598: Add notes on if Transformers can be converted to Tika or not, and if not why
   26601: Fixed ALF-7804: XAM: Long paths cause 'org.snia.xam.InvalidArgumentException' when XAM aspect is applied
    - Path-generation truncates the first characters to leave only 512 in the path
    - Added catch and WARN on failure to write properties to XSet (rather than fail)
    - Added log4j config for XAM
   26603: Fixes: ALF-868 - IE Bug.
   26604: Fixes: ALF-6486 - L10N bug in width of TinyMCE's dropdown lists not accommodating longer phrases in other languages. Width is now fluid
   26606: Fixes: ALF-7397 - Removed repeated chars in JA dates that include long names for days of the week.
   26611: Upgrade POI and Tika for ALF-7959
   26612: Add test file from ALF-7959, tweaked to include the "Quick" text, and with the original user details munged
   26613: Fix up unit tests after Tika upgrade for ALF-7959
   26618: ALF-7959 - Convert the Outlook MSG text converter to using Tika, which fixes encoding problems
   26628: Merged PATCHES/V3.1.2 to V3.4-BUG-FIX
      26626: Merged DEV/TEMPORARY to PATCHES/V3.1.2
         26400: ALF-607: Rules not firing on subspaces
            Execute RuleServiceImpl. getRules(), RuleServiceImpl. getOwningNodeRef(Rule) and RuleServiceImpl. getOwningNodeRef(Action) methods from System User.
   26630: Merged HEAD to V3.4-BUG-FIX
      26620: Modified to allow for multiple mime-types for Alfresco 3.3+. Related to ALF-4027.
      26629: ALF-4027: Kofax Binaries corresponding to 26620
   26650: Merged SWIFT to V3.4-BUG-FIX
      26093: Workaround to the fact that the Solr classpath has got too large to include on a Windows command line! (32K)
   26683: ALF-8045: VersionableAspect now properly resolves the namespaces of the QNames registered with excludedOnUpdateProps
   26684: Resolve ALF-7515: CMIS operation getObjectRelationships() is not spec compliant
   26689: Change the status code for the CIFS Trans2QueryPath response when the file does not exist.
   Possible fix for ALF-6727.
   26691: Merged DEV/TEMPORARY to V3.4-BUG-FIX
      26681: ALF-1871: FileLink and FolderLink items do not appear in WebDav
         Modify PropFindMethod to show file/folder links and return href of original node.
         Modify GetMethod to allow browser deal with file/folder links.
   26692: Merged DEV/TEMPORARY to V3.4-BUG-FIX
      26558: ALF-7910: It's impossible to delete folder with accentuated letter via IMAP from Outlook 2010
         Call "AlfrescoImapFolder sourceNode = getFolder(user, oldMailboxName);" before decoding oldMailboxName in ImapServiceImpl.renameMailbox() method.
         Update JavaDoc in AlfrescoImapService.
         Add testRenameAccentedMailbox() test.
   26693: Merged DEV/TEMPORARY to V3.4-BUG-FIX
      26544: ALF-7911: Cannot contribute via IMAP if another user with only Consumer permissions has logged in first
         Dynamically check readOnly in AlfrescoImapFolder.isReadOnly() method.
   26694: Merged DEV/TEMPORARY to V3.4-BUG-FIX (with corrections)
      26343: ALF-6945 Failed Kerberos SSO auth returns HTML web page with wrong text/plain MIME type
         Setting content-type to text/html added for page used for failed Kerberos and NTLM authentications.
   26695: Resolve ALF-7538: CMIS AtomPub: Not possible to retrieve associations defined via an Aspect.
   26696: ALF-6132: Correction to handling of optional elements by Pavel
   26701: Fixes ALF-8064: Ensure Windows installer respects manual service startup selection
   26706: Resolve ALF-7759: MTOM is not enabled for all CMIS Web Services
   26713: Resolve ALF-7994: Custom behavior is not triggered when creating content via CMIS
   26717: Resolve ALF-6848: CMIS Rest: Properties Filter Parameter incorrectly functioning.
   26720: Fix ALF-7977: Webform validation on change is always passing
   26726: ALF-7086: Root folder has wrong Allowable Actions
   26727: Resolve ALF-6266: Incorrect exception thrown when deleting a non-existing document (web-services binding)
   26728: WQS: Performance enhancements. Local max throughput increased from 11 PIs/sec to 24 PIs/sec with 15 concurrent users (CPU utilization dropped from 100% to 70%)
   26729: ALF-8045: Fix VersionServiceImplTest
   26735: Merged DEV/TEMPORARY to V3.4-BUG-FIX
      26725: ALF-3919 : WCM - JSF does not return an appropriate warning when creating content with ' ; ' character
         1. The AVMNodeConverter class was modified to allow ';' character usage in web content names.
   26736: Merged V3.4 to V3.4-BUG-FIX
      26411: Fixes: ALF-7292 and ALF-7289, removes "· " from after Web and before Alfresco.
      26413: Fixes: ALF-7765 - ensures naming consistency
      26414: Fixes: ALF-7697 - Rewording the URL help text on the create site dialogue
      26417: Fixes: ALF-7414, confused and hardcoded date-formatting & date formatting translations fixed.
      26610: Fix for: ALF-8007: Lucene index not coherent or not up to date or we can not rely on it to check that a working copy exist.
   26739: ALF-8085 - DMDeploymentTarget uses System.out
   26748: ALF-7929: Script error on Web Form Details window - IE6/ IE7
   - Fix up to CHK-10095 reviewed by Kev
   26749: ALF-7557: Display full paths of categories in Explorer (reviewed by Kev)
   26751: ALF-8079: NPE in ContentDiskDriver
   26754: Fixes: ALF-2984. parseInt octal bug, so forcing dec.
   26761: Merged V3.4 to V3.4-BUG-FIX (RECORD ONLY)
      26760: Merged V3.4-BUG-FIX to V3.4
      26759: Merged V3.4-BUG-FIX to V3.4 (3.4.2)
   26762: ALF-8028 ResultSet not closed in TransferServiceImpl2
   
   try...finally pattern was added to search operation.
   
   26764: Further fixes to teh patch for:  ALF-7834: CLONE -ACL Propagation issue for large number of users/ACLs
   26765: ALF-634, ALF-7103: Possible fix to JBPM regressions introduced by r26460
   26788: Further fixes to the patch for:  ALF-7834: CLONE -ACL Propagation issue for large number of users/ACLs
   - fix type that would have missed a minor error (for unused shared ACLs)
   26815: ALF-5500: Support site subtypes in SPP
   26863: Merged DEV/TEMPORARY to V3.4-BUG-FIX
      26853: ALF-3792: Copy Access Should Be More Restrictive
         Checking permissions for “Copy” was added action.
         Security settings for FileFolderService.copy operations were made more strict for Alfresco and RM.
   26890: Merged HEAD to V3.4-BUG-FIX
      26856: Fixed ClientInfo is null in sessionLoggedOn event. JLAN-121.
      26867: Fix for wildcard search handling returning dot and dot-dot file entries. ALF-4960.
      26868: Fix for wildcard search handling returning dot and dot-dot file entries, repo filesystem. ALF-4960.
      26888: CIFS path broken when ß (German sz) char is in folder name. ALF-7186.
   26909: AVMRepository: add missing error info - report store name (if not found)
   26934: Fixed ALF-6532: Upload new version fails in Share (checkout) when using ContentStoreSelector
    - Includes investigative tests from DEV rev 26902
    - Fixed safeCopyContent to cater for first-time setting of property where content is already in new store (copy operations)
    - Tested XAM use-case as well
   26996: Fix for ALF-8229. patch.webSiteAddModerated upgrade error.
     Trivial fix sanctioned for check-in on 3.4.2 by SteveR.
   26997: Undoing accidental check-in of eclipse project files changes.
   27045: Change to CIFS session setup exception processing as per ALF-229.
   27069: ALF-3871: Global properties now visible through JMX
   27108: Merged PATCHES/V3.3.3 to V3.4-BUG-FIX
      27107: ALF-8388: Merged PATCHES/V3.3.4 to PATCHES/V3.3.3
         26894: ALF-7237: Further diagnostics for maxChecks and maxCheckTime
   27110: Merge DEV to V3.4-BUG-FIX
     26859 : ALF-6546 - JCR export fails when node has a null property value
   27116: ALF-8190 - Minor version labels non-intuitive
      now the minor version will start at 0.1 rather than 1.0
   27121: Fixed ALF-8307: Audit query template in 3.4.0 should quote key values for application and username
   27332: Follow on test corrections from the fix to ALF-8190.
   27508: Merge Dev to V3.4-BUG-FIX
     27153 :  ALF-5496 Commenting on a Space creates an Empty Folder via CIFS
   27575: Merged DEV/TEMPORARY to V3.4-BUG-FIX
      27070: ALF-4954: when cookies are disabled, Share enters into a loop, Explorer outputs a java.lang.NullPointerException exception, Firefox
         1. SSOAuthenticationFilter and login page for Share application was modified to handle lack of cookies in a manner web-client do that.
   27586: Ignore default build directory for virtual server
   27587: Fix for ALF-8188: Share - Search returns no result when using special characters
   - not really a bug .... added implementation to support \u0000 style encoding in the parser but not the impl
   27590: Merged DEV to V3.4-BUG-FIX
      27147: ALF-7979 : Metadata extracters should log a warning/error when type conversion of field values fails
             1. Adding additional logging for type conversion failure during metadata extraction.
      - Additionally removed some false TODOs and fixed generics in class
   27593: Fix for: ALF-7827: CMIS Contains does not support TEXT, ALL, d:content etc as would be expected
   - added to match Alfresco FTS
   27595: Fix for: ALF-8073: Property value not stored in Lucene index if stored=true and tokenized=false
   - if stored is selected the value will be stored in the plain property entry
   27599: Merged V3.3 to V3.4-BUG-FIX
      27130: Merged DEV/TEMPORARY to V3.3
         27129: ALF-8141: Using the copy/move action causes the Path QName to change to 'copy' or 'move'
            MoveActionExecuter:
            Remove PARAM_ASSOC_TYPE_QNAME and PARAM_ASSOC_QNAME(Also remove it from classes that use them).
            Use FileFolderService for move operation.
   
            CopyActionExecuter:
            Remove PARAM_ASSOC_TYPE_QNAME and PARAM_ASSOC_QNAME(Also remove it from classes that use them).
            Use CopyService with original assocTypeQName and assocQName(Don't use FileFolderService here because it doesn't respect deep copy flag).
      27155: ALF-8141: Fix up unit tests plus RESTful calls to RuleService
   27601: Fix up unit tests following merge of ALF-8141
   27604: Fix for ALF-7738: Hyphen not handled correctly in cmis-alfresco search for Aspects/types : " no viable alternative at character 'a' "
   - query names are now escaped where required
   27613: Upgrade Tika and POI for ALF-7978
   27618: ALF-1813 Fixed security issue where tasks could be edited by a user who did not have acess tot he task.
   27637: Merged DEV/TEMPORARY to V3.4-BUG-FIX
      26965: ALF-8258: sharedLockTokens property duplicated many times
         Changed LockInfo.sharedLockTokens from LinkedList to HashSet because in RFC "Lock token URIs MUST be unique across all resources for all time.", and therefore sharedLockTokens should contain non-repeatable values.
   27662: ALF-8549: activities.getFeedControls() does not return a scriptable object in Javascript
   - also fix REST call (/api/activities/feed/controls) to return JSON
   27663: Perf improvement: cache User Feed Controls (for generator job run)
   - note: activity feed controls are not currently exposed via Share UI
   27668: ALF-8413: Share Feed Generator on Oracle generates NPE (when commenting in repo view)
   - fix NPE (note: in general Share does not post activities outside of site context + feed generator is currently based on site members)
   27669: ALF-8549: activities.getFeedControls() does not return a scriptable object in Javascript
   - quick test fix for PostgreSQL (follow-on from r27662)
   27697: ALF-8581: User activities are displayed twice in My Activities dashlet (in cluster env)
   - add cluster job lock service (SLNG-770)
   27776: ALF-8581: Reverted changes to FeedGeneratorJob
   27806: Merged DEV to V3.4-BUG-FIX
      27793: ALF-8351 : JBPM Tables in Oracle missing index on Foreign Keys leading to table Locks
             1. Sql script that creates indexes for foreign keys in jbpm tables was implemented.
                This script synchronizes jbpm indexes with mysql version. 
      Merge changes: Changed 4.0 references to 3.4; Incremented schema number.
   27808: Fixed ALF-7510: Share - Workflow 'due date' field date validation doesn't work properly
   27811: Fixed ALF-6179: WebDAV has problems if username contains spaces
   27812: Partial fix for ALF-7032: Alfresco doesn't escape special XML characters in AtomPub
   27815: Switched to use ?xml instead of ?html in partial fix for ALF-7032: Alfresco doesn't escape special XML characters in AtomPub
   27825: ALF-8489 Fixed issue by removing inappropriate 'requiredApprovePercent' field. 
   27852: Fix for ALF-7845 index.recovery.mode=AUTO doesn't rebuild avm index
   - applied provided patch
   27857: Fix for ALF-868: Large Table Data causes TinyMCE to drop below Alfresco Footer in Web Form - IE7 only
   27860: Fixes: ALF-2199 Errors in CSS files.
   27866: Fixes: ALF-1327 - truncation issues in the calendar.
   27881: Fixes bug in Chrome introduced with r27866
   27898: CIFS on Windows fails to start under certain conditions. ALF-8723
   27901: Merged DEV to V3.4-BUG-FIX
      27891: ALF-7421: An opensolaris NFS client cannot see folders renamed using the web UI after two minutes.
             NFS server cache updating policy handler was implemented:
             - NfsServerNodeMonitor.java’ – new policy handler for NFS server;
             - NFSServerBean.java’ was modified to configure implemented node monitor with NFS server instance during server start up;
             - file-servers.properties’ was expanded with new properties for new node monitor which allows controlling node monitor 'enabled' state;
             - file-servers-context.xml’ was expanded with bean configuration for new node monitor and with configuration for NFS server bean to accept newly configured node monitor bean;
             - ShareDetailsHash.java’ was modified to externalize hashtable of the cache;
             - NFSServer.java’ was modified to externalize its cache for public access 
   27902: ALF-8744 - Untransalted strings in Recent shapshot
   27903: Fixes: ALF-5717 Issues with non i18n/L10N Data List form fields.
   27922: Fixes: ALF-8726 by back porting some Team usability fixes. *Do Not Merge*
   27923: Fixes: ALF-8429 - Replaces hard coded English tooltip with a pre-existing i18n string.
   27929: Fixed ALF-8768: Wrong path in comment for wcm-bootstrap-context.xml
   27938: Partial Fix for: ALF-8720: Adds missing spaces.
   27940: Merged V3.3 to V3.4-BUG-FIX
      27851: Fix for ALF-8476:CLONE -Query consuming all heap and receiving an OOM exception
         - actually fixes stack overflow with skipTo when there are lots of deleted docs in an index in a row (<10000 on the default settings)
   ----
   Modified : /alfresco/BRANCHES/DEV/V3.4-BUG-FIX
   Modified : /alfresco/BRANCHES/DEV/V3.4-BUG-FIX/root/projects/repository/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneTest.java
   Modified : /alfresco/BRANCHES/DEV/V3.4-BUG-FIX/root/projects/repository/source/java/org/alfresco/repo/search/impl/lucene/FilterIndexReaderByStringId.java
   
   27942: Merged V3.4 to V3.4-BUG-FIX
      26772: Fix for ALF-7843 - Created via SPP all-day event displays incorrectly
      26775: Fix for ALF-3374 - Reverting a file in workflow causes a Successful error message
      26778: Fix message Failed to find I18N message key: reset_categories for locale: en_US
      26781: Fix for ALF-6488 - LangPack FR - [Site's Wiki] Renaming a wiki's page - special chars handling
      26783: Fixed ALF-7421: An opensolaris NFS client cannot see folders renamed using the web UI after two minutes.
       - De-Hibernate DAO refactor missed implementing 'system.enableTimestampPropagation'
       - Set 'system.enableTimestampPropagation=true' in alfresco-global.properties
       - Timestamps will be written to immediate parent folder and will therefore not drop out of the filestate cache after 2 min
      26785: Services-layer fix for ALF-8036. Incorrect permissions copied when copying folder with permissions from one site to another.
      
      UI will have to make changes in the UI layer in order to use new Services methods, thus completing the fix.
      
      This check-in adds support in the SiteService for moving and copying site-contained nodes. New move/copy methods are available in the Java Foundation API and in the JavaScript API which mimic the signatures of those in the NodeService and CopyService respectively. These methods simply delegate to the back-end services and so behaviours should be the same as before if they are used in place of the node and copy service methods. With one exception:
      The SiteService wrapper methods detect when the relocated node has been copied/moved between two different Share sites and clears permissions from the relocated node (and its primary descendants) that refer to the previous site.
      
      This has not been implemented using policies/behaviours as we can't bind the behaviour to any particular content class. Nodes of any type could be copied/moved between sites.
      26787: Removed erroneous import from StreamContent - incorrect dependency on de.schlichtherle.io.FileOutputStream
      26803: Fixes: ALF-8138, adds a i18n property for a ToDo list's attachment title.
      26806: Fixed ALF-8154: Shorten the node path as prefix-only path
       - Use Path.toPrefixString instead of Path.toString
       - Provides improved fix for ALF-7804
      26824: Fixed ALF-7012: WCM - Schema error "xs:enumeration full" select button group shows "Please select..."
      26832: UI-layer fix component for ALF-8036 and a refactoring of the Services-layer fix component.
        Rather than add various facade methods to the SiteService for all the copy & move variants in NodeService, CopyService, FileFolderService etc, I have added a single new method to the SiteService cleanSitePermissions().
        This removes all out-of-date site permissions after a node has been moved or copied to a new site.
      
        Also changed the slingshot action webscripts for move-to and copy-to to call this cleanUp method.
      26838: Rewording a misleading code comment. Related to ALF-8036 changes.
      26847: ALF-6727: File server protocols don't report the read only attribute for folders unless new configuration setting filesystem.setReadOnlyFlagOnFolders is true
      - Default is false
      - On windows, the read only attribute doesn't mean the folder is read only - it means "this folder has been customized - please fetch a desktop.ini".
      - This results in poor performance for non-admin users due to lots of secondary fetches for configuration information.
      - See the bug for more details.
      26855: ALF-6727: Missing files from last check in
      26858: Merged V3.4-TEAM to V3.4
         26841: Fix for ALF-1044. (Searching for groups whose names contain regex reserved chars.)
            The fix was to add [] as reserved chars to the RegEx SimpleLanguageDef. Thanks AndyH.
      26860: ALF-7101 and ALF-7866 - don't show the rules options to collaborators, as they shouldn't be able to create/manage rules
      26861: Merged DEV/TEMPORARY to V3.4 (with corrections)
         26157: ALF-1544: Server won't start on JBoss: Unable to resolve drag and drop application as a file, class path resource [alfresco/desktop/Alfresco.exe]
            DesktopAction uses Resource’s InputStream for drug-n-drop files representation.
      26870: ALF-6727: Fix up ContentDiskDriverTest
      26898: Fix ALF-8219: Deploying WQS in the same container as Alfresco causes startup to stall
      26899: Possible installer build fix
      - uncomment project.readmeFile
      - set failifexecutionfails="true" on installer build targets so we know if installer building failed!
      26900: ALF-8180: The installer shouldn't randomly delete a directory called tomcat that it didn't create
      - Fix provided by Bitrock
      26919: Backing out 3 changes related to ALF-8036 due to uncertainty over fix approach.
        I'm reverse-merging revisions 26785, 26832 and 26838 out of this 3.4.2 branch.
        The fix version for ALF-8036 has been changed to 3.4.3 and so we don't want an unfinished fix on 3.4.2.
        In fact, this fix may be finished, but there is some uncertainty now over the approach to adopt (strip permissions vs. prevert copying of permissions).
        This fix will go to Team and 3.4.3 instead.
      26932: Fixed a couple of non-unicode French characters that were messing up my scripts and:
      Merged BRANCHES/DEV/dwebster/ to BRANCHES/V3.4:
         26911: Latest updates from translators (based on rev26710)
      26944: ALF-3569 - Alfresco repository CIFS driver not setting timestamps.
      26952: Finishes the completeness tests & fixes several L10N bugs.
      26972: Fixes ALF-8272: Alfresco cannot be started after fresh install
      26980: ALF-8287 - All buttons are disabled on Data Lists page.
      27039: Merged BRANCHES/DEV/dwebsterV34 to BRANCHES/V3.4:
         - Update from Translators (based on r26837).
      27059: Merged PATCHES/V3.4.1 to V3.4
         26959: ALF-8261: 3.4 JSF performance regression introduced by WebProjectServiceImpl.hasWebProjectsRoot() (ALF-3085)
         27020: ALF-8281: CLONE -'Move To' operation for categories, folders and records doesn't work ESCALATION
      27061: Merged PATCHES/V3.3.4 to V3.4
         27032: ALF-8289: Merged DEV to PATCHES/V3.3.4
            27028: ALF-8289: Occasionally, web form complains of missing required fields when the fields are indeed populated
      27068: Merged DEV to V3.4
         27067: ALF-3774 : Unable to disable listening on port 7500 (JGroups)
                1. DummyProtocol was changed to rewrite default configuration.
                   This changes turn off diagnostic probing for DummyChannel.
      27071: Fixed ALF-8363: BadSqlGrammarException during patch.fixAclInheritance on Oracle
       - Using '... = true' does not work for Oracle.
       - Replaced with parameterClass="boolean" and #trueOrFalse#
       - Tested against limited dataset so some condition paths might be missed.
      27083: ALF-8124: Corrected ${} placeholders in Japanese installer strings
      27088: Fixed ALF-8377: Generic KeywordSearch is not resilient to stale Lucene indexes
       - Cleaned up PersonSearchTest
       - Added exists check to KeywordSearch
       - Rationalized related bean declarations
      27113: Fixed ALF-1322 "Creating user with username containing spaces works incorrectly"
      27127: ALF-8346 - 'Complete event' button for folders is disabled in IE
      27136: Installer string updates from Gloria
      27173: Fix for: ALF-7834: CLONE - ACL Propagation issue for large number of users/ACLs
      - manually fix up the cache when changing inheritance
      27503: Fix for ALF-8345 - Extra icons on the form of adding translation without content(IE specific)
      27504: Fix for ALF-6917 - A system error happens when user attempted press toggle 'Version History'
      27505: ALF-6215 - French Language pack - It's incorrect layout in Document List component
      27509: ALF-8451: Port AVM-rename-dupes.sql to DB2 and SQL Server
      27511: ALF-7165: User with contributor role cannot view content
      27512: Installer string updates from Gloria
      - Corrections to msgid Installer.ReadmeFile.View
      27557: case sensitivity issues with terminfo database building from Windows
      27563: Merged DEV to V3.4
         27558: ALF-8408: Impossible to upload a new file by contributor to subspace when rule is applied to subspaces
                Retrieving of rule was surrounded in RunAs(System username) block.
                It allows to retrieve rule node and its actions if user has no read permissions to rule node
                and to rule's actions.
                JUnit test "PermissionsForPropagatedRules_ALF_8408" was added.
      27602: Fix for ALF-5625 - When viewing properties in version history hitting close results in loop (V3.4.2)
      27622: ALF-5607: Remove bundled postgres data directory on installation abort on Linux
      27639: Fix for ALF-6488 - Decode HTML content before creating page url argument for wiki
      27647: Fix for ALF-8552
      27672: ALF-8553: PatchService didn't recurse on dependents of already applied patches
      - Hence patch ordering was wrong on V3.4 upgrade
      27684: ALF-8553, ALF-8602: set batchMaxQueryRange on patch.fixNameCrcValues-2 to avoid OOM
      27687: Merge DEV to V3.4
        27674 :  ALF-8453 CIFS Failed to save versionable MS Word content as collaborator
      27690: Merged DEV/TEMPORARY to V3.4
         27688: ALF-7822 : AVM projects unavailable after upgrade to 3.4.1
            script was modified to prevent data corruption
      27775: Fixes ALF-8654: Add removed quotes back into .po files
      27805: ALF-2935: Properly control RMI port in Bitrock installer
      - order repository-properties before shared-properties so that you can specify the port in alfresco-global.properties if you want to
      - include a tokenized alfresco-shared.properties in the WCM installation files
      27807: Merged V3.4-TEAM to V3.4
         27756: ALF-8207 - ALL LANG - Themes are not translated
      27840: ALF-8687: No items display for series when opening it from library list
      
      27853: Fixes: ALF-7465 - Removes some of the differences between the Add Event and Remove Event dialogues & reuses existing TagLibrary component to avoid conflicts.
      27856: ALF-8687: No items display for series when opening it from library list.
      Slight refactor to better match non-RM doclib code.
      27871: Fixes ALF-8124: Ensure Spanish locale for installer shows product name correctly
      27932: Fixes ALF-5519: alfresco-enterprise-wcmqs-3.3.3.zip does not contain awe.war
       - Added awe.war to WQS zip file
   27944: Merged V3.4 to V3.4-BUG-FIX (RECORD ONLY)
      26766: Merged V3.4-BUG-FIX to V3.4
         26761: Merged V3.4 to V3.4-BUG-FIX (RECORD ONLY)
            26760: Merged V3.4-BUG-FIX to V3.4
            26759: Merged V3.4-BUG-FIX to V3.4 (3.4.2)
         26762: ALF-8028 ResultSet not closed in TransferServiceImpl2
            try...finally pattern was added to search operation.
         26764: Further fixes to the patch for:  ALF-7834: CLONE -ACL Propagation issue for large number of users/ACLs
         26765: ALF-634, ALF-7103: Possible fix to JBPM regressions introduced by r26460
      26831: Merged V3.4-BUG-FIX to V3.4
         26788: Further fixes to the patch for:  ALF-7834: CLONE -ACL Propagation issue for large number of users/ACLs
            - fix type that would have missed a minor error (for unused shared ACLs)
      27016: Merged V3.4-BUG-FIX to V3.4
         26996: Fix for ALF-8229. patch.webSiteAddModerated upgrade error
             Trivial fix sanctioned for check-in on 3.4.2 by SteveR
         26997: Undoing accidental check-in of eclipse project files changes
      27859: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/V3.4:
         27857: Fix for ALF-868: Large Table Data causes TinyMCE to drop below Alfresco Footer in Web Form - IE7 only


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@27948 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-05-21 10:41:57 +00:00
Dave Ward
4ef5672f4a Merged V3.4 to HEAD
23336: Created a branch for 3.4 Enterprise releases
   23344: replaced some un-neccessary non latin chars in variable name.
   23347: Fix ALF-3200 - add a policy to Sites, which stops renames occuring (renames breaks things as the name is used in various association patterns). Includes unit tests
   23349: Merged BRANCHES/DEV/BELARUS/HEAD-2010_03_30 to BRANCHES/V3.4
   20198: ALF-2176: Incorrect pagination for resources on Advanced Workflow Wizard
   The javascript onkeyup event was changed to onkeypress event in UIDataPager. 
   It prevents a form submission before js action.
   23351: ALF-5109 transfer service : replace content results in "orphans exist" failure.
   23352: New (currently disabled) unit test to check that multiple threads writing to different properties via the node service on the same node don't loose updates. Test disabled pending caching fix
   Also tweak the tagging multi threaded test (currently disabled) to make it try a few more tags in parallel
   23366: Audit method interceptor switches to pass-through if the server is read-only (ALF-5424)
   23375: Fixed ALF-2825 "Display problem on Rules page when rule has a long description" & more
   - ALF-2825 "Display problem on Rules page when rule has a long description"
   - Made drag and drop adjust the "empty space" to the dragged elements height
   - $html alias was missing on linked to folder page after a previous merge
   23376: Fix for  ALF-5401: CMIS: When specifying "cmis:objectTypeId=Dyz" in the WHERE clause, nodes of subtypes of x:yz are also returned
   - now only returns the specific type
   - unit test included
   23377: Merged V3.3-BUG-FIX to V3.4
      23353: Merged DEV-TEMPORARY to V3.3-BUG-FIX
         20930: Fix ALF-2564 "MS office addin does not work with kerberos and cifs". Also added to Excel and PowerPoint add-ins (supplied fix was for Word only).
   
   Also updated help URLs to Enterprise.
   23378: Fix ALF-4786: Update the Web Editor Help URL for 3.4 Enterprise Beta and Enterprise
   23380: Fixes:
   - ALF-5431	WQS: latest blog article component throws an exception if the description field is empty
   - ALF-5426	Using double-quotes in either the title or description of an asset collection causes an error
   23381: Fixed ALF-4702 "The 'Most Recently Completed Task' area should also include a Completed By: label"
   23382: Made sure "empty list message" gets padding in object-finder's "list" mode
   23383: WQS: Merged CSS fix from HEAD
   
   $ svn merge https://svn.alfresco.com/repos/enterprise/alfresco/HEAD
   --- Merging r23336 through r23382 into '.':
   23384: Fix for: ALF-3164 rename LuceneQueryLanguageSPI.executQuery(..) to executeQuery
   23385: Fix for ALF-5166: After restore of indexes - AUTO hangs
   - bulk deletes are now handled as such during index tracking and rebuild (as they are normally)
   23388: Merged V3.3-BUG-FIX to V3.4
      23387: Merged V3.3 to V3.3-BUG-FIX
         23370: Fix ALF-5277: Excel 2007 xlsx icon not displayed in Alfresco Explorer.
            Re-Merged V2.1 to V3.3
               6464: Added Office 2007 document mimetypes and icons
         23386: Fix ALF-5427: ALF-2639 causes Edit Online button in Share to only handle http not https
   23389: Fixes:
   - ALF-5211	Error on search with wildcards
   23390: Fixed ALF-4835 "Incorrect behaviour of Cancel action"
   23392: Partly fixed ALF-4678 "Incorrect workflow details if creator or assgnee was deleted"
   - If the assignee has been deleted the username is still displayed (but only as text and not as a link)
   23394: Fix for ALF-2780 - Share/Surf don't invalidate Alfresco tickets
   23396: Removed direct System.err output in ArchiveContentTransformer
   23399: Fix ALF-4321: use of Ajax technology in share leeds to a stuck interface as ajax code does not handle end of sessions cases when using CAS (external) authentication
   23402: Fixed ALF-5456: IP address change can cause read-write errors on startup
    - Simply avoid writing in a read-only transaction
   23411: Added web-tier cluster sample config (ALF-3873 related)
   23412: Fixes ALF-5373: Duplicate date displayed at end of summer time.
   23413: Fixes: ALF-4924 by displaying more data about an event in the Dashlets if the event doesn't finish on the same day, or is an all day event.
   23415: Merged V3.3-BUG-FIX to V3.4
      23414: Fix for ALF-5414 - IE6 specific fixes
   23417: Added a unit test to JbpmEngineTest while investigating ALF-1557. Test is commented out/disabled as it relies on a specific process definition that might be added to the list of available process definitions int he main app.
   23418: Fix for ALF-5451 - Typo in webclient.properties
   23420: Merged V3.3-BUG-FIX to V3.4
      23419: Fix for ALF-4533 - corrected list of email templates shown - other issues mentioned CNR
   23422: Fixes: ALF-5374 - add support for displaying events that span multiple months.
   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)
   23425: Fix for ALF-5256 - Change Password link under user's name pulldown in 3.4 shows when using AD authentication
   23441: Fixes: ALF-5267 - CSS Background colour for current day was getting lost in the Month View, due to a style overriding it with a paler colour that wasn't much of a contrast to the usual colour.
   23442: Fixed bug ALF-4988 and also fixed several disabled unit tests.
   23444: Re-enabled and fixed some failing/disabled tests in AbstractRenderingEngineTest.
   23447: Temp comment out new TransferServiceImplTest with greek paths.
   23459: Fixed failing RenditionServiceIntegrationTest.testRenditionPlacement()
   23461: ALF-5224: Edit Online action doesn't work for invited coordinator
   
   23462: Fixing failing test RenditionServiceIntegrationTest.testRenditionPlacement().
   23468: Merged V3.3-BUG-FIX to V3.4
      23463: Merged V3.3 to V3.3-BUG-FIX
         23323: Fixed PostgreSQL upgrade from V3.2.2 to V3.3.4 (Addresses ALF-5344)
   23472: Fixed ALF-5408: SQL Server missing ON DELETE CASCADE declarations
   23479: ALF-2643 - Deployment Service does not protect itself from poorly implemented custom DeploymentTargets
   23489: Fix for ALF-4214 allowing generation of Thumbnails using RuntimeExecutableTransformationOptions. Note that this fix does not pass any execution options specified in the thumbnail definition to the content transformer, instead default transformation options are used.
   To fix this we will either need to define a new RenderingEngine type or modify the ReformatRenderingEngine to become aware of RuntimeExecutableTransformationOptions.
   23492: Fixed ALF-5550: DB2: Unable to insert values into alf_string_value
   23506: Merged V3.3-BUG-FIX to V3.4
      23500: Merged V3.3 to V3.3-BUG-FIX
         23499: Additional change after fix for ALF-5403 to ensure Session is not created before login page auth is successfully processed
   23507: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.4:
      23504: Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.3-BUG-FIX:
           23297: Fixed ALF-5146: Share - Content model issue with 'dot' in a property name
   
   Also added tests for a property with a dot in the name to the FDK.
   23508: Fixed ALF-5559: Permission interceptors can fail if Lucene returns invalid NodeRefs
    - Problem is present when the 'unfilteredFor' property is added to 'afterAcl' bean
    - Reproduced specific issue with unit tests and found several other failures
    - Currently only affects installations that include the DOD5015 module
   23512: Fixed ALF-5192: Pivot translation isn't changed after modifying
   23513: Merged DEV to V3.4
     23511 : ALF-4200 IMAP - LSUB failed. Access Denied
   23516: Added a test to test_renditionService.js to confirm RenditionService.render() is working properly.
   23519: Merged V3.3-BUG-FIX to V3.4
      23518: Merged V3.3 to V3.3-BUG-FIX
         23517: Fix for ALF-5552 - Search based javascript APIs now handle missing nodes returned from search indexes.
   23521: Fixed ALF-5529 "Incorrect behavior of tab stop indexes at Edit Metadata page for images"
   - ...also makes date text selection work for date field after tabbing to it, enter strokes trigger help and calendar, focus outline being displayed on icon and focus being returned after calender select  
   - ...also fixed bug in advanced search form for date range (the hidden field was never set if from/to values were cleared)
   23526: Fixed ALF-4299: NodeService: review comment vs code for setting unique name on child assoc
   23530: Fix for ALF-5482: "Some patches are not being executed during an upgrade"
   23531: ALF-5272: Update rule works incorrecly
   
   23539: Partial fix for ALF-439: "My Completed Tasks" dashlet doesn't scale in the presence of large numbers of completed tasks
   
   Added ability to limit the result set size of a workflow task query so it can be used by the UI to limit the number of completed tasks shown in the dashlet.
   23542: ALF-4993 : prevent transfer to self.
   23544: Updated to latest revision, following updates required for ALF-4655 (IE8 CSS issues)
   23546: Fixed ALF-5501 "W3C : Incorrect tab stop indexes at Start workflow page"
   - Alfresco.util.createYUIButton now also handles enter keys when menu is used
   - Fixed bug when forms are loaded using ajax (the help toggle didn't work)
   23547: Made keyboard events possible in advanced search menu
   23549: Merged BRANCHES/DEV/BELARUS/HEAD_2010_10_06 to BRANCHES/V3.4:
      23210: ALF-4378: Lotus Quickr connector does not work with IBM Lotus Symphony
   23550: Merged BRANCHES/DEV/BELARUS/HEAD_2010_10_21 to BRANCHES/V3.4:
      23443: ALF-5098: SPP Module creates documents using the wrong mimetype (Octet Stream)
   23551: Merged BRANCHES/DEV/BELARUS/HEAD_2010_10_21 to BRANCHES/V3.4:
      23474: ALF-5490: The Subsystems configuration folder does not seem to be read when Alfresco is deployed to later versions of JBoss
   23552: Merged BRANCHES/DEV/BELARUS/HEAD_2010_10_21 to BRANCHES/V3.4:
      23543: ALF-5402: mailService bean should not set username or password properties when mail.smtp.auth is false
   23554: Fix ALF-5170 - when you don't have permission to change a user's password (either because you're not an admin, or you mis-typed your own password), give a friendly message rather than an error stacktrace
   23558: Fixed ALF-5513 "Incorrect behavior of tab stop indexes at Create Site page"
   23559: Fixed ALF-5136 "My Tasks dashlet: Incorrect capitalization on mouseover text"
   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.
   23571: Improvements to missing page and general server 500 error handling in Share.
   23572: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.4:
      23570: Resolve ALF-5355: ClassCastException on server side when calling SCORE() predicate (web services binding)
   23573: Fix for ALF-4840: Create Job button is enabled when Start Date isn't specified
   23580: ALF-3586 Verified that RenderingEngine Actions are not displayed as available actions in Share and Exporer. Now publicAction defaults to false for all RenderingEngine actions, so future RenderingEngines should be hidden in the UI by default.
   23582: Fixed (Explorer) ALF-439 "My Completed Tasks" dashlet doesn't scale in the presence of large numbers of completed tasks
   23584: DateTime analysis related fixes:
       Fix for: (ALF-4056) Content with DateTime property with the time set to 00:00:00.000 will not be found in lucene search when search is run from 00:00:00 to 23:59:29 for the same date.
          - bug generating range query start queries
       Fix tests and test models
       CMIS and normal query tests all run with the date and  datetime analysers configured for datetime properties
       Fixed unreported issue with CMIS range queries for dates when using the date time analyser
   23585: Fixed ALF-5372 "JavaScript error on Groups management dialog with IE8 : document.getElementById is null"
   23590: MERGED V3.3 to V3.4
   23545: Fixes: ALF-6568 - Broken images caused by missing URL Rewrite rule. Updated existing rules from ** to (.*) following earlier bug fix.
   23591: Probable fix for ALF-4440. Renditions are not updated for working copy.
     As suggested in the issue, we have relaxed the restriction such that working copies now have their renditions updated in the normal way. Therefore, updates to draft (working copies) in Quickr should now cause (asynchronous) updates to any webpreview and doclib thumbnails in the normal way.
     As part of this change, we have also changed the behaviour so that renditions are no longer copied when a node is copied. This is relevant as when a document is checked out, a copy is made (the working copy). In order to avoid potential problems with copied rendition children being updated separately from the rendition children on the original copy, we no longer copy renditions - they will be regenerated separately for the working copies.
   
   This fix needs to be verified by a tester who has access to a running Alfresco-Quickr integration module.
   23592: ALF-4350 Fix for SiteService.updateSite() regarding Site Visibility change
     site:siteVisibility is a d:text property and is treated as a String in all places apart from within updateSite where a Java enum is written into the db. This seems to cause a problem on the DB specified in the issue.
   23608: Merge from V3.3-BUG-FIX to V3.4
      23606 Dmitry/Erik's fix for ALF-1052. Webpreview of swf files.
   23610: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.4:
      23579: Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.3-BUG-FIX:
           23576: Merged BRANCHES/DEV/BELARUS/V3.3-BUG-FIX-2010_06_24 to BRANCHES/V3.3:
                20998: ALF-3764: Filepicker be able to select URLs
                
      23609: Merged BRANCHES/DEV/BELARUS/HEAD_2010_10_06 to BRANCHES/DEV/V3.3-BUG-FIX:
           23158: ALF-1838: Need to support relative url for WCM TinyMCE Filepicker.
   
   Also fixes ALF-866 (cloned version of ALF-1838).
   23612: Fix for ALF-3677: Editing inline html content
   23615: Resolve ALF-5044: Alfresco 3.4 fails to start on Webshere 7 with org.alfresco.service.cmr.repository.MLText ClassNotFoundException
   23621: Merged V3.3-BUG-FIX to V3.4
      23620: Merged V3.3 to V3.3-BUG-FIX
         23619: Fix for ALF-1537 - Presentation Tier JS processor now correctly outputs different messages for when scripts:
                a) load incorrectly, i.e. error resolving imports or import syntax error "Failed to load script..."
                b) runtime execution error "Failed to execute script..."
                 
                Performance improvements
                Cache test delay fix
   23625: Fix ALF-629 - Allow the thread pool size to increase to the maximum when the queue starts to fill up, rather than only when it gets full (which is rarely will, as we want a very large queue size to avoid dropping work)
   23626: Fix for ALF-906: "Impossible to create web project if rule with Copy action was applied"
      o ensure that WCM web projects do not inherit DM rules
   23632: ALF-906: "Impossible to create web project if rule with Copy action was applied"
     - added missing file
   23635: Merge DEV to V3.4
       23627 : ALF-4947 - EML files not showing up in folder list
   23636: Reverse merged HEAD to V3.4
      23195: Temp comment out of ImapMessageTest (The test or the code is not wrong but the IMAP server is not running in the automated build.)
   23637: Merged V3.3-BUG-FIX to V3.4 (RECORD ONLY)
      23314: Merge from V3.3 to V3.3-BUG-FIX
         r 23311: Further fix for ALF-3991. Renditions/thumbnails cause update to modifier property.
         This is a reimplementation of r 23290 which was checked in on HEAD earlier.
         The RenditionService has been refactored between 3.3 and 3.4 and straight merges are not always possible.
      23355: Merged DEV/V3.3-DOCLIB-PORTLET to V3.3-BUG-FIX
         20814: Share host portlet detection and portlet action URL template and associated client-side constants. Latest SpringSurf libs to bring branch up-to-date.
         20995: DocLib Portlet checkpoint: URL encoding fixes, CSS fixes, Portlet URL links generators as client-side JavaScript & Freemarker macro. "My Document Libraries" landing page.
         21008: DocLib Portlet: Login page recognizes portlet mode, replaces input boxes with message "Please login via your portal.". When portlet mode detected, JSESSIONID cookie for path=/share is removed to prevent ALF-3749. URL encoding fixes. CSS fixes. Reverted patch to YUI history module.
         21047: DocLib Portlet: Site title shown on all Site pages for better usability. More CSS fixes to replace some default Liferay overrides.
         21078: DocLib Portlet: User profile links related to DocLib are not rendered if in portlet mode. Client-side generated links all now use one central function.
         21106: DocLib Portlet: Fix missing alias
         21152: DocLib Portlet: Missed a URL translation step on Rules page and default path render. URL encoding fix for file highlight parameter (double encoding issue). Fix for IE7 "empty DIV" bug relating to panel resizer & footer placement.
         21171: DocLib Portlet: Fix missing Freemarker macro include
         21435: Fix variable alias typo ($userProfile on details page for locked document)
         21698: *RECORD ONLY* New portal distribution zip target (to create alfresco-enterprise-war-3.3-portal.zip) and draft README.txt file. * DO NOT MERGE *
         21712: *RECORD ONLY* Updated README.txt  * DO NOT MERGE *
         22600: DocLib Portlet: New "Site constrained" portlet added where site is configured via portlet preferences. Removed CMIS portlet.
         23023: Fix Share DocLib Portlet CSS issues for Liferay 6. YUI Buttons back to normal. Background now set as white. Login page no longer sets background colo(u)r of body tag. Toolbar separator styling fix.
         23050: Fix "My Document Libraries" page template mapping & css tweak
      23522: Merged V3.3 to V3.3-BUGFIX
         23346: Brought WebQS module in (including build process but not installer elements yet)
      23524: Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.3-BUG-FIX:
         23371: "Simply" added wcmqs to installer
      23567: Merged HEAD to BRANCHES/DEV/V3.3-BUG-FIX:
         22837: Resolve ALF-5042: Default root folder path '/Company Home' not found
         22845: Fix regression from resolving ALF-5042 (Default root folder path '/Company Home' not found)
      23596: Merged HEAD to BRANCHES/DEV/V3.3-BUG-FIX:
         20636: ALF-3157 - Conflict between IMAP and Audit
         20638: ALF-3157 - Conflict between IMAP and Audit
           - part II update the auditConfig.xml
      23634: Merged V3.3 to V3.3-BUG-FIX
         23259: Merged HEAD to V3.3
            23256: Fix ALF-4573: Start Workflow action is absent for edited document and working copy in Share
         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
         23535: Merged V3.4 to V3.3 (complements 23517: ALF-5552)
            23508: Fixed ALF-5559: Permission interceptors can fail if Lucene returns invalid NodeRefs
         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
   23639: Fix for ALF-5670: "Repository fails to start when applying patch.wcmRuleInheritance if WCM is not enabled "
      - removed patch, replaced with check in WebPorjectServiceImpl.getWebProjectsRoot instead
   23640: Merged V3.3-BUG-FIX to V3.4
      23199: Over-ride the spring config and bring up the IMAP server in the unit test start-up.
      23235: Merged V3.3 to V3.3 BUG FIX
         23226 : RECORD ONLY fix up of unit test
      23315: (RECORD ONLY) Merge from V3.3 to V3.3-BUG-FIX
        r 23312: Adding explicit test case for ALF-3991.
        r 23313: Adding some new test classes to the convenience suite AllRenditionTests.java
      23423: Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.3-BUG-FIX:
         - ALF-5027: When node has been created and checked out in same transaction (e.g. via CMIS or Quickr) content rules will fail
      23460: Added better logging of errors when mapping NFS users to Alfresco users.
         Use database node id counter field value as the file id. Part of ALF-4883 and ALF-5386.
      23587: MERGED V3.3 to V3.3-BUG-FIX 
         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] 
         23545: Fixes: ALF-4568 - Broken images caused by missing URL Rewrite rule. Updated existing rules from ** to (.*) following earlier bug fix.
         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.
      23616: Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.3-BUG-FIX:
         23614: Fix ALF-5627: Transfer Service not processing deleted nodes correctly. Causing NullPointerException in receiver.
   23643: Speed up AuditMethodInterceptor when it is not used
    - Check path matching early in interceptor
   23644: Merged V3.3-BUG-FIX to V3.4
      23638: ALF-2731 - hash collision in TransactionBehaviorQueue
      23642: Merged V3.3 to V3.3-BUG-FIX
         23261: Fix for ALF-3385 - NullPointerException printed when new browser session opens to /alfresco/faces/jsp/dialog/container.jsp#
         23291: Fix ALF-5189: JSF - Links to different spaces in my Company Home are not diplayed in MS Office Add-in
         23295: Fix for ALF-481 - handle both missing surname and givenname from LDAP sync in Explorer client
         23296: Fix for ALF-1881 - Alfresco doesn't have protection against double clicking (merge of port from 2.2)
         23302: Fix for ALF-284 - Incorrect behaviour of radio buttons on Check Out page
         23311: Further fix for ALF-3991. Renditions/thumbnails cause update to modifier property.
            This is a reimplementation of r 23290 which was checked in on HEAD earlier.
            The RenditionService has been refactored between 3.3 and 3.4 and straight merges are not always possible.
         23312: Adding explicit test case for ALF-3991.
            This is a separate check-in to 23311 a moment ago as I want to merge this test class through to HEAD but I do not want to merge 23311 to HEAD.
         23313: Adding some new test classes to the convenience suite AllRenditionTests.java
         23325: Fix for ALF-2098 - Incorrect work of Close button inside of created group
         23327: Fix for ALF-5383 - Wiki html page viewer does not render indentation properly
         23328: Merged BRANCHES/DEV/BELARUS/V3.3-BUG-FIX-2010_06_24 to V3.3 
            21094: Workaround provided in issue description can be used as fix because of folowing code: 
               - Object[] params = new Object[] {action, approveFolderName, Utils.encode(approveStepName)}; 
               - out.write(Utils.encode(MessageFormat.format(actionPattern, params)));
               - Utils.encode method is called twice when generating output. One of this call can be removed as unnecessary.
         23337: Fixed ALF-26 "Audit Tool: Event filter doesn't work"
            - Commented out ui controls for "Event" & "Property" log-filters (which is implemented in the REST API but NOT in RecordsManagementAuditServiceImpl and therefore didn't work)
         23342: Resolve ALF-4703: Share Unable to Edit Metadata more than Once with Auditing Enabled
            - if audit internal is enabled, then category service methods missing audit tags fail (also, there's an audit service method missing a tag too)
         23354: Fixed ALF-5026: Change XAM property names to XAM standards
            - Global prefix: xam.archive.globalPropertiesPrefix=vnd.com.alfresco.
            - Node property prefix: xam.archive.nodePropertiesPrefix=xam.archive.node.
            - e.g.'vnd.com.alfresco.xam.archive.node.cm:created'
         23357: ALF-4745: Removed tomcat bundles as these were incomplete and 32/64 bit specific. Installation docs already updated.
         23401: Fixed ALF-4659 (ALF-4652): Configurable XAM Bindings
            - Added property: xam.archive.bindingPropertiesPattern=vnd\\.com\\.alfresco\\..*
            - Properties are non-binding unless they match pattern defined
            - Content property (vnd.com.alfresco.content) is always binding
         23410: Merged DEV/BELARUS/V3.3-BUG-FIX-2010_10_04 to V3.3
            23162: ALF-4934 Problem creating a folder using CIFS with permissions Contributor
         23467: ALF-2762 : Customer-provided fix to 3.2R-SQLServer-Microsoft JDBC driver issue
            1. Support of Microsoft JDBC driver was implemented.
            2. Classpath was updated (jtds driver was removed Microsoft jdbc driver was added).
         23471: Forget to remove old jdbc driver
         23473: Fixed compile error after merge
         23483: Removed MS SQL JDBC driver following rev 23467 fixing ALF-2762
         23484: Re-added JTDS driver following rev 23471 fixing ALF-2762
         23491: Merge DEV to V3.3
            23486 : ALF-5389 - If we contribute via IMAP in outlook or outlook express,an EML file, which has embedded images and attachments, has not his body content indexed
         23537: Fix to RM module since changes to action service config.
         23545: Fixes: ALF-6568 - Broken images caused by missing URL Rewrite rule. Updated existing rules from ** to (.*) following earlier bug fix.
         23566: Fixed ALF-5545: XAM connector xam.archive.node.* properties not set
         23623: Merged PATCHES/V3.3.3 to V3.3
            23622: ALF-5611: Fix calendar page by bracketing freemarker default operator to avoid any ambiguity. See http://freemarker.sourceforge.net/docs/dgui_template_exp.html#dgui_template_exp_precedence
         23624: Merged BRANCHES/DEV/BELARUS/V3.3-2010_11_10 to BRANCHES/V3.3:
            23602: ALF-5517: Webdav "supportedlock" propfind request fails if locking enabled
   23646: Merged V3.3-BUG-FIX to V3.4
      23430: Merged V3.3 to V3.3-BUG-FIX
         23429: Merged PATCHES/V3.2.0 to V3.3
            23428: ALF-5141: Further refinement of transaction limiting behaviour
               - Once accepted a transaction will be retried until it succeeds or the retry limit is exceeded. No limiting of retries by time as otherwise likelihood of any transaction succeeding under load is small
               - Default web transaction threshold is now 20 seconds to avoid problems on non-loaded systems
               - Record stack traces of tracked transactions to help debug slow transactions
      23645: (RECORD ONLY) Merged V3.3 to V3.3-BUG-FIX
         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
         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)
   23648: Update Tika + dependencies (including PDFBox to 1.3.1, and a slightly newer POI). Fixes ALF-5645 and ALF-5646
   23649: ALF-5648 - When rendering word to html in body contents only mode, don't include the xml definition
   23653: Performance improvements:
    - reduce calls to servlet container getResource() method during REST heavy apps
    - improve audit interceptor (Derek supplied 1st part of improvements in rev 23643)
   
   Overall 20% improvement since performance issues noted a few days ago.
   Share multi-user read tests with x20 users.
   Performance is now slightly better than previous record from 3.4 on 5/7/10.
   
   ENT 3.4.0E 11/11/10
   10 users x5 rep, 10sec so - time 3rd run
   - 80ms,
   20 users x5 rep, 10sec so - time 2rd run
   - 168ms
   
   ENT 3.4.0E 15/11/10 (after performance tweaks)
   10 users x5 rep, 10sec so - time 3rd run
   - 55ms
   20 users x5 rep, 10sec so - time 2rd run
   - 125ms
   23655: Add more tests for name and role filtering when listing site membership (Related to ALF-5314)
   23656: Fix for ALF-5674: The association picker control allows content nodes with children to be navigated
   23657: Fix ALF-5314 - expose the siteService flag of collapseGroups from listMembers to the listMembers method on the site object itself, and make use of this when searching for people who are site members in Share
   23658: Follow-up to r23644: Add reference to validation.js in Enterprise overlay file
   23659: Fix for ALF-906: "Impossible to create web project if rule with Copy action was applied"
      - moved add aspect to createWebProject method
   23660: Fixes ALF-3783: When searching in Advanced Search, russian letters are encoded incorrectly.
   Mootools replaced with uncompressed source copy with annotated modifications. Then YUICompressed at build-time to generate mootools-v1.11.js
   23663: Fixed ALF-5462 "The workflow details doesn't/can't display the group the current task is assigned to when it is pooled and not claimed"
   23665: Fixed ALF-4556 "Error occurs on search by wildcards"
   23667: Push the logging log4j definition bean out into another context file, included from core-services-context.xml (rather than being defined directly in it). This allows you to write a unit test without the main context, but still with our log4j settings
   23668: Tweak DynamicallySizedThreadPoolExecutor logging, and have log4j settings used by DynamicallySizedThreadPoolExecutorTest even if the full repo context isn't loaded
   23670: Fix ALF-5609: Incorrect behavior of messages mimetype for Share and Quickr connector
   23671: Merged /BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.4:
     23666 (record-only): Fixes ALF-5691: TransferService: Multi-byte characters are not encoded correctly
   23673: RM Audit:
     - ALF-5307: Audit doesn't work for RMA
     - Buttons on audit console now reflect the current state and are initialised correctly when the console is first shown.
     - ALF-5616: Start and stop date are not being set correctly
   
   23675: Fix for ALF-5244: Issues with selectmany.ftl control
   
   Option and label separators can now be configured like selectone, the control now also shows the label (when present) not the raw value in view mode. Also fixed a couple of selection bugs.
   23677: Merged V3.3-BUG-FIX to V3.4
      23676: Fix ALF-4035: Properties with underscores are not displayed in datalists
   23678: Fix transformationOptionOverrides related warnings for the includeEmbedded, by converting the string to boolean before setting the bean property if needed
   23679: Fixes: ALF-5595 - updated files to reflect supported language packs & added the file to the enterprise overlays build/clean targets
   23680: If thumbnailing cannot be performed either due to no transformer existing, or the transformer being unavailable, deliver more helpful log messages than before (but at the same priority). Related to ALF-5158
   23685: Fixed ALF-4744 "Selectable resources aren't limited to the current site in case workflow is started from details page"
   - added "item.location.parent.nodeRef" in remote-api slingshot webscript
   23686: Merged BRANCHES/DEV/BELARUS/V3.4-2010_11_11 to BRANCHES/V3.4:
      23672: ALF-5597: Nodref is a mandatory parameter notification pops up when Sites is selected (Quickr connector v 8.1.1.175).
   23688: ALF-5405: Strange behavior with long names
   
   - Now if at NodeService enters invalid QName will occur IllegalArgumentException  instead of DuplicateChildNodeNameException
   - Method QName createValidLocalName(   ) is override
   - It is added jUnit test
   Such behavior allows to avoid an undesirable situation
   
   23693: Fixing bug introduced when fixing ALF-5529 (r23546)
   - Enter key & mouse click events from Alfresco.util.useAsButton returned different parameters to the same callback, now fixed
   23698: Use the smaller netcdf jar to avoid SFLJ warnings
   23699: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.4:
     23697 (record-only): Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.3-BUG-FIX:
        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
   23700: ALF-3084 Checking out documents no longer updates the modifier/modified date.
   23702: Fixes ALF-5671: TransferService: BeforeStartInboundTransferPolicy now being fired *after* the transfer lock has been taken
   23703: Fixes: ALF-5633 - Date string not localisable in Blog Archives list
   23710: Fix for ALF-4678: Incorrect workflow details if creator or assignee was deleted
   23715: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.4:
     23713 (record-only): Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.3-BUG-FIX:
       23709: ALF-5699: Fix NPE in ManifestIntegrationTest
   23719: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.4:
      23717: Fix for ALF-5703: Error when creating a folder within a container using Webscript
   23720: Merged BRANCHES/DEV/BELARUS/V3.4-2010_11_11 to BRANCHES/V3.4:
      23669: ALF-4357: Bitrock Installer: Remote JMX connections fail
   23721: ALF-3044: Audit log is incorrect when trying to filed it as record
   
   23722: ALF-5405: Strange behavior with long names
   
   Code justify in according to coding conventions: 
   - 4 spaces for a tab 
   - Braces on new new line 
   - 120 char line lengths 
   
   23723: Declare all Share UI support webscripts as "internal" lifecycle
   23724: Remove unnecessary css include from RM-audit component
   23729: Fixed ALF-5087 "My Sites Dashlet does not persist the filter setting for All Sites | Sites | Favorite Sites etc"
   - Filter is now persisted as property
   - Calls to get sites & preferences was implemented both server and client side, now client only. 
   - Cell renderers has been refactored from inline to member methods
   - Native button/dropdown are hidden until yui components is created to avoid ui jumping around...
   - ...which also causes the annoying "gap" when resizing which now has been fixed for both My Tasks & My Sites
   23730: ALF-2598 - temp disable Imap Cache - will murder performance but pass unit tests.
   23732: Fix to output of error message in doc summary and image dashlet
   23733: Performance tweak
   23736: Merged V3.3-BUG-FIX to V3.4
      23735: *RECORD ONLY* Merged V3.3 to V3.3-BUG-FIX
         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
   23739: A bit more logging to try to spot why bamboo is different, and add another test
   23741: ALF-4947 - EML files not showing up in folder list
   23749: Fixed formatting: Removed tabs (ALF-5405 fix follow-up)
   23750: Fix unit test (ALF-5405) to check for expected exception
   23751: Prepare for ALF-5575: Remove redundant cache config entries and fix typos
   23753: Fixed ALF-5087 "My Sites Dashlet does not persist the filter setting for All Sites | Sites | Favorite Sites etc" part 2
   - My Tasks dashlets second toolbar became a bit to high, now fixed
   23754: Fixed ALF-2975 "Layout is broken for Audit in IE"
   23755: Work around the fact that some JVMs fail to properly implement the ThreadPoolExecutor specification, and consequently sometimes kill off threads that are in the core pool. Tests now look for either the specification required behaviour, or the broken behaviour
   23756: Change to test code for DynamicallySizedThreadPoolExecuter. Removed unecessary assert which fails on some OSes. Nick B.
   23763: Clean-up login template controller script
   23764: Fixing a typo in test include/exclude spec which meant that WebScriptTestSuite was not being run.
   23766: 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."
   23768: Add new unit test for international category names. Shows that english, spanish  and french works fine, but that there's something a little iffy with japenses
   23773: Fix for ALF-5240: Something odd happens in My Content page on adding comment
   23785: Fix for ALF-1728: User with administrative rights can paste content into staging.
   23788: Method naming fix (ALF-5405 follow-up)
   23793: Merge from V3.3-BUG-FIX to V3.4
     r. 23791 Fix for failing test cases SiteServiceTest and InviteServiceTest.
              I have used susbsystem bean overriding to turn off emails on the MailActionExecuter bean.
   23800: Fix for ALF-5569: Error trying to change discussion's name
   23805: Add a pure nodeService test for the Japanese write/read issue in ALF-5594. This test will almost certainly break on some db flavour builds on panda, but we want to know which systems are affected (before commenting it out pending the fix)
   23806: ALF-5087 "My Sites Dashlet does not persist the filter setting for All Sites | Sites | Favorite Sites etc" part 2
   - Now provides default filter if not set
   23810: Merged from V3.3-BUG-FIX to V3.4 (RECORD ONLY)
   23809: Merged from V3.3 to V3.3-BUG-FIX 
      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."
   23818: Merge from V3.3-BUG-FIX to V3.4
     r. 23817: Further fix for InviteServiceTest failing tests.
   23825: ALF-3066: Google docs - Document not deleted when checked in
   
   23826: Prevent 'nodeOwner' cache invalidation during node creation
   23827: Prevent cache case flip-flopping on encoding strings
   23828: Removed some TODO notes
   23829: Single minor format
   23830: Generics warnings
   23831: Added 60s timeout on mutable node-related caches (ALF-5575)
   23832: Trimming on cache invalidation during put
   23833: Fixed ALF-5575: Enable ConcurrentNodeServiceTest.testMultiThreadedNodePropertiesWrites
    - Prevent read txns from adding stale data to caches while writes are in progress
    - Added cache tests for mutable caches and read-only transactions
   23834: Fixed ALF-5763: Corrected capitalization.
   23838: Corrected an overzealous method rename refactor in QName to not throw a null-ptr-exception.
   23839: Merge from V3.3-BUG-FIX to V3.4
     r.23837: Reimplementation of the build fix for InviteServiceTest. This one won't send emails.
   23840: Merge from V3.3-BUG-FIX to V3.4
     r.23837 Reimplementation of the build fix for InviteServiceTest. This one won't send emails.
   This check-in is merge properties on root. Couldn't check in previously (23839).
   23843: Added debug output for failing workflow REST API test as it works fine on my local machine.
   23852: Fix for ALF-5664: Aspect Mandatory Aspect leads to failed to find property/association definition for property/association
   23856: Added explicit failure for dangling test transactions
   23858: Fix ALF-4277: Link with a long description is displayed incorrectly
   23861: Fail on dangling transactions
   23869: Added system property 'system.cache.disableMutableSharedCaches' (false by default)
    - Equivalent to disabling Hibernate L2 cache
    - Can be used as a diagnostic feature to quickly check for cache problems
   23871: Merged DEV/TEMPORARY to V3.4
      23759: ALF-4357: Bitrock Installer: Remote JMX connections fail
         1. Default RMI bind to all interfaces via alfresco.rmi.services.host 
         2. New property alfresco.rmi.services.external.host with default value ${localname}. This represents the externally-resolvable host name of the RMI server that should be published in the stubs. 
         3. jmxUrl gets a hostname from sysAdminParams
      23770: ALF-4357: Bitrock Installer: Remote JMX connections fail
         Additional jmx.remote.rmi.server.socket.factory configuration for ConnectorServerFactoryBean
      23781: ALF-4357: Bitrock Installer: Remote JMX connections fail
         Configuration of alfresco-virtserver-context for use a alfresco.rmi.services.external.host property
      23783: ALF-4357: Bitrock Installer: Remote JMX connections fail
         Configuration of alfresco-virtserver-context for use a alfresco.rmi.services.external.host property
   23879: Fixed ALF-4687 "Folder with name 'null' is created in the site space"
   23882: Merged V3.3 to V3.4
      23860: Improved fix for ALF-5448 
             - Pickers no longer return hasChildren information. This reduces the number of getChildAssoc() calls required from N+1 to 1. 
             - Cleaned up and improved hasChildren() methods on ScriptNode and BaseContentNode. 
             - Fixed up Share pickers to not expect hasChildren info
   Fix for ALF-5848 - object picker now allows navigation down into cm:category objects
   23884: When testing the Replication Service and the underlying Transfer Service blows up, tidy up the transactions before reporting the problem. This allows all the tests to run even if some are failing (which they currently are, due to a TransferService regression)
   23888: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.4:
     23886 (record-only): Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.3-BUG-FIX:
       23883: Fixes ALF-5759: WQS: Attempt to copy a website section fails
   23890: Fixes for date time 
    ALF-695: Date time tokeniser will include all parts of date and time - even when searching with just date - so lenient dates fail
    Fixed CMIS date ranges (with unit test)
    Other unreported date-time fixes
   23892: Upgrade Tika and POI, so we get lower memory parsing of .xlsx files (switches from DOM based to SAX based). Custom build containing TIKA-521
   23893: Fix for ALF-466: Impossible to 'remove' association in a workflow (Explorer client)
   23894: Merged V3.3-BUG-FIX to 3.4
      23872: Merged V3.3 to V3.3-BUG-FIX
         23868: Merged PATCHES/V3.3 to V3.3
            23848: (RECORD ONLY) Merged DEV/TEMPORARY to PATCHES/V3.3.3
               23847: ALF-5448 Cannot upload attachments to data lists (https://issues.alfresco.com/jira/browse/ALF-5448)
                  Additional property hasChildren and corresponding getter method was added to ScriptNode and BaseContentNode.
            23860: (RECORD ONLY) Improved fix for ALF-5448
               - Pickers no longer return hasChildren information. This reduces the number of getChildAssoc() calls required from N+1 to 1.
               - Cleaned up and improved hasChildren() methods on ScriptNode and BaseContentNode.
               - Fixed up Share pickers to not expect hasChildren info
            23863: Fix PolicyTest
   23899: When trying to figure out the encoding of a piece of text, if the current guesser doesn't know, try Tika before giving up and going for the default. (ALF-2534)
   Also adds some more tests for encoding detection
   23908: ALF-5435: Declare as record action is missing for emails
   
   23914: Merged V3.3-BUG-FIX to V3.4
      23913: Fix ALF-3067: Script error at the 'View Details' for record
   23916: Fix ALF-3173: Favorite sites a user is not a member of cannot be removed from the Sites dropdown.
   23918: Fix up transfer unit tests and wcm quickstart following ALF-5575
   23925: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.4:
      23911: Fix for ALF-5621: "Long-running patches can result in a database connection closed exception"
           - added requiresTransaction flag to patch-services-context
           - refactoring to allow a patch to be called with no enclosing transaction if requiresTransaction == false
     23915: Fix for ALF-5621: "Long-running patches can result in a database connection closed exception"
          - added missing file
   23928: Merged V3.3-BUG-FIX to V3.4 
      23927: Fix for ALF-5867 - Forms dependencies (CSS and JS) not getting loaded by Forms UI
   23932: Merging from V3.3-BUG-FIX to V3.4
   r23903: ALF-5385 Now paging is enabled on groups GET REST API. Also fixed an issue where GroupsTest.testSearchGroups() was failing.
   23933: Follow-up fix to r23908
   23940: Fix for ALF-5880
   23944: Merged V3.3-BUG-FIX to V3.4
      23943: Fix ALF-5316: Event isn't removed after re-scheduling disposition. Also fixes tree not updating when new containers are created.
   23950: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.4:
      23942: Fix for ALF-5783: Not possible to override the output path pattern anymore when a webform is edited for a specific website
   23951: Backing out previous change as the solution needs re-implementing for the 3.4 branch
   23954: Merged V3.3-BUG-FIX to V3.4
   23953: Fixed ALF-2830FOR "REVIEW: In mytasks(panel) webscript, "Task Done" button hidden in French" part 2
   23949: Fixed ALF-2830 "FOR REVIEW: In mytasks(panel) webscript, "Task Done" button hidden in French"
      * Removed hardcoded width
   
   23955: When the Text to PDF content transformer is reading in the text file, pay attention to the encoding of the file when constructing the InputStreamReader. Also includes a disabled unit test, which seems to show up a PDFBox bug. (ALF-2534)
   23960: Merged DEV/BELARUS/V3.4-2010_11_11 to V3.4
      23910: WCM: upgrade / re-index can fail on 3.4 if link validation (now removed) was previously being used
      - Incremented schema number as well
   23963: Merged V3.3-BUG-FIX to V3.4
   23962: (RECORD-ONLY) Merged V3.3 to V3.3-BUG-FIX
      23961: Fixed ALF-5686 "Incorrect behaviour of "All" filter in "My Tasks" dashlet"
   
   23967: Merged V3.3-BUG-FIX to V3.3
     - 23966: DOCLIB: Tags are not displayed
     
   23969: Removed case sensitivity for UTF-8 encoding
   23972: Fix for ALF-5798: "Quartz 1.7.3 and higher phones home"
      - added a flag to quartz.properties to stop the phone home
   23975: ALF-5346 Added a unit test to AlfrescoJavaScriptIntegrationTest.
   23980: Merged: From V3.3-BUG-FIX to V3.4
      23979: Merged From V3.3 to V3.3-BUG-FIX
         23970: Fixes: ALF-5858 (Javascript error caused by files 404'ing) - URLRewriting bug introduced in r23545
   23986: Fix for ALF-4646: Workflow REST API webscripts do not have sufficient documentation
   23992: Enhanced the select controls to allow a default, initial selection to be specified either in component binding properties or on the URL. The value is ignored if a value is already set for the property.
   
   To use this feature use the new "defaultValueContextProperty" control parameter, for example:
   
   <field id="ws:language"> 
      <control template="/org/alfresco/components/form/controls/selectone.ftl">
         <control-param name="options">en|English,fr|French,de|German,es|Spanish,it|Italian</control-param>
         <control-param name="defaultValueContextProperty">localeId</control-param>
      </control>
   </field>
   23993: Building blocks for ALF-5084. A new ActionConditionEvaluator for has-child.
   23997: Fix ALF-5731: Saving a doc from Office 2003 via WebDAV fails
   24003: BatchProcessor always calls afterProcess now (as per Javadoc)
   24004: Undid rev 23827: Prevent cache case flip-flopping on encoding strings
   24006: Merged V3.3-BUG-FIX to V3.4
      24005: Fix ALF-4368: Share - File menu not loading properly on IE
   24010: Merged V3.3-BUG-FIX to V3.4
      24009: *RECORD ONLY* Fix ALF-3155: Site Calendar dashboard works incorrectly
   24015: Merged V3.3-BUG-FIX to V3.4
      24014: Merged V3.3 to V3.3-BUG-FIX
         24013: Fix for ALF-5897 - AWE - HTTP authentication requested when page loaded - AWE login fails 
   24018: Avoid a NullPointerException if the action lacks a noderef
   24024: ALF-4066: Creating RM Folders via IMAP in email client throws errors
   
   - Adding a folder to a category now automatically downcast the folder to a record folder
   
   24026: Fix ALF-5567: TinyMCE language fails to load custom language in forms engine. Also code standards for some related code.
   24028: Fix for ALF-5788: Outlook 2003: event isn't deleted in Share if it was deleted in Outlook
   24032: Fixes ALF-5885: Inserting document to wiki page causes an error
   24048: Fix for ALF-5897 - updated surf.xml to set correct user factory
   24051: Removed 'Delete All Items' from trashcan dialog' (part of ALF-1990)
   24052: Fixed ALF-1990: Trashcan "Delete All Items" button might not delete all items
    - Pulls back all items for batch-processing
    - Fixes bug but needs enhancement to use pageable node query
   24056: Fixed SAIL-367 "REfactor header.css to avoid needing a ie8.css"
   24057: Fix for ALF-5620 sitePreset filter in siteService.listSites not working
   24068: Merged V3.3-BUG-FIX to V3.4
      24067: *RECORD ONLY* Fix ALF-5973: Web QuickStart module breaks Share DocLib since Portlet merges
   24069: Merged BRANCHES/DEV/BELARUS/V3.4-2010_11_11 to BRANCHES/V3.4:
      24045: ALF-5781: Non-recurrent event is displayed with "Recurring" label
   24090: Fixed ALF-4972 "Custom workflow is not sorted in workflow list"
   - now ignoring case and falls back to name if title isn't present
   24097: Fix for ALF-5802 - comment based discussions removed from repository search results.
   24098: Add user/permissions related copy test. Currently disabled as something relating to ALF-5288 seems to be wrong
   24099: Fix for ALF-5976: Email Notify Templates not being picked up in Share Rules Send Email UI (requires server restart)
   
   The allowable values of parameter constraints were indeed being cached, I have added a new property on BaseParameterConstraint which allows the caching to be turned off as follows:
   
   <property name="cacheAllowableValues" value="false" />
   24100: ALF-4357: Fix random unit test failures due to RMI registry lookup
   - Implement equals() and hashCode() methods in HostConfigurableSocketFactory!
   - Don't ask me how many hours I wasted on this!
   24102: Further ALF-1990: Removed redundant permission check and fixed tests to check failure reports properly
   24103: Encoding DAO returns uppercase values; internally, DB was always using lowercase
   24104: More put and set trimming to avoid cache remove calls
   24105: Fixed unit test to explicitly recognisable UTF-8 characters
    - Tika was interpreting lame text as ISO-8859-1
    - EncodingDAO case-sensitivity fix got past first failure and onto second, thus obfuscating the root cause
   24114: Fix for ALF-2309: "FTP server can retrieve and overwrite files already moved away from current folder"
      - node paths were inconsistent for moveNode. Fixed them to be consistent.
   24115: Fix failing unit test. In WorkflowTestSuite, shut down the application context used by the other tests before starting JBPMEngineUnitTest. Also reset the WorkflowTaskInstance singleton.
   24123: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.4:
      24122: (RECORD ONLY) Fix for ALF-5710: It is impossible to create category in RM with FDK installed
   24126: Fixes: ALF-4775: UI Spelling mistake corrections
   24140: ALF-170: The user has all rights for audit once "Access Audit" capability is added to him
   
     - Capabilities added to the underlying audit service blocking access to audit functions as expected
     - TODO UI still needs updating
     - TODO export fn still needs isolating
   
   24142: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.4:
      24141: (RECORD ONLY) Build fix
   24144: Removed tabs
   24145: Fixed test to use 'system' user after permissions were tightened around RM audit (ALF-170)
   24146: Correctly disable a supposedly disabled test, pending a proper fix for the underlying issue (ALF-5288)
   24154: Merged V3.3-BUG-FIX to V3.4
      24152: Merged V3.3 to V3.3-BUG-FIX
         24151: Merged V3.3.3 to V3.3
            24150: Further fix for links list issue identified in ALF-5966
   24163: Fix for ALF-5954 - username uri encoding
   24164: Put tearDown deletes in transaction
   24174: Added 3rd-party license
   24180: 
   24186: Fix for ALF-438: Error appears after adding a content to space where content rule 'Check Out in the current space' was created.
   24187: ALF-5400: Merged V3.3 to V3.4
      23650: Switch off transaction limiting for now, pending further investigation
   24191: MERGED V3.3-BUG-FIX to V3.4
     23864:Merge BRANCHES/DEV/BELARUS/V3.3-2010_10_22 to V3.3_BUG_FIX
       23229 : ALF-5239 WebDAV shows incorrect creation date
     23652 : ALF-4902 - MS Word 2003 stuck and exception org.alfresco.jlan.server.filesys.AccessDeniedException: Get file information
   24192: Performance and scalability improvements related to thread blocking in FreeMarker related classes
    - replacement of single ObjectWrapper related class with threadlocal version
    - replacement of MRU cache implementation (synchronized) with concurrent version
   24193: Removed svn:mergeinfo again.  Please read: https://ts.alfresco.com/share/page/site/eng/wiki-page?title=Merging_Guide
   24194: Merged V3.3-BUG-FIX to V3.4
      24138: Fix bootstrap ordering so that modules can override Enterprise-only beans (ALF-6010)
      24139: Fixed ALF-6010: Content URL recognition errors during bootstrap re-indexing
      24170: XAM: Removed more hacks (ALF-6010)
   24196: Test refactoring as part of investigation into ALF-5969.
   JodConverter-based transformation/extraction tests now pass if OOo is not available on the machine running the test.
   Also some minor refactoring of the temporary node tidy-up code.
   And I've enabled these tests in the build.
   24197: Merge V3.3-BUG-FIX to V3.4
     23742 : Merge DEV to V3.3_BUG_FIX
       23738 : ALF-5520 - IMAP metadata extractor fails to extract dates spanned on two lines
     23865 : Merge V3.3-BUG-FIX-2010_07_13 to V3.3_BUG_FIX
       21263 : ALF-2880: Share - Exception when making a site "moderated".
     23866 : Merge V3.3-BUG-FIX-2010_09_20 to V3.3_BUG_FIX
       22634 : ALF-3859 Module Management Tool stops applying amps if one amp fails when using the -directory option.
     24031 : ALF-5553 - Email preview style lost on Outlook 2007
     24085 : ALF-5928 - Undeclared email can't be copied
     24092 : Fix unit test following change for ALF-3859
     24169 : ALF-5919 - Error on start Alfresco page in read-only mode (NTLM specific)
   24198: Merged V3.3-BUG-FIX to V3.4
      23758: (RECORD ONLY) Merged V3.4 to V3.3-BUG-FIX
      23787: ContentStoreCleaner exits silenty if it can't get the job lock
      23906: Fixed ALF-5119 (ALF-4652): Prevent lock and archive removal until retention period has passed
      23934: (RECORD ONLY) Merged V3.3 to V3.3-BUG-FIX
      24002: CreateNodeRuleTrigger was not doing anything when cm:noContent aspect was added
   24201: Merged V3.3-BUG-FIX to V3.4
      24172: Orphan cleanup code is more sensitive to unsupported URLs (helps ALF-5533)
      24173: Part 1 of ALF-5533: XAM orphan cleanup after rollback or retention job cleanup
      24175: Part 2 of ALF-5533: XAM orphan cleanup after rollback or retention job cleanup
   24210: Merged V3.3-BUG-FIX to V3.4
     23956 : Merged DEV TO V3.3_BUG_FIX 
       ALF-4546 : Moving a secondary child node using a file protocol adapter (such as CIFS) moves the primary child node
   24214: When the tagging service updates the tag scope values in the background, don't fire behaviours for the change as it's an internal system task. Adds a unit test for this, and for general permissions + tagging for ALF-5504
   24217: Put deletes into transaction in tearDown()
   24218: Merge V3.3-BUG-FIX to V3.4
     24017 : ALF-5647 : Empty 'addressee(s)' metadata in share when a mail rfc822 is pushed using IMAP
     24027 : ALF-4647 - missed check in from 24017
     Merged DEV/BELARUS/V3.3-BUG-FIX-2010_11_09 to V3.3_BUG_FIX 
       24086: ALF-5495 - IMAP encoding bug: pushing-poping a message with Content-Transfer-Encoding: 8bit to IMAP server corrupts encoding
     Merged BELARUS/V3.3-BUG-FIX-2010_11_09 to V3.3-BUF_FIX
       24121 : ALF-5647 - Empty 'addressee(s)' metadata in share when a mail rfc822 is pushed using IMAP
   24219: removed file that should not have been added.
   24220: Fix ALF-5568: Shortcoming of export/import mechanism
   24221: Patched build of JodConverter. Hopefully this will help with ALF-5969.
   I have added logging during JodConverter init and during soffice process init.
   24222: Fix typo in message bundle whilst investigating ALF-5650
   24223: Null pointer exception in ImapFolderSecurityInterceptor
   24224: Fix for ALF-219. Impossible to transform from .html to .pdf for empty files
     This was due to a bug within JooConverter - the Community Edition 3rd party lib for OOo connection.
     It handles zero-length files a little unpredictably, producing NullPointers, unreadable PDF docs and someties crashing the soffice process depending on input.
     OOo seems to do a good job itself with empty files, so OOo is not the problem.
   
     I have added a workaround whereby for zero-length files that are going to OOo via JooConverter for transformation, instead of using OOo
     we use Apache PDFBox to produce an empty PDF file.
   
   24225: Excluding **OOoTest from the JUnit test patterns as they are causing the build to hang.
   They work fine on my machine. Honest! Will investigate more closely on Windows OS next week.
   24226: Added an impl comment about a potential future pdfbox improvement.
   24229: Fixes: ALF-5991 - Removed space to fix JDK specific issues w/ string.
   24231: Custom build of JodConverter.
     Added logging to WindowsProcessManager.
     Removed an unnecessary executor.shutDown() call from ManagedOfficeProcess.
   24232: Completed fix for ALF-5802 - comments filtered for document library items as well as repository items
   24233: Removed svn:mergeinfo on root
   24235: Merge V3.3_BUG-FIX to V3.4
     24234 : ALF-5844 - Defining the Lockable aspect as mandatory causes UnsupportedOperationException when checking out content
   24236: Fix for ALF-3941: SSO Share with CAS - external-auth and SSOAuthenticationFilter
   - SSOAuthenticationFilter uses Kerberos example condition - its name has been changed so you have to rename it into scope.
   - Added supporting comments to both sections
   24240: Fixed ALF-5999: Alfresco 3.4 startup fails with XAM connector module
    - Enterprise modules were not being built (Kofax and XAM)
    - Added release version number to AMP files as well as XAM jar
   24241: Merged V3.3-BUG-FIX to V3.4
      24077: ALF-5471 part 1: 'authorityMigration' patch can report 'Node does not exist'
      24078: ALF-5471 part 2: 'authorityMigration' patch can report 'Node does not exist'
   24243: Fixed ALF-6028 "Impossible to reject invitation due to script error"
   24244: Merged V3.3-BUG-FIX to V3.4
      24242: Fix ALF-5608: Script error after 'Edit' on My Spaces List Dashlet. Also fix "More actions..." link going to wrong details page.
   24247: temp commit of imap message test - will be reinstated soon
   24251: Fix ALF-5992: Language pack errors in Share - It's impossible to delete group with native chars in names (IE specific)
   24265: Merged V3.3-BUG-FIX to V3.4 (RECORD ONLY)
      23744: Merge V3.4 to V3.3_BUG_FIX
         23513 : Merge DEV to V3.4
            ALF-4200 IMAP - LSUB Failed. AccessDenied.
      23758: Merged V3.4 to V3.3-BUG-FIX
         23688: ALF-5405: Strange behavior with long names
         23722: ALF-5405: Strange behavior with long names
         23749: Fixed formatting: Removed tabs (ALF-5405 fix follow-up)
         23750: Fix unit test (ALF-5405) to check for expected exception
      24120: ALF-5997: Merged V3.4 to V3.3-BUG-FIX
         23551: Merged BRANCHES/DEV/BELARUS/HEAD_2010_10_21 to BRANCHES/V3.4:
            23474: ALF-5490: The Subsystems configuration folder does not seem to be read when Alfresco is deployed to later versions of JBoss
      24124: ALF-5988: Merged HEAD to V3.3-BUG-FIX
         23231: Merged DEV/TEMPORARY to HEAD
            23227: ALF-5271 : Win7+Kerberos+Spp problem
               1. Vti-context.xml was updated for sharepoint module to allow jetty support requests with total size of headers up to 8k.
      24177: ALF-5178: Merged V3.4 to V3.3-BUG-FIX
         24070: Merged DEV/BELARUS/V3.4-2010_11_11 to V3.4
            24011: ALF-5618: Webdav with MAC OS X problems - Locking / unlocking creates new versions
               1. WebDAV locking properties was added to excluded in VersionableAspect
               2. Appropriate JUnit test created.
         24101: Disabled test and reopened ALF-5618
         24117: Fixed test inter-dependencies on 'excludedOnUpdateProps' for ALF-5618
      24259: Merged V3.3 to V3.3-BUG-FIX
         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"
         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)
   24266: Merged V3.3-BUG-FIX to V3.4
      23761: ALF-5358: Invalid JavaBean property 'blockedSenders' being accessed!
         - renamed List versions of setAllowedSenders and setBlockedSenders
      23769: Fixing typo in build.xml that means WebScriptTestSuite was not being run.
      23844: Fix for ALF-1084, ALF-5792 - handling of character encoding as specified in XML file header when missing from response headers. Fixes issue with non-ascii characters in RSS feeds in Share.
      23878: Build fix. InvitationTest.
         Minimally refactored a test case to disable email sending properly.
      23895: Backported fix from rev 23838 - QName refactor causes null-ptr-exception from Upload Content dialog in Explorer.
      23917: Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.3-BUG-FIX:
         23912: Fixes ALF-5878: WQS: Alfresco sessions ramping up rapidly
      23921: Fix for ALF-5826 - Infinite loop while closing "Manage Multilingual Content" dialog.
      23924: Merged V3.3-BUG-FIX-2010_10_04 to V3.3-BUG-FIX
         23416: ALF-5301: TinyMCE is replacing carriage return with white spaces.
      23979: Merged V3.3 to V3.3-BUG-FIX:
         23970: Fixes: ALF-5858 (Javascript error caused by files 404'ing) - URLRewriting bug introduced in r23545
      24001: Merged BRANCHES/DEV/BELARUS/V3.3-2010_11_10 to BRANCHES/DEV/V3.3-BUG-FIX:
         23971: ALF-1948: Deleting a freshly created file doesn't remove it from a user sandbox 
                 - also minor formatting & extra tests
      24007: Merged BRANCHES/DEV/BELARUS/V3.3-2010_11_10 to BRANCHES/DEV/V3.3-BUG-FIX:
         23971: ALF-1948: (commit mergeinfo !)
      24055: ALF-5897: Updated surf.xml to set correct User Factory
      24108: Fix CIFS memory pool leak, in IPC$ processing. ALF-483.
      24129: ALF-5458 Adding paging support to Groups REST APIs.
      24156: ALF-5663 - Deadlock during StatusTemplate lookup in AbstractWebScript (already present in V3.4)
      24181: Added catch block for access denied error in store file processing, returns a 451 error to the FTP client. Part of ALF-6020.
      24182: Convert open content for write errors to an access denied exception, fix for FTP NPE and will also be handled by CIFS protocol code. ALF-6020.
      24252: Fixed ALF-5677: Extremely long launch of the Alfresco server with connector V1.2
         - Avoid any ContentReader interaction (incl. exists checks) when 'lucene.maxAtomicTransformationTime=0'
         - Prevents slow XAM-based XSet operations from slowing reindexing
         - As a side-effect, text/plain content is now treated the same as transformable content when the transformation time is 0
      24255: Check URL support and read-only state in afterRollback cleanup of orphaned content URLs (ALF-5677)
      24256: Neatened code
      24257: Fixed integrity checking when properties have been removed from model
      24258: Helper DEBUG for diagnosing ALF-5677 and future XAM issues
      24260: Merged V3.3 to V3.3-BUG-FIX (RECORD ONLY)
         23707: Merged V3.3-BUG-FIX to V3.3
            23596: Merged HEAD to BRANCHES/DEV/V3.3-BUG-FIX:
               20636: ALF-3157 - Conflict between IMAP and Audit
               20638: ALF-3157 - Conflict between IMAP and Audit
                  - part II update the auditConfig.xml
         23946: Merged V3.3-BUG-FIX to V3.3
            23942: Fix for ALF-5783: Not possible to override the output path pattern anymore when a webform is edited for a specific website
      24261: Merged V3.3 to V3.3-BUG-FIX
         23650: Switch off transaction limiting for now, pending further investigation
         23706: Merged PATCHES/V3.3.3 to V3.3
            23704: ALF-5720: Merged V3.3-BUG-FIX to PATCHES/V3.3.3
               23609: Merged BRANCHES/DEV/BELARUS/HEAD_2010_10_06 to BRANCHES/DEV/V3.3-BUG-FIX:
                  23158: ALF-1838: Need to support relative url for WCM TinyMCE Filepicker.
                     Also fixes ALF-866 & ALF-5420
         23708: Merged DEV/TEMPORARY to V3.3
            22697: ALF-4809: The confirmation step to Revert action implementation. New dialog.
         23970: ALF-5858 (Javascript error caused by files 404'ing) - URLRewriting bug introduced in r23545
         23998: Add tomcat bundles
         24053: ALF-5897: Updated surf config to set correct user factory
         24061: Merged V3.2 to V3.3
            19170: Fixed ALF-730: MLText is not fully carried during cut-paste or copy-paste
               - Fetching of properties for copy now uses 'mlAwareNodeService'
         24130: Ensure mysql symlinks created
         24131: ALF-5930: Correct bogus configuration template for Quickr
      24262: Stress test code for ALF-5025: Support background processing of archiving
   24267: Reverting partial merge of build script changes
   24268: Removed svn:mergeinfo on root
   24270: Merged V3.3 to V3.4
      24269: Merge fallout: rename of ASPECT_MAILED to ASPECT_EMAILED
   24271: Merge fallout: fix compilation error (masked by a crashed Eclipse)
   24275: FTP command input buffer resizes on overflow (up to a maximum of 64K), allow long paths in commands. ALF-210.
   24281: Performance improvements relating to WebScripts, Surf, FreeMarker and Apache HTTP synchronization under heavy multi-threaded load.
   24282: Merged V3.3 to V3.4
      24279: Fix for ALF-6025 - increased cluster cache size for webScriptsRegisteryCache
   24284: Fix for ALF-5723: Sharepoint Protocol doesn't seem to work in 3.4.a and 3.4.b with NTLM passthru
   24285: Unit test fallout from merge.  Removed NPE-causing mailActionExecutor member
   24286: Reinstate ImapMessageTest (a required bug fix was incorrectly removed by merge 22725)
   24288: Fix for ALF-4282 Site Contributor can't create datalist until Site Manager creates new one.
     The first user who views the data lists page for a Share site kicks off the lazy creation of the necessary
     site container node. In fact it creates the container, sets its cm:description to "Data Lists" and saves
     that ScriptNode. See parse-args.lib.js circa line 144.
     However if that user is not a Site Manager then they do not have permissions to create the container and
     an exception is thrown which results in a disabled 'New List' button.
     In fact, the creation of the container node was already being run as system. But the Site.save() call was not and
     that was the call that was producing a permissions exception.
     In order to run the whole thing as system (which is not available in the JS layer), I have extracted the JavaScript
     logic into a new Java-layer method createAndSaveContainer(...) and JS now makes that one call.
   24289: Fixed misleading javadoc comment relating to ALF-4282
   24290: Merged BRANCHES/DEV/BELARUS/V3.4-2010_11_29 to BRANCHES/V3.4: 
      24238: ALF-5556 : Items disappear from document library after changing its name
   
   Also added new unit test to verify that site containers can not be renamed.
   24295: Fixes ALF-4290: Installer text errors
   24302: Fixes for dependencies for the SDK.
   24305: Added logging to JodConverterSharedInstance (Alfresco's JodC-facing class)
   Re-enabled the JodC-related test classes - these may break the build.
   Set logging in JodC to DEBUG
   24307: Removing a debug statement which is verbose and unhelpful at a high frequency.
   24310: Merged BRANCHES/V3.3 to BRANCHES/V3.4:
      24283: Fix for ALF-2232: "Collaborator actions in CIFS(Share) are incorrect"
   24311: Fix for ALF-2232: "Collaborator actions in CIFS(Share) are incorrect"
     - missed root dir and import
   24313: ALF-3044: Audit log is incorrect when trying to filed it as record
   
   24315: Merged BRANCHES/V3.3 to BRANCHES/V3.4:
      24314: If the repo is running in read only mode, skip the periodic Tag Scope sweep and update (ALF-6067)
   24317: Disabled the OOoJodC tests again as I should have some info to proceed while we get a good build on this plan.
   "You put your left leg in..."
   24319: Moved logging of soffice file permissions to before the attempt to start JodConverter.
   24321: 
   24323: Changing the use of File.createTempFile to TempFileProvider.createTempFile mostly in test code.
     None of these temporary files are needed for longer than a few seconds.
     By using our own TempFileProvider there will be a chance that our tempFileCleaner will delete temporary files.
     Derek pointed out that there are a lot of such temporary files in our build server's temp dir.
   24330: Data generation for perf. tests: Ensure content is written to file
   24333: Merged V3.4-2010_11_29 to V3.4
      24237: ALF-5829: Cannot upload files to Records Managemennt site using WebDav from Mac OS X.
             Return "403 Forbidden" status if WebDAVMethod.execute() fails with AccessDeniedException.
   24339: Fixed a bug where task properties were not being updated when task was transitioned.
   24340: Fixed a bug where task properties were not being updated when task was transitioned.
   24349: turn off debug logging
   24351: ALF-3584 Cleaning up SDK list of libs.   (I think there may be a limit on the size somewhere)
   24355: Tika update to better support encrypted PDFs (ALF-6040)
   24357: Turned off JodConverter hanging tests again.
   I won't turn these back on again now. Apologies for all the disruption.
   I have a basis on which to address the hanging issue on my own machine now.
   24359: Add code to probe intermittent test failure.
   24368: Patched build of JodConverter.
     This changes jodconverter's OfficeUtils.toUrl(File) method so that it uses Alfresco's mechanism for
     creating OpenOffice URIs.
   24371: Fix for ALF-5563: Sorting documents with multiple locales
   - d:text now uses the .no_locale field for sorting using the user's locale collation
   24372: Turning the jodconverter-related logging down from 'debug' to 'info' by default.
   24373: Merged V3.3 to V3.4 (Missed merge)
      21907: ALF-4401: Web services not working on Websphere 7 (ever?)
         - Added in Sun SAAJ and JAXP reference implementations to shared library in order to make CXF work
         - Removed old Sun SAAJ libraries as these are embedded into JDK 1.6
   24376: ALF-2761: RM adds rma:record to IMAP messages in non RM folders
   
   24378: When copying content, reset the auditable properties. 
   This makes the person doing the copy the creator/modifier, and resets the created/modified at times to now. Avoids the issue of being able to copy a node but then not edit it. Fixes ALF-5288
   24381: Fixed ALF-6002 "Share links and images break when saving html content"
   - Editor content was never persisted to hidden textarea after non "keyup" events, such as embedding links & images
   - Also added tinymce's src files when running alfresco in debug mode
   24383: Fix for ALF-5967 - reset the SpringMVC View Resolvers when the Surf Refresh Object Registry cmd is used.
   24385: Merged BRANCHES/V3.3 to BRANCHES/V3.4
      24384: Merged PATCHES/V3.3.4 to BRANCHES/V3.3
         24382: Fixed ALF-6087 "Wiki: all buttons are disabled in IE" by quoting "delete" (as it is a reserved js word)
   
   24386: Fix for ALF-1339: Share - Posts in discussions can be edited and deleted by any members
   24389: Merged V3.3 to V3.4
      24388: Fix ALF-6128: Upload/recall documents with apostrophe/accent via Alfresco Office plugin
   24395: Fix for ALF-6009: Workflow "View More Actions" link incorrect when first char of site URL is numeric
   24398: Merged DEV-TEMPORARY to V3.4
      24320: Fix ALF-4868: An error occurs, while adding content to space with "has-tag" rule
   24401: More code to probe intermittent IMAP test failure.
   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.
   
   Time to process 4 small rss feeds while running in the profiler:
   Using Rhino regex: 6670ms (required ~3500MB of temp RAM)
   Using Java regex:  1550ms (required ~30MB of temp RAM)
   24404: Merge V3.3 to V3.4 (RECORD ONLY)
     24403 : Merge V3.4 to V3.3
         ALF-5539
   24415: Merged BRANCHES/V3.3 to BRANCHES/V3.4:
      24306: ALF-5987: AVM - AVMNodeDAOIbatis.getRootNodeByID does not seem to handle nulls properly
   24416: Merged BRANCHES/V3.3 to BRANCHES/V3.4: 
       24306: ALF-5987: AVM - AVMNodeDAOIbatis.getRootNodeByID does not seem to handle nulls properly (add logger)
   24420: Merge from V3.3-BUG-FIX to V3.4
     V3.3-BUG-FIX r.24419
       V3.3 r.24418 Fix for ALF-6075. Running out of /tmp space on the server is causing uploads to fail.
   24453: Fixed ALF-6116 "Incorrect behavior of sites filter" 
   - Made rest calls sequential rather than parallell
   24455: Merged BRANCHES/V3.3 to BRANCHES/V3.4:
      24454: AVMStoreDAOIbatis auto-unboxing NPE (see also ALF-5987)
   24456: Resolve ALF-5875 - RM Constraint cannot be used for custom models (via RecordsManagementAdminService)
   24462: Merge V3.3 to V3.4 (RECORD ONLY)
     24460 : Merge HEAD to V3.3
       22680 : ALF-4015 Benchmark broken
   24467: Remove unused labels as part of ALF-6092
   24470: Merged V3.3 to V3.4
      24469: Fix for ALF-6006 - reworking of Share site-index initialisation to use "lazy" dashboard filter.
              - ensures user dashboard is available without having to enter Share via the default index page.
   24473: ALF-6105 - Upgrade from 2.2 to 3.4.0.R1.86 fails with Custom attributes found - will require custom migration patch: [.href]
   24474: Possible fix for ALF-5969. JodConverter.
     I noticed that SuspendableThreadPoolExecutor.available (a non-volatile, non-synchonized accessed boolean)
     is being updated by multiple threads and there may be stale reads of this field by some threads.
     I apply this fix in hope more than expectation that it will fix the JodC problems we're seeing.
   24489: Fix MT startup (Failed to init namespaceRegistry)
   - see also ALF-6029
   24491: ALF-6058: Quickr module doesnot not work.
   
   Checkin comments:
   
   Doesn't broadcast ContextRefreshedEvent and ContextClosedEvents for subsystem context parent.
   Add corresponding unit test: SubsystemsTest.testALF6058().
   
   24494: Merged BRANCHES/V3.3 to BRANCHES/V3.4:
      24298: ALF-6043: AVM orphan reaper - handle concurrent node delete (WCM cluster)
   24499: ALF-5917 Added a property that allows switching off of email notifications for Nominated invitations.
   24500: Merge 3.3 to 3.4:
   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.
   24501: Merged (and fixed) DEV/BELARUS/V3.4-2010_12_14 to V3.4
   + fixed hard bean reference to injection
   + tested with index test running with continual back up
   24502: Merged (and fixed) DEV/BELARUS/V3.4-2010_12_14 to V3.4 (missed merge info)
   + fixed hard bean reference to injection
   + tested with index test running with continual back up
   24503: ALF-6113 - Don't include non-standard {music} namespace properties when extracting metadata from MP3s. (Don't merge to HEAD)
   To be fixed fully with ALF-6170 via defining an audio content model
   24504: ALF-4373: It's impossible to upload record if any record was previously frozen
   
   24506: Fixes ALF-6181: Add default site notification e-mail settings to global properties
   24511: ALF-5769 - Failed to signal transition from workflow "Expired content in 'Test'" task when click "Task Done"
   24512: Fix for ALF-6100 - Incorrect behaviour of preview content in Share - Websphere specific.
   24522: Merged V3.3 to V3.4
      24521: Fix for ALF-5065 - Share - Missing notify_user_email template
   24523: Fix for ALF-6171: Access Denied error in Alfresco Exporer when in Read-only mode (Websphere)
   24534: Merged V3.3 to V3.4
      24447: Support for ALF-5533 and ALF-5023: Make ContentStore.delete behaviour consistent w.r.t. true/false return value
      24472: Code for ALF-5023: Allow the retention schedule to be extended for XAM nodes
      24515: Fixed ALF-5023: Allow the retention schedule to be extended for XAM nodes
      24533: Minor XAM changes that mainly affect the QA tasks
   24541: ALF-6029 - MT: cannot "Show Folders" in Afresco Share
   24550: Fix for ALF-6088: Categories are unavailable at the Server B after deleting category at the Server A
   - category service handles invalid node refs correctly
   24551: Merge V3.3 to V3.4 (RECORD ONLY)
      24547: Fixed ALF-6188 "Object finder does not allow select users in the singleSelect mode"
      24549: Fixed ALF-6188 "Object finder does not allow select users in the singleSelect mode" part 2 (typo)
   
   24558: Merge V3.3 to V3.4
     24557 : Merge DEV to V3.3
        24527 : ALF-4724 ftp server and list.
   24559: Removed svn:mergeinfo on root
   24561: 
   24564: Fix for ALF-3727: Custom permissions aren't visible in Explorer UI
   - the default Alfresco permission model (or the one associated with the permission model dao is loaded first
   - all other models will be loaded in any order unless specific bean dependencies are added (if ordering is important you need to add it via Spring) 
   - there is no collision detection :-)
   24582: Merged V3.3 to V3.4
      24578: Fix for ALF-4729 and ALF-6048 - Unable to access Share [or Explorer] through NTLM SSO on Safari
   24583: Oracle build fix: ALF-4223: Oracle: testTaskInstanceGet in WorkflowRestAPiTest is only failing on Oracle build plan
   - work around for oracle null === ""
   24588: Committing installer updates for DDraper, fixes: ALF-6096 & ALF-6019
   24602: Build fix for RM permission model loading - collateral damage for R 24564
   24606: Merged BRANCHES/DEV to BRANCHES/V3.4:
      24563: ALF-6063: Alfresco 3.4.0.RC1.86 fails to connect to virtualization server
   24607: Merged V3.3 to V3.4
       24605: Fix for ALF-5552: Many REST API scripts are not resilient to stale Lucene indexes
   24608: ALF-5555: It is impossible to edit review date from record's details page
   
   Implementation of changable "Edit Review Date" date for properties view.
   The structure of dod5015 properties was undefined. An asynchronous call to web script has been added for preservation of the entered date.
   
   24615: Fixes: ALF-6254 - Typo in Dashlets properties file
   24620: Removed RC1 from label
   24623: Installer updates to use new binary versions for SWFTools (0.9.1) and Apache Tomcat (6.0.29)
   24624: Add line break.
   24627: Fix execute permissions for OOo
   24630: Tweak AVM test
   24634: Update root pseudo folder timestamps when new stores are added so NFS clients see the update. ALF-5197.
   24637: RM Caveats - split service/component
   - related to rmEntryVoter (ALF-5875 & ALF-6231)
   24661: ALF-6303: fix typo in upg script


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@26789 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-04-11 14:24:38 +00:00
Jan Vonka
da8935725d Merged BRANCHES/V3.4 to HEAD:
23440: Resolve ALF-5492 - MT: CMIS getRepositoryInfo fails with "Read-Write transaction started within read-only transaction"


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@24230 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-12-06 11:16:38 +00:00
David Caruana
b482ea50f8 Resolve ALF-5042: Default root folder path '/Company Home' not found
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22837 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-10-04 10:48:18 +00:00
David Caruana
c604c9f093 Merged BRANCHES/DEV/V3.3-BUG-FIX to HEAD:
21646: ALF-3752: Getting Parent on a specific version throws exception
   21655: Fix ALF-4006: Incorrect search result after renaming a folder
   21634: Fix ALF-3822: Storing of datetime does not work

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@21662 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-08-06 14:24:02 +00:00
Andrew Hind
839f421e5f Split out the lucene query parser from the core repository.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20978 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-07-07 12:31:10 +00:00
Derek Hulley
4872eb9909 Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-5 to HEAD:
20678: DAO5 branch: Preparation for merge back to HEAD
   20689: Merged DAO4 to DAO5
        - Removed all 'dbscripts/create/3.x/SomeDialect' and replaced with 'dbscripts/create/SomeDialect'
          DB create scripts are taken from latest DAO4
        - TODO: FixAuthoritiesCrcValuesPatch needs query implementation in PatchDAO
        Merged DAO3 to DAO4
           - Reapplied fixes for ALF-713 (race condition on Usages)
           19350: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-2 to BRANCHES/DEV/V3.3-DAO-REFACTOR-3:
               18939: SAIL-4 :2nd stage branch for DAO refactor off HEAD rev 18898
               18948: Merged V3.3-DAO-REFACTOR to V3.3-DAO-REFACTOR-2
                    18202: Dev branch for DAO refactor
                    18252: SAIL-233: QName.hbm.xml
                    18295: Added missing CREATE TABLE statements for QName-related code
                    18324: SAIL-234: Node.hbm.xml: Node aspects initial integration
                    18355: Added 'setValue' method to manually update the cached value
                    18356: MV property stressing lowered to speed test up
                    18357: SAIL-234: Node.hbm.xml
                    18376: Pulled all Alfresco-related create SQL into script
                    18389: SAIL-234: Permissions DAO refactor - initial checkpoint
                    18390: Formatting only (line-endings)
                    18400: SAIL-234: Node.hbm.xml
                    18418: SAIL-234: Node.hbm.xml: 'alf_node_assoc' CRUD
                    18429: SAIL-234: Node.hbm.xml: Cleaned out all Hibernate references to NodeAssocImpl
                    18457: SAIL-234: Permissions DAO refactor
               18959: Merged DEV/V3.3-DAO-REFACTOR to DEV/V3.3-DAO-REFACTOR-2
                    18479: SAIL-234: Node.hbm.xml - fix updateNode (missing id when saving oldDummyNode)
                    18482: SAIL-235: remove Permissions.hbm.xml
                    18517: SAIL-235: Permissions DAO refactor
                    18523: SAIL-234: Node.hbm.xml
                    18524: SAIL-235: Permissions DAO refactor
               18960: Merged DEV/V3.3-DAO-REFACTOR to DEV/V3.3-DAO-REFACTOR-2
                    18533: Flipped back to Windows line endings
                    18535: Formatting-only (eol)
                    18540: Formatting-only (eol)
                    18541: SAIL-235: Permissions DAO refactor
                    18543: SAIL-234: Node.hbm.xml: Start alf_store changes
                    18567: SAIL-235: Permissions DAO refactor
                    18596: SAIL-305:  Alfresco DDL - formatted/rationalized and added missing indexes & fk constraints
                    18603: SAIL-311: Minor cleanup for schema upgrade scripts (V3.3)
                    18604: SAIL-311: Remove empty dirs
                    18619: SAIL-274: Locale.hbm.xml
                    18621: Added method to create default ACL
                    18622: SAIL-234: Node.hbm.xml: Store, Transaction, Server and some node
                    18624: Formatting only (eol)
                    18631: SAIL-235: Permissions DAO refactor
                    18633: SAIL-235: Permissions DAO refactor - do not expose CRUD for AceContext (or AuthorityAlias) since currently unused
                    18639: getLocale(Locale) should return null if it doesn't exist
                    18640: SAIL-234 NodeDAO: More replacement of node queries and updates
                    18648: SAIL-310: Create SQL script for core repo tables (All DB ports)
                    18651: SAIL-234 NodeDAO: Moves across stores handle presence of target deleted nodes
               18961: Merged DEV/V3.3-DAO-REFACTOR to DEV/V3.3-DAO-REFACTOR-2
                    18658: SAIL-274 Locale DAO: Missing getValueKey() method
                    18662: SAIL-235: Permissions DAO refactor - further cleanup (of DbAccessControlList usage, including copyACLs)
                    18664: DB scripts porting for PostgreSQL finished.
                    18668: SAIL-234 Node DAO: Note in case Transaction Change ID is dropped from indexes
                    18669: SAIL-234 Node DAO: deleteNode and archive (store move) fixes
                    18672: DB scripts porting for Oracle finished. 
                    18675: SAIL-235: Permissions DAO refactor 
                    18677: DB scripts porting for DB2 finished.
               18964: Merged DEV/V3.3-DAO-REFACTOR to DEV/V3.3-DAO-REFACTOR-2
                    18687: Execute a callback with retries
                    18688: SAIL-234 Node DAO: Child association creation
                    18690: SAIL-234 Node DAO: Comment out raw creation of stores as it breaks subsequent bootstrap checks
                    18691: SAIL-234 Node DAO: More replacement of alf_child_assoc handling
                    18713: Commented about needing a more efficient removeChildAssociation method
                    18714: SAIL-234 Node DAO: Replaced queries on alf_child_assoc
                    18715: SAIL-234 Node DAO: More alf_child_assoc query replacement
                    18727: SAIL-234 Node DAO: alf_child_assoc queries complete
                    18737: SAIL-234 Node DAO: Tweaks to newNode and implemented prependPaths
                    18741: SAIL-234 and SAIL-334: Moved UsageDelta Hibernate code and queries over to UsageDeltaDAO
                    18748: SAIL-234 Node DAO: fix NPE (EditionServiceImplTest)
                    18769: SAIL-234 Node DAO: alf_node_properties ground work
                    18786: SAIL-234 Node DAO: alf_node_properties and cm:auditable properties
                    18810: Added EqualsHelper.getMapComparison
                    18813: TransactionalCache propagates cache clears and removals during rollback
                    18826: SAIL-234 Node DAO: Moved over sundry references to NodeDaoService to NodeDAO
                    18849: SAIL-237: UsageDelta.hbm.xml - eol formatting only (including removal of unwanted svn:eol-style=native property)
                    18869: SAIL-234 NodeDAO: Fixed more references to 'nodeDaoService'
                    18895: SAIL-234 NodeDAO: Queries for alf_transaction
                    18899: SAIL-234 Node DAO: Fixed bean fetching for 'nodeDAO'
                    18909: SAIL-234 NodeDAO: Fixes to getNodeRefStatus and various txn queries
                    18916: SAIL-234 NodeDAO: Fixed moveNode alf_child_assoc updates
                    18922: SAIL-235: DAO refactoring: Permission.hbm.xml
                    18930: SAIL-235: DAO refactoring: Permission.hbm.xml
                    18932: SAIL-234 NodeDAO: Fixing up gotchas, javadocs and some naming
                    18933: SAIL-234 NodeDAO: Minor neatening
                    18935: SAIL-234 Node DAO: Caches for ID to NodeRef and StoreRef
                    18936: EHCache config files line endings
                    18938: SAIL-237: Usage DAO refactor - initial checkpoint
                    18945: SAIL-235: DAO refactoring: Permission.hbm.xml. Move Node.
               18975: Fix for move-node ACL jiggery-pokery
               19067: SAIL-4: fix VersionHistoryImpl.getSuccessors (causing VersionServiceImplTest.testGetVersionHistorySameWorkspace failure)
               19068: SAIL-234: fix VersionMigratorTest.testMigrateOneVersion
               19074: SAIL-237: Usage DAO - update to common iBatis mapping pattern(s) to ease DB porting
               19076: SAIL-231: Activities DAO - update to common iBatis mapping pattern(s)
               19077: SAIL-232: AppliedPatch DAO - minor cleanup (comments & formatting only)
               19092: Merging HEAD to DEV/V3.3-DAO-REFACTOR-2
                     18973: Temporarily comment out AVMTestSuite and run AVM tests individually
                     19056: AVM unit test improvements
               19097: SAIL-235: DAO refactoring: Permission.hbm.xml: Additional index to support queries to find the id and acl id for the primary children of a node.
               19185: SAIL-238: Permissions DAO - (minor) update to common iBatis mapping pattern
               19289: SAIL-234 NodeDAO: Node cache replaces NodeRef cache
               19302: SAIL-234 Node DAO: Added cache for node properties
               19318: SAIL-4: AVM DAO - (minor) update to common iBatis mapping pattern
   20690: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-4 to BRANCHES/DEV/V3.3-DAO-REFACTOR-5:
        20063: (RECORD ONLY) DAO refactor branch V4
        20146: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-3 to BRANCHES/DEV/V3.3-DAO-REFACTOR-4:
             19401: SAIL-234 Node DAO: Fix permission service tests (setPrimaryChildrenSharedAclId needs to invalidate nodesCache)
             19428: Fixed TransactionalCache issue with null and NullValueMarker
             19429: Took empty cm:content creation out of FileFolderService#createImpl
             19430: SAIL-234 Node DAO: Tweaks around caching and cm:auditable
             19431: SAIL-4 DAO Refactor: Exception thrown when attempting writes in read-only txn have changed
             19436: SAIL-234 Node DAO: Fix NPE during cm:auditable update
             19475: Allow debugging of code without stepping into trivial stuff
             19476: Follow-up on 19429 by ensuring CIFS/FTP set a  mimetype on the ContentWriter
             19477: SAIL-234 Node DAO: Leverage DAO better for NodeService.addProperties
             19478: SAIL-234 NodeDAO: Added toString() for ParentAssocsInfo (cache value for parent assocs)
             19479: SAIL-234 Node DAO: Fixed for parent association and property caches
             19480: Made TransactionAwareSingleton bind-key a GUID
             19481: SAIL-234 Node DAO: Reinstated 100K collection property tests
             19482: SAIL-234 Node DAO: Node and property cache fixes highlighted by unit tests
             19483: SAIL-234 Node DAO: Start on NodeBulkLoader implementation
             19595: SAIL-234 Node DAO: Fix moveNode to detect cyclic relationship prior to updating ACLs for moved tree FileFolderServiceImplTest.testETHREEOH_3088_MoveIntoSelf)
        20147: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-3 to BRANCHES/DEV/V3.3-DAO-REFACTOR-4:
             19602: (RECORD ONLY) Reintegrated with HEAD up to rev 19433
             19621: (RECORD ONLY) SAIL-347
             19683: (RECORD ONLY) Reverse-merged 19621 for SAIL-347
             19722: (RECORD ONLY) Merged /alfresco/HEAD:r19434-19721
        20150: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-3 to BRANCHES/DEV/V3.3-DAO-REFACTOR-4:
             19741: Merged DEV\V3.3-DAO-REFACTOR-2 to DEV\V3.3-DAO-REFACTOR-3
                   19739: Extended "move" tests
             19743: Fix AuditableAspectTest.testAddAspect (to allow for node modified date tolerance)
             19748: Remaining part of merge from HEAD to V3.3-DAO-REFACTOR-3
                   19367: Merged BRANCHES/V3.2 to HEAD:
                       19286: Fix for ALF-626 "Using 'null' as an authority argument in clearPermissions() cause a java.lang.NullPointerException"
             19755: SAIL-234 Node DAO: Fix RepoAdminServiceImplTest.testConcurrentDynamicModelDelete (handle InvalidNodeRefException after getChildAssocs)
   20692: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-4 to BRANCHES/DEV/V3.3-DAO-REFACTOR-5:
        - Retired all 1.3 and 1.4 upgrade scripts ... R.I.P.
        - Fixed CRC patch for Authorities (only tested on MySQL)
        - Fixed SQL patch revision numbers and bumped version schema number up
        20158: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-3 to BRANCHES/DEV/V3.3-DAO-REFACTOR-4:
             19773: SQL mappings and scripts: SAIL-310, SAIL-304, SAIL-303 and SAIL-347
             19774: Futher fix for SAIL-310: Sequence patch must take into account sequences created for 3.3
             19851: SAIL-371 (SAIL-294) NodeDAO fallout: Fix QName and Namespace read/write handling and bean name in unit test
        20183: Merged DAO3 to DAO4
             19852: SAIL-370: Remove LinkValidation
             19853: SAIL-239 (SAIL-294) Attributes.hbm.xml: Added ability to attach arbitrary property to unique context
             19857: SAIL-373 Fallout from Permissions DAO refactor (SAIL-235)
             19864: SAIL-239 (SAIL-294): Removed AttributeService RMI API
             19865: More SAIL-239 (SAIL-294): Removed AttributeService RMI API
        20208: DAO-refactor implementation of ALF-2712 query improvements
        20209: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-3 to BRANCHES/DEV/V3.3-DAO-REFACTOR-4:
             20060: Removal of AttributeService for SAIL-239 (SAIL-294)
        20348: SAIL-371 (SAIL-294): Protect collection properties during map insert and retrieval
        20547: SAIL-371 (SAIL-294) Attributes.hbm.xml: implement getAttributes + fixes
        20573: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests and other fallout
        20597: SAIL-239 Attributes.hbm.xml: WCM/AVM locking test fixes (wip)
        20598: SAIL-239 Attributes.hbm.xml: WCM/AVM locking test fixes (wip) - fix AssetServiceImplTest.testSimpleLockFile NPE
        20600: Fix PropertyValueDAOTest.testPropertyValue_Enum (follow-on to r20060 for SAIL-239 - which introduces ENUM prop vals)
        20601: Fix UsageDAOTest.testCreateAndDeleteUsageDeltas NPE (would also affect ContentStoreCleanerScalabilityRunner)
        20603: Fix CMISPropertyServiceTest.* (fallout from r20146 <- r19429 <- Took empty cm:content creation out of FileFolderService#createImpl)
        20604: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests - TransferServiceImplTest.*
        20618: SAIL-371 (SAIL-294): NodeDAO: AuditableAspectTest (fix testCreateNodeWithAuditableProperties_ALF_2565 + add remove aspect test)
        20624: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests - UserUsageTest.*
        20626: Fixed random keys for RuleTrigger NodeRef tracking
        20635: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests - PersonTest.testSplitDuplicates
        20642: SAIL-371 (SAIL-294) DAO: Fixed CacheTest
        20643: Removed must of the 'distribute' target's dependencies.  Not for HEAD
        20645: Follow-on to r20643 (Removed most of the 'distribute' target's dependencies.  Not for HEAD)
        20654: SAIL-371 (SAIL-294): NodeDAO: DMDeploymentTargetTest.* (do not try to remove mandatory aspects)
        20655: SAIL-371 (SAIL-294): NodeDAO: Initial fix for TaggingServiceImplTest.testTagScopeUpdateViaNodePolicies (+ minor test cleanup)
        20657: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests - VersionMigratorTest.testMigrateOneVersion (cm:accessed not returned if null)
        20658: Merged (back merge only - no merge info) BRANCHES/V3.3 to BRANCHES/DEV/V3.3-DAO-REFACTOR-4:
             20090: Dynamic models: minor improvements to DictionaryModelType
             20554: Improvement to model delete validation (investigating intermittent failure of RepoAdminServiceImplTest.testSimpleDynamicModelViaNodeService)
        20662: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests - RecordsManagementAuditServiceImplTest.* (we now ignore attempt to update 'cm:modifier' prop so update 'cm:title' prop instead)
        20666: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests - ADMLuceneTest.*
        20668: SAIL-239 (SAIL-294) - delete WCM locks + tests (follow-on to r20060)
        20674: SAIL-371 (SAIL-294) NodeDAO fallout: Cleaner and additional checks for ContentStoreCleaner
        20675: SAIL-371 (SAIL-294) NodeDAO fallout: Fixed handling of ContentData


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20693 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-06-17 19:35:49 +00:00
David Caruana
bc7235472b Merged BRANCHES/V3.3 to HEAD:
20496: Fix ALF-2959: canCheckout object allowable action returns invalid values.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20497 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-06-02 17:48:04 +00:00
David Caruana
9dac0368c1 Fix ALF-3086: CMIS checkin of a non-versionable document should make it versionable
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20477 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-06-01 15:17:07 +00:00
David Caruana
16d62588ad Update test to reflect changes to CMIS version mapping.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20354 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-05-23 12:39:02 +00:00
David Caruana
2df10ea85d Fix ALF-2319: CMIS 'current' version mapping is not compliant with spec
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20345 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-05-21 17:56:57 +00:00
David Caruana
a9267014d7 Fix ALF-2774: Atompub createDocument with versioningState=checkedout followed by checkin does not create major version
Fix ALF-2782: AtomPub binding incorrectly handles atom:title when no value is provided (often done for compliant atom entry)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20190 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-05-12 10:10:01 +00:00
Andrew Hind
54c67e5aa2 Fix for ALF-2609: CMIS ACL mapping improvements
- repository specifc reporting includes actual assigned permissions + CMIS permissions reported as indirect 
- CMIS format reports cmis permissions directly set for Read, Write and All only
- Apache Chemistry CMIS AtomPub TCK pass
- cmis-tck-ws ACL test pass

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20051 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-04-30 10:26:39 +00:00
David Caruana
e64c4114a2 Update CMIS index page - spec references.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19939 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-04-21 15:26:01 +00:00
David Caruana
8652b3c8df Fix ALF-2401: Unable to map content models with default namespace prefix to CMIS
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19838 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-04-13 13:08:29 +00:00
Andrew Hind
b17f139fb0 Fix for ALF-2376: Expose cmis:baseTypeId as queryable property (or at least include it in the returned query result properties) PART 2: baseTypeId is now queryable
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19821 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-04-12 13:51:00 +00:00
David Caruana
f901c63daa Fix ALF-2332: getRelationships fails for associations whose source or target types are not mapped to the CMIS domain model
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19747 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-04-06 17:01:24 +00:00
David Caruana
eb20aa587b Merging BRANCHES/DEV/BELARUS/HEAD-2010_03_09 to HEAD:
19261: CMIS-WS:

Bug fixing in WS Bindings and CMISServices

Bug related to DeleteTree with "unfile" flag was fixed.
- Removal of secondary parent associations was added to CMISServices.deleteObject method.
Objects state verification was added to MultifillingService.
- Verification of object and folder type was added. Verification of object presence in folder was added.
- Checking constraints for versioning typeDef was added.
DiscoveryService.query() problems were fixed.
- includeRelationships feature was added to DMDiscoveryServicePort.query().
- DMAbstractServicePort was refactored and extended to introduce functionality required for includeRelationships feature in other
binding port implementations.

TCK bug fixing
- Test cases in Java TCK tests for Query Ordering problem demonstration were developed
(CmisDiscoveryServiceClient.testQueryWithAscendingOrdering() and CmisDiscoveryServiceClient.testQueryWithDescendingOrdering()).
- CmisDiscoveryServiceClient.testQueryAllVersionsSearchable() was corrected. Using of invalid property "cmis:parentId" for none folder
object was removed.
- CmisDiscoveryServiceClient.testQueryRelationships() was fixed. Currently, this method correctly tests relationships receiving for
each EnumIncludeRelationships constant. Relationships supporting by repository checking was added. Test was redeveloped against new
functionality.
- Expected exceptions verification was corrected.
- Properties filter was corrected in concordance with CMIS Specification.
- RepositoryInfo and capabilities assertion was fixed and extended.
- Test for latest non-major version receiving was corrected.
- TCK Build file was corrected. WSI part was removed. Target "jar" that creates one executable jar was added.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19270 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-03-12 22:27:42 +00:00
Dave Ward
22ec153ed9 SAIL-160: CMIS Policy no-op implementations
- SOAP and REST binding create/update methods throw exceptions allowed by spec and read method returns empty set
- Moved transaction interceptor into org.alfresco.repo.transaction package and removed redundant runAs call
- PropertyFilter parsing corrected and made a shared service
- Removed replicated code from webservice getTypeDefinition implementation
- Moved association property getting into CMISServices

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19239 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-03-11 22:41:13 +00:00
David Caruana
1b8a6858c0 Merging /BRANCHES/DEV/BELARUS/HEAD-2010_03_09/ to HEAD:
19193: CMIS WS transaction atomicity problem was resolved.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19196 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-03-10 16:53:35 +00:00
Dave Ward
673add1796 Allow management of Alfresco Aspects through CMIS REST and SOAP APIs
- In CMIS methods that allow setting of node properties, the <cmis:properties> element may carry an <alf:setAspects> extension that lists
  - aspectsToRemove    
  - aspectsToAdd
  - properties (properties to set belonging to aspects rather than the node type)
- In CMIS methods that allow retrieval of node properties, the <cmis:properties> carries an <alf:getAspects> extension that lists
  - appliedAspects
  - properties (properties belonging to aspects rather than the node type)
- Added extension types to Alfresco-Core.xsd and referenced in extended WSDL
- Plumbed in to Web Service and REST APIs

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19037 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-03-03 18:03:58 +00:00
David Caruana
cd339edad4 Update to latest Chemistry TCK for new relationship tests
- also fix relationship issues as found by relationship tests

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18954 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-03-02 18:08:21 +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
David Caruana
86e84a93af Fix canGetFolderParent and canGetObjectParents allowable actions for root folder.
- always returning true, but now take into account that parent actually exists and is readable.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18904 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-03-01 12:26:55 +00:00
Dave Ward
1b96984c3a SAIL-173: Added processing of includeRelationships argument to CMIS REST and SOAP bindings
- Despite its name, this argument is not a Boolean!
- TODO: Extend TCK to test relationships

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18897 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-02-27 15:23:11 +00:00
Dave Ward
73f11285b7 Merged DEV/CMIS_10 to HEAD
18731: SAIL-169: CMIS REST versioning compliance
      - Rendering of "via" link for working copy and "current-version" and "working-copy" links for documents
      - Added ability to dereference object IDs in cmisproperty() template function
      - Fixed broken CMIS index page


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18896 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-02-27 13:24:10 +00:00
David Caruana
14a0a5623f Fix CMISPropertyServiceTest after merges.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18883 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-02-26 12:36:09 +00:00