Commit Graph

32 Commits

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


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


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@47186 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-02-27 11:56:13 +00:00
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
Dave Ward
9c563e35c6 Merged V3.4-BUG-FIX to HEAD
24662: 3.4.1 bug fix branch
   24718: Merged V3.3 to V3.4-BUG-FIX
      24717: Fix ALF-5555: It is impossible to edit review date from record's details page
   24719: Fix for ALF-6106: Error on Check In operation with % symbol (SPP)
   24733: Better fix for ALF-6106: Error on Check In operation with % symbol
   24734: Fix for ALF-6089: Incorrect order of fields at 'Create Series', 'Create Category' and 'Create Folder' forms   
      The name, title and description fields are now placed in their own group on the server, all other non custom rm fields are put in an 'other' group, the client side config then declares a set for each group and orders them appropriately.
   24752: Merged V3.4 to V3.4-BUG-FIX
      24751: Merged V3.3-BUG-FIX to V3.4 (RECORD ONLY)
         Restored V3.3-BUG-FIX mergeinfo, somehow truncated in revision 24274
   24753: Merged V3.3-BUG-FIX to V3.4-BUG-FIX
      23870: Merge Dev to V3.3_BUG_FIX
         ALF-4243: F5 load-balancer sending regular HTTP requests to Alfresco server causing Faces Servlet to throw java.lang.NullPointerException (MyFaces upgrade to from 1.1.5 to 1.1.7)
      23897: Additional fixes and tweaks since introduction of MyFaces 1.1.7 library.
      23919: More JSF component id related fixes.
      23945: More MyFaces1.1.7 JSF page fix ups
      23959: Another MyFaces 1.1.7 dup id issue fixed.
      24008: ALF-4243
         - Upgraded MyFaces from 1.1.7 to 1.1.8 to fix a bug seen in 1.1.7
         - Added handling for the fact that valuebound properties that result in null now cause an exception where-as they were perfectly valid in 1.1.5.
      24419: Merge from V3.3 to V3.3-BUG-FIX
         r.24418 Fix for ALF-6075. Running out of /tmp space on the server is causing uploads to fail.
   24768: Fixes ALF-6295: Allows MySQL to not be installed via unattended installer invocation
   24771: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX:
      24767: Merged BRANCHES/V3.3 to BRANCHES/V3.4:
           24765: ALF-6547: fix intermittent test failure (AssetServiceImplTest renameFile/renameFolder) - fallout from ALF-1948
   24779: Merge V3.3 to V3.4-BUG-FIX
     24497 : ALF-3092 - deployment service - catch Throwable from Begin.
     24684 : Merge DEV/BELARUS/V3.3-BUG-FIX-2010_10_04 to V3.3
       23498 : ALF-5498 In Windows XP, placing a Folder with a Name that already Exists Removes all Content of the Existing Folder
     24749 :  ALF-6174 - Transfer Service fails with double peer assoc custom content type
     24766 : ALF-5603 - It is impossible to assign workflow from workflow console to non-admin user
   24802: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX:
      24801: Fix for ALF-3055: "SecurityTestSuite hangs when run in DOD5015 context - failed authentication audit hangs on DB connection"
           - do failed audits in a separate thread (from a thread pool)
   24812: Fix ALF-6316: A new "spoof" multivalue text property (cm:tagScopeSummary) is now made available for TagScope nodes when accessed via the getProperty or getProperties operations on the standard node service. The values of this property take the form "<tagname>=<tagcount>". A new interceptor has been added to the node service to do this (TagScopePropertyMethodInterceptor). WQS has been tweaked to make use of this new property, and the now defunct behaviour has been removed.
   24820: Work in progress refactoring transaction handling of transfer unit tests.
   24822: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX:
      24821: Fix for ALF-3055: "SecurityTestSuite hangs when run in DOD5015 context - failed authentication audit hangs on DB connection"
          - fix up unit tests
   24834: ALF-6468 - Update the scheduled actions folder bootstrap to use localisable names and descriptions, following the normal pattern
   24836: Added system property 'system.cache.disableImmutableSharedCaches' (false by default)
    - Equivalent to disabling Hibernate L2 cache for *immutable* entities
    - Allows distinction between mutable and immutable cache entries
   24850: Fix ALF-6562: Moved property that is used to label the WQS dashlet on the "configure site dashboard" page out of the Slingshot project and into the WQS Share Module project. Corrected its value to "Web Quick Start" rather than "WCM Quick Start".
   24857: Merged V3.4 to V3.4-BUG-FIX
      24853: Merged V3.3 to V3.4 
         24852: Fixed ALF-6573 "Incorrect name of subgroups on "Groups" page"
   24870: Removed svn:mergeinfo from root
   24873: Merged V3.3 to V3.4-BUG-FIX (RECORD ONLY)
      21789: ALF-4333: Fix
         - Updated RepoPrimaryManifestProcessorImpl so it can handle deletions that are reported by either pre-delete noderef or archived noderef (previously only handled the latter).
         - Updated TransferManifestNodeFactory so that it handles the case where the status of the node to transfer is "deleted".
         - Updated UnitTestTransferManifestNodeFactory so that it handles the change to TransferManifestNodeFactory above.
         - Added new tests for deletion cases.
      23259: Merged HEAD to V3.3
         23256: Fix ALF-4573: Start Workflow action is absent for edited document and working copy in Share
      23346: Brought WebQS module in (including build process but not installer elements yet)
      23371: "Simply" added wcmqs to installer
      23391: ALF-5367: Copy dlls into tomcat/bin as appropriate.
      23485: Merged V3.4 to V3.3 (fix backported for V3.3.x lines)
         23472: Fixed ALF-5408: SQL Server missing ON DELETE CASCADE declarations
      23515: Merged PATCHES/V3.2.0 to V3.3
         23514: ALF-5554: Merged HEAD to V3.2.0
            23153: When updating tag scopes following system shutdown/restore, be smarter about quickly skipping tag scopes that another (new) thread is currently working on
            23283: More debugging level logging for tagging updates, to help identify the problem with periodic multi-threaded test failures on bamboo
      23535: Merged V3.4 to V3.3 (complements 23517: ALF-5552)
         23508: Fixed ALF-5559: Permission interceptors can fail if Lucene returns invalid NodeRefs
      23564: ALF-5600: Merged V3.4 to V3.3
         23424: Fixes: ALF-2989 - Incorrect sideId reference in URL for event in Site Calendar Dashlet
            Adds support for displaying events that start in the past but finish in the future (previously only events that start in the future were shown)
      23586: MERGED V3.4 to V3.3
         22864: Fix for ALF-5005: "Create and edit functions on AWE become "confused""
         23042: Fix ALF-5127: Impossible to create an article/blog (WCMQS) [Must clear panel hideEvent handler if manually hiding a YUI panel]
         23561: Fixes: ALF-4569 - Removes universal override of input width box and switches the editor form panel to adjust it's width based on content rather than window size. 
                  Fixes: ALF-4570 - Adds an override for the CSS 'top' property of the form dialogue to ensure it's always below the ribbon. (Was being set automatically by the YUI widget.panel call)
         23569: Fixes: ALF-5606 - Ribbon wasn't resizing correctly after the form events.
      23630: Backport of installer
      23631: Added 64-bit & deployment installers
      23664: Fixes ALF-5691: TransferService: Multi-byte characters are not encoded correctly
      23681: Fixes ALF-5699: TransferService: Snapshot file from source repo never contains complete MLText properties
      23695: Fixed bug exposed after fixing ALF-5699. Parsing of MLText properties out of the transfer snapshot file was incorrect, and that was causing multi-lingual property values to be duplicated
      23709: ALF-5699: Fix NPE in ManifestIntegrationTest
      23734: Merged V3.4 to V3.3
         23731: Fixes for ALF-3098 and ALF-3097
             - Share - Security check on Personal Dashboard - only the owning user can view a user dashboard page
             - Share - Security issue on Customize Site Dashboard - private and moderated site dashboard pages no longer visible to non-members, customise site and dashboard pages only accessible to SiteManager
      23747: ALF-5696: Merged V3.4 to V3.3
         23585: Fixed ALF-5372 "JavaScript error on Groups management dialog with IE8 : document.getElementById is null"
      23790: Fixed ALF-3823 "Share: RSS feed can't be read: http://cds-srv.sun.com:8700/rss/update/public/sunalert_update.xml - ok with other RSS client."
      23883: Fixes ALF-5759: WQS: Attempt to copy a website section fails
      23907: Merged DEV/BELARUS/V3.3-BUG-FIX-2010_09_20 to V33
         22750: ALF-4846: Update rules are firing on inbound actions 
      23931: Undid rev 23907 (Reverse-merged /alfresco/BRANCHES/DEV/BELARUS/V3.3-BUG-FIX-2010_09_20:r22750)
      23961: Fixed ALF-5686 "Incorrect behaviour of "All" filter in "My Tasks" dashlet"
         - Variables assigned in a <#macro> shall always be assigned using <#local> (using <#assign> makes them globally available which might cause naming collisions)
      24132: Disable intermittent failing unit test
      24148: ALF-6007: Merged HEAD to V3.3
         23049: Fixed ALF-5099: Error when trying to go back in Create Web Content Wizard (only with certain XSDs)
      24263: Merged from V3.3-BUG-FIX to V3.3
      24264: V3.3-BUG-FIX to V3.3
         24262: Stress test code for ALF-5025: Support background processing of archiving
      24287: Added missing import
      24336: Merged V3.4 to V3.3
         23205: Fix for ALF-2111 - Download URLS are different on different pages, authentication fails when URL sent
      24353: Merged V3.4 to V3.3
         24352: Fix SQL fallout from ALF-6078
      24510: Merged V3.4 to V3.3
         21960: First round of date refactoring: Document Library pages now expect XML dates (ISO8601) from Share data webscripts
         21961: Share client-side I18N utility now emulates sever-side handling of doubled-up single quotes.
      24526: Merged V3.4 to V3.3
         24402: Fix for performance degredation related to ALF-3823. 
             RSS feed processing in JavaScript relies on Rhino impl of regex - this is extreemly slow as Rhino regex is by far the slowest component of the library. 
             Switched code to use the Java Regex libraries to improve performance and reduce memory usage.
      24587: Merged V3.4 to V3.3
         24564: Fix for ALF-3727: Custom permissions aren't visible in Explorer UI
      24604: Merged V3.4 to V3.3 
         24602: Build fix for RM permission model loading - collateral damage for R 24564
      24774: Merged BRANCHES/V3.4 to BRANCHES/V3.3:
         23492: Fixed ALF-5550: DB2: Unable to insert values into alf_string_value
      24813: Merged BRANCHES/V3.4 to BRANCHES/V3.3:
         24750: Limit installer builds to 2 threads
   24874: Merged V3.4 to V3.4-BUG-FIX
      24667: Resolve ALF-6202 - MT: fix offline edit (Share)
      24672: Fixes from Gloria for: ALF-6339 and ALF-6337
      24673: Merge V3.3 to V3.4
         24668 : Upgrade of large repository to latest 3.3 fails on excession of mysql table lock size
      24674: Fixes ALF-6294: Remove illegal CLI option
      24675: Fix ALF-6099: CLONE - IE6: Sometimes errors occur on almost actions in Office Add-ins. Removed linebreaks from JSON response template & prevented "undefined" entries in URL.
      24680: ALF-6120 : Version notes are lost for versioned items migrated from 2.2 to 3.4.0
      24681: Merged BRANCHES/DEV/BELARUS/V3.4-2010_12_14 to BRANCHES/V3.4:
         24609: MT - ALF-3563
         24640: MT - ALF-3563
         (merged w/ minor improvement)
      24685: Fixes ALF-6403: Change installer window height on Linux
      24688: Fix ALF-6029 (part II) 
              - MT: cannot "Show Folders" for "Data Dictionary" in Afresco Share
              - part II adds patch and removes workaround
      24689: Fixes: ALF-6219 - Incorrectly formatted variable in translation
      24691: MT: ALF-3263
              - Explorer login now fails with consistent error message ("Unable to login - unknown username/password.") if tenant does not exist or is disabled
      24692: Fixes: ALF-6370 and ALF-6225 among others - sweep of FR and DE resource bundles for quote escaping.
      24694: Fixes ALF-6424.  Erased erroneous equals sign
      24695: Fixes: ALF-6320 - removed the country specific portion of the language pack suffixes for French, German and Spanish. This enables speakers of those languages outside of those countries to benefit from the language packs.
      24696: Fix for ALF-6299: XSS attack on editing blog post with XSS data in IE6&IE7
      24700: Swaps _it_IT for _it to make Italian language pack available to Italian speakers outside of Italy.
      24703: Avoid DB2 query failure if someone passes in a made-up UUID
              - Test RunningActionRestApiTest was making up a long node UUID
              - DB2 fails to set the parameter with SQLSTATE=22001
      24706: Merged V3.4-BUG-FIX to V3.4
         24705: Fix for ALF-6365, ALF-6335
      24708: Fix ALF-6386: View Details and Edit Metadata icons are incorrect for folder
      24709: Missing first/last name handling.
      24711: Merged V3.3 to V3.4
         24710: ALF-5535 - Fix to correctly format json number values (not as numeric human readable strings)
      24713: Fix ALF-5404: It is now possible to configure who receives notifications of "Contact Us" requests by setting a configuration property on the WQS website node, such as "feedbackAssignee.Contact Request=brian"
             Also added missing Spring MVC source to 3rd Party.
      24715: Fix for ALF-6412. OOoDirect always tries to connect to port 8100.
               Formerly the ooo.port property did not exist for the OOoDirect connector. It was added in r.23182 for the soffice process, but not for the connector bean. Now added for the connector too.
      24721: Fix for ALF-6351 - Simple search breaks if override config is used and does not contain new 'repository-search' element
      24728: Fixes: ALF-5685 - Incorrect encoding of Japanese Characters
      24732: Fixes ALF-6381 and others - calendar strings appearing incorrectly. Problem was an unicode encoded comma preventing the property string being broken up into different days of the weeks or months.
      24739: Fix ALF-6545: DB2: SQLCODE=-302, SQLSTATE=22001 (testCreateMultiLingualCategoryRoots)
              - Shortened Japanese name to 14 characters
      24740: Fixes: ALF-6413 (with some translations still pending).
      24742: Update readmes.
      24744: Merged HEAD to BRANCHES/V3.4:
         24137: Fixes: ALF-5642, ALF-3892, ALF-5043 & Brings Add Event dialog in line with other forms in share by disabling the popup validation error box.
      24746: Build/test fix: PostgreSQL -AssetServiceImplTest.renameFolder
      24755: Merged V3.3 to V3.4 (RECORD ONLY)
         21789: ALF-4333: Fix
            - Updated RepoPrimaryManifestProcessorImpl so it can handle deletions that are reported by either pre-delete noderef or archived noderef (previously only handled the latter).
            - Updated TransferManifestNodeFactory so that it handles the case where the status of the node to transfer is "deleted".
            - Updated UnitTestTransferManifestNodeFactory so that it handles the change to TransferManifestNodeFactory above.
            - Added new tests for deletion cases.
         23259: Merged HEAD to V3.3
            23256: Fix ALF-4573: Start Workflow action is absent for edited document and working copy in Share
         23346: Brought WebQS module in (including build process but not installer elements yet)
         23371: "Simply" added wcmqs to installer
         23391: ALF-5367: Copy dlls into tomcat/bin as appropriate.
         23485: Merged V3.4 to V3.3 (fix backported for V3.3.x lines)
            23472: Fixed ALF-5408: SQL Server missing ON DELETE CASCADE declarations
         23515: Merged PATCHES/V3.2.0 to V3.3
            23514: ALF-5554: Merged HEAD to V3.2.0
               23153: When updating tag scopes following system shutdown/restore, be smarter about quickly skipping tag scopes that another (new) thread is currently working on
               23283: More debugging level logging for tagging updates, to help identify the problem with periodic multi-threaded test failures on bamboo
         23535: Merged V3.4 to V3.3 (complements 23517: ALF-5552)
            23508: Fixed ALF-5559: Permission interceptors can fail if Lucene returns invalid NodeRefs
         23564: ALF-5600: Merged V3.4 to V3.3
            23424: Fixes: ALF-2989 - Incorrect sideId reference in URL for event in Site Calendar Dashlet
               Adds support for displaying events that start in the past but finish in the future (previously only events that start in the future were shown)
         23586: MERGED V3.4 to V3.3
            22864: Fix for ALF-5005: "Create and edit functions on AWE become "confused""
            23042: Fix ALF-5127: Impossible to create an article/blog (WCMQS) [Must clear panel hideEvent handler if manually hiding a YUI panel]
            23561: Fixes: ALF-4569 - Removes universal override of input width box and switches the editor form panel to adjust it's width based on content rather than window size. 
                     Fixes: ALF-4570 - Adds an override for the CSS 'top' property of the form dialogue to ensure it's always below the ribbon. (Was being set automatically by the YUI widget.panel call)
            23569: Fixes: ALF-5606 - Ribbon wasn't resizing correctly after the form events.
         23630: Backport of installer
         23631: Added 64-bit & deployment installers
         23664: Fixes ALF-5691: TransferService: Multi-byte characters are not encoded correctly
         23681: Fixes ALF-5699: TransferService: Snapshot file from source repo never contains complete MLText properties
         23695: Fixed bug exposed after fixing ALF-5699. Parsing of MLText properties out of the transfer snapshot file was incorrect, and that was causing multi-lingual property values to be duplicated
         23709: ALF-5699: Fix NPE in ManifestIntegrationTest
         23734: Merged V3.4 to V3.3
            23731: Fixes for ALF-3098 and ALF-3097
                - Share - Security check on Personal Dashboard - only the owning user can view a user dashboard page
                - Share - Security issue on Customize Site Dashboard - private and moderated site dashboard pages no longer visible to non-members, customise site and dashboard pages only accessible to SiteManager
         23747: ALF-5696: Merged V3.4 to V3.3
            23585: Fixed ALF-5372 "JavaScript error on Groups management dialog with IE8 : document.getElementById is null"
         23790: Fixed ALF-3823 "Share: RSS feed can't be read: http://cds-srv.sun.com:8700/rss/update/public/sunalert_update.xml - ok with other RSS client."
         23883: Fixes ALF-5759: WQS: Attempt to copy a website section fails
         23907: Merged DEV/BELARUS/V3.3-BUG-FIX-2010_09_20 to V33
            - 22750: ALF-4846: Update rules are firing on inbound actions 
         23931: Undid rev 23907 (Reverse-merged /alfresco/BRANCHES/DEV/BELARUS/V3.3-BUG-FIX-2010_09_20:r22750)
         23961: Fixed ALF-5686 "Incorrect behaviour of "All" filter in "My Tasks" dashlet"
            - Variables assigned in a <#macro> shall always be assigned using <#local> (using <#assign> makes them globally available which might cause naming collisions)
         24132: Disable intermittent failing unit test
         24148: ALF-6007: Merged HEAD to V3.3
            23049: Fixed ALF-5099: Error when trying to go back in Create Web Content Wizard (only with certain XSDs)
         24263: Merged from V3.3-BUG-FIX to V3.3
         24264: Merged V3.3-BUG-FIX to V3.3
            24262: Stress test code for ALF-5025: Support background processing of archiving
         24287: Added missing import
         24336: Merged V3.4 to V3.3
            23205: Fix for ALF-2111 - Download URLS are different on different pages, authentication fails when URL sent
         24353: Merged V3.4 to V3.3
            24352: Fix SQL fallout from ALF-6078
         24510: Merged V3.4 to V3.3
            21960: First round of date refactoring: Document Library pages now expect XML dates (ISO8601) from Share data webscripts
            21961: Share client-side I18N utility now emulates sever-side handling of doubled-up single quotes.
         24526: Merged V3.4 to V3.3
            24402: Fix for performance degredation related to ALF-3823. 
                RSS feed processing in JavaScript relies on Rhino impl of regex - this is extreemly slow as Rhino regex is by far the slowest component of the library. 
                Switched code to use the Java Regex libraries to improve performance and reduce memory usage.
         24587: Merged V3.4 to V3.3
            24564: Fix for ALF-3727: Custom permissions aren't visible in Explorer UI
         24604: Merged V3.4 to V3.3 
            24602: Build fix for RM permission model loading - collateral damage for R 24564
      24775: Merged BRANCHES/V3.3 to BRANCHES/V3.4: (RECORD-ONLY) - already in V3.4
         24774: (RECORD-ONLY) Merged BRANCHES/V3.4 to BRANCHES/V3.3:
            23492: Fixed ALF-5550: DB2: Unable to insert values into alf_string_value
      24788: Add evaluation use message for OSX installer
      24790: Removed svn:mergeinfo on root
      24791: Fixed ALF-6560: MIME type not detected (set to application/octet-stream) when content written via FileFolderService
             - First access of content on a new file (FileFolderService.getWriter) guesses a mimetype
             - The initial mimetype guess *was* done during create, but that was expensive.
             - Added unit test to cover regression
      24803: Merged BRANCHES/DEV/dwebster/ to BRANCHES/V3.4:
         24773: DE bug fixes received from translators 10th Jan.
         24776: ES files received from translators 10th Jan
         24793: FR files received from translators 10th Jan
         24792: IT files received from translators 10th Jan
      24804: Temporarily removing Japanese language bundle
      24856: Merged BRANCHES/DEV/dwebster/ to BRANCHES/V3.4:
         24848: Latest Language updates from Translators
      24863: ALF-6029 (MT Share - repo' view after upg)
   24880: Merged V3.3 to V3.4-BUG-FIX
      24463: Fixed ALF-4398 "Path to rule set is not displayed" ($html alias was missing from a merge)
      24465: Merge V3.3 to V3.4 (RECORD ONLY)
         24463: Fixed ALF-4398 "Path to rule set is not displayed" ($html alias was missing from a merge)
      24493: Fix for Mac OS X CIFS logon problem, change UID to start at one as zero has special meaning, plus other minor fixes. JLAN-112.
      24569: Fix for ALF-5333: Webdav - Online editing of files in a folder with German umlauts does not report correct characters
      24611: Fix broken build due to merge #fail (r24460 / ALF-4015)
      24668: ALF-4557 - Upgrade of large repository to latest 3.3 fails on excession of mysql table lock size
      24707: Fix for handling of null first/last name in wiki page list
      24710: ALF-5535 - Fix to correctly format json number values (not as numeric human readable strings)
      24794: Fix for ALF-4984 - Outdated custom-slingshot-application-context.xml.sample file for share
      24798: Fix for ALF-5806: Lucene query does not return expected result.
         - Alfresco FTS now supports the prefixes ~ and = for phrase queries
      24814: Build fix after r24798: Fix for ALF-5806: Lucene query does not return expected result.
      24823: Synchronization improvements to RemoteClient and http proxy hosts
      24825: Fixed #3 of ALF-6308 "Share data issues"
         - Share falls back to use "html uploader" (in all browsers except IE) when "JSESSIONID" cookie is unreachable from javascript (like when "HttpOnly cookies" is activated on the server.
      24835: Fixed ALF-5484: Check-in does not update association
         - Copy code when copying over an existing target node was NOT processing associations
         - Fallout from refactor and subsequent fixes related to ALF-958 (Target associations aren't copied)
         - Some commented-out unit tests reintroduced
      24842: Fix for ALF-6308 item #4 - validate the redirect URL to ensure it is a relative url
      24845: Merged DEV/DAVEW/SAP to V3.3
         23874: ALF-5822: Correct Lucene throttling mechanism to prevent build up of excessive committed deltas
            - Also correct BatchProcessor's mechanism for single-threading batches with cross dependencies
            - Single-threaded batches must be sequenced in order
         23876: ALF-5822: Default lucene.indexer.mergerTargetOverlaysBlockingFactor to 2 for better write performance under load
         24022: ALF-5822: Refinement of fix
            - Don't block a thread that has already entered the prepare phase with another indexer (e.g. a cross-store commit). Otherwise it could block indefinitely and never enter the commit phase
            - Also added extra debug diagnostics and handle all Throwables on failure
         24023: ALF-5822: Minor correction to debug log message
         24421: ALF-6134: Do not export org.hibernate.jmx.StatisticsService through JMX to avoid excessive blocking under load
         24422: ALF-6135: Remove lock contention from concurrent Lucene searches
            - Added a RW Lock and Thread local-based solution to org.apache.lucene.store.FSDirectory.FSIndexInput.readInternal() to avoid contention during multiple parallel Lucene searches. This is already recognized as a bottleneck by the Lucene developers, who offer NIOFSDirectory as an alternative, which unfortunately doesn't work on Windows.
            - Added RW lock to org.apache.lucene.index.TermInfosReader.ensureIndexIsRead()
            - Threads no longer hanging in lucene searches during load tests. Woohoo!
         24423: ALF-6136: Don't call through to org.apache.log4j.NDC unless debug is enabled as it's heavily synchronized. Also avoid dynamic method invocation by using a delegate.
         24426: ALF-6138 (SURF - PARTIAL): 'Warm' the java.beans.Introspector cache for key Freemarker accessible bean classes on loading in static initializers
         24428: ALF-6139 (SURF - PARTIAL): First log in to Share is expensive due to 'lazy' dashboard creation and excessive synchronization
            - Added AVMRemoteStore.createDocuments() for creating multiple XML documents at once, all embedded within the same master XML document in the request body 
            - Added corresponding saveDocuments() methods to Store, RemoteStore, Model, ModelObjectManager and ModelObjectPersister on the Surf side 
            - Used this in PresetsManager 
            - Removed excessive synchronization from StoreModelObjectPersister 
         24429: ALF-6140 (SURF - PARTIAL): Surf tweaks to allow concurrent execution of web scripts
            - Use StrongCacheStorage instead of MruCacheStorage in RepositoryTemplateProcessor to avoid use of a synchronized cache
            - Tweak cache sizes in FreeMarkerProcessor
            - Use thread local object wrapper delegates in QNameAwareObjectWrapper and PresentationTemplateProcessor to work around synchronization in DefaultObjectWrapper
            - Swap in the same object wrapper to WrappingTemplateModel
            - Use a concurrent HashMap in ModelObjectCache and ModelHelper and remove excessive synchronization
            - Use RW locks rather than synchronized blocks in AbstractWebScript
         24431: ALF-6141: Improvements to IBatis DAO performance under load
            - Use lazyLoadingEnabled="false", enhancementEnabled="false" to avoid unnecessary blocking and generation of CGI proxies in IBATIS DAOs
            - Use useTransactionAwareDataSource="false" to prevent Spring from agressively unwrapping DBCP connections and bypassing the prepared statement cache
         24432: ALF-6142: Remove dependency between RepositoryAuthenticationDAO and Lucene
            - Reworked RepositoryAuthenticationDAO to use a node service lookup by child association QName
            - This required adding a patch to 'upgrade' the qnames of existing authentication nodes, which previously all had the same QName
         24433: ALF-6143: Remove net.sf.ehcache.use.classic.lru setting from EhCacheManagerFactoryBean and InternalEhCacheManagerFactoryBean to prevent serialization of accesses to shared caches by multiple executing threads
         24434: ALF-6144:  DirtySessionMethodInterceptor was causing contention between multiple threads calling the same DAO.
            - Unfortunately method.getAnnotation() is a synchronized call, and thus causes concurrent calls to the same method to contended with each other. 
            - Added a non-blocking cache so that DAOs can be accessed in multiple threads without contending. 
         24435: ALF-6145: Use RW Locks in Subsystem Framework
            - The operations relied on by the dynamic proxies wrapping subsystems were synchronized and thus caused contention when multiple threads were calling in to the same subsystem
            - Replaced synchronized blocks with use of read write locks, thus allowing multiple concurrent readers
         24436: ALF-6146: Regulate PermissionModel accesses with RW locks, rather than synchronized blocks and an excessive number of concurrent hashmaps.
         24438: ALF-6136: Fix build classpath
         24439: ALF-6142: Fixed seeding of admin user password
         24444: ALF-6142: Fix unit test fallout
            - InviteServiceTest needs a transaction
            - RepositoryAuthenticationDao must listen for Person username changes and update authentication node qname accordingly
            - Correction to MT handling in RepositoryAuthenticationDao
            - Repository Authentication Component must 'normalize' the username before passing it through the DAO
         24445: ALF-6145: Correction to lock handling when propagating destroy() events
         24446: ALF-6142: Add new dependencies to unit test
         24448: ALF-6142: Further fix ups
         24461: ALF-6142: Fix unit test
         24664: ALF-6408: Prevent possible deadlock during reindexing
            - waitForHeadOfQueue() now only called in beforeCommit() phase rather than afterCommit() to prevent deadlocking with Lucene throttler
            - indexes are also flushed beforehand in beforeCommit() so that indexing work can still be parallelized
            - also prevent potential deadlock caused by clearing of IndexInfo.thisThreadPreparing in a nested transaction
         24810: ALF-6653: Use read write lock in Hibernate ReadWriteCache to avoid needless contention on L2 cache reads
         24817: ALF-4725: Avoid excessive lock contention in dbcp by upgrading to 1.4
            - also upgraded commons pool
         24818: ALF-6658: Remove synchronization from LockService - transaction local collections used anyway
         24844: ALF-6681: Don't let the PostLookup job stack up in multiple threads
            - Now only executes in one thread at a time and skips scheduled slots where it is already running
      24864: Fix for ALF-5904: Explorer - Space model rights not duplicated when creating a space based on a template
         - copy service no longer uses hasPermission
         - added tests for permission copy scenarios with assorted rights
         - this fix assumed there is nothing special about templates - ie that they should always carry permissions and is the "default" copy behaviour to copy permissions if possible
      24865: ALF-6145: Fix failing unit test
      24878: ALF-6146: Correction to write lock around requiredPermissionsCache
   24881: Increment version revision


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@26792 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-04-11 15:57:26 +00:00
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
Derek Hulley
3c0f908e3f AuditService delete by ID: Added bulk-delete perf. test
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22983 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-10-08 09:49:08 +00:00
Derek Hulley
6dcd5e5441 Added AuditService.clearAudit(List<Long>)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22980 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-10-08 09:26:34 +00:00
Derek Hulley
73ae4f71ca ALF-4106: AuditService and audit DAO refactor
- Added 'dataSource' attribute to 'RecordValue': <RecordValue ... dataSource='...'/>
 - This doesn't affect any existing configurations as the 'dataSource' remains the current path
 - Process data extraction by DataExtractor rather than by path (simpler)
 - Added unit tests specific to 'dataSource' attribute


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22129 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-09-01 15:21:12 +00:00
Derek Hulley
c576b914b4 ALF-4106 (ALF-4103): AuditService REST API
- Enable/disable auditing and tests
 - TODO: Use .ftl to generate JSON from model


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@21520 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-07-30 15:48:02 +00:00
Derek Hulley
ea3d2c89fa Reverse-merged 21489: @override tags
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@21499 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-07-30 09:31:30 +00:00
Dave Ward
c1018c5675 Removed @Override tags for JDK 1.6
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@21489 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-07-29 13:13:21 +00:00
Derek Hulley
44e18c2d81 SAIL-240 (SAIL-294) AuditDAO: AuditService enhancements
- Added isAuditEnabled and enableAudit for global case (system-wide)
 - Some neatening up of Audit SQL (common WHERE and ORDER BY clauses)
 - AuditService enforces 'admin' role for all methods


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@21471 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-07-28 17:40:17 +00:00
Paul Holmes-Higgin
cefda8c965 Updated header to LGPL
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18931 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-03-01 22:48:39 +00:00
Paul Holmes-Higgin
43e93f3c14 Updated header to LGPL
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18926 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-03-01 22:09:17 +00:00
Dave Ward
94f4b34aac AuditModelRegistryImpl refactored as dynamic subsystem
- Modules such as RM can now drop in their own config - should fix some unit tests
- Picks up config from 
   classpath*:alfresco/audit/*.xml
   classpath*:alfresco/enterprise/audit/*.xml
   classpath*:alfresco/module/*/audit/*.xml
   classpath*:alfresco/extension/audit/*.xml
- One audit.{applicationkey}.enabled property for each application in the config, defaulting to true
- One audit.enabled global enablement property defaulting to false
- Still controllable by alfresco-global.properties and JMX

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18841 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-02-25 12:31:17 +00:00
David Caruana
575c970565 Merging BRANCHES/DEV/CMIS_10 to HEAD:
17717: This check-in contains changes in Java and .NET TCK tests related to CMIS-43  and CMIS-44 JIRA tasks. Also some bugs were faced out and fixed in 
   17727: CMIS-69: Alfresco to CMIS ACL mapping: Part 1: API
   17732: Merge HEAD to DEV/CMIS10
   17756: MOB-563: SQL Tests - Lexer
   17764: CMIS-69: Alfresco to CMIS ACL mapping: get ACL support
   17802: More for CMIS-69: Alfresco to CMIS ACL mapping. Implementation for applyAcl.
   17830: Fixes for CMIS lexer and parser tests
   17838: Access fix ups for access by the WS/Rest layers
   17869: 1) remote-api:
   17874: SAIL-146: Alfresco to CMIS ACL mapping: Support to group ACEs by principal id
   17883: Adjust version properties for dev/cmis10 branch.
   17885: Update OASIS CMIS TC status.
   17889: Fix issue where objectid is not rendered correctly for CMIS private working copies.
   17890: SAIL-146: Alfresco to CMIS ACL mapping: Fixes for ACL merging when reporting and ordering of ACEs. Report full permissions and not unique short names.
   17902: Fix issue where CMIS queries via GET used incorrect defaults for paging.
   17909: Fix CMIS link relations for folder tree.
   17912: Fix CMIS type descendants atompub link
   17922: Update AtomPub binding to CMIS 1.0 CD05 XSDs.
   17924: SAIL-146: Alfresco to CMIS ACL mapping: Test set using full permissions (as opposed to short unique names)
   17927: Fix content stream create/update status to comply with CMIS 1.0 CD05.
   17934: Resolve encoding issues in CMIS AtomPub binding.
   17973: SAIL-171: CMIS Renditions REST binding
   17975: SAIL-146: Alfresco to CMIS ACL mapping: Completed AllowedAction and Permissions mapping. Added missing canDeleteTree.
   17990: Update CMIS AtomPub to CD06
   17996: Updates for cmis.alfresco.com for CD06 in prep for public review 2.
   18007: WS-Bindings were updated with CMIS 1.0 cd06 changes.
   18016: CMIS web services: Add missing generated files from WSDL
   18018: CMIS index page updates for cmis.alfresco.com
   18041: Merged HEAD to DEV/CMIS_10
   18059: SAIL-227:
   18067: SAIL-157: Strict vs Non-Strict Query Language: Enforce restrictions on the use of SCORE() and CONTAINS()
   18080: Fix for SAIL-213:Bug: Query engine does not check that select list properties are valid for selectors
   18131: SAIL-156: Query Language Compliance: Fix support for LIKE, including escaping of '%' and '_' with '\'.
   18132: SAIL-156: Query Language Compliance: Fix support for LIKE, including escaping of '%' and '_' with '\': Fix underlying lucene impl for prefix and fuzzy queries to match wildcard/like
   18143: SAIL-156: Query Language Compliance: Fix and check qualifiers in IN_TREE and IN_FOLDER. Improved scoring for CONTAINS()
   18173: SAIL-245: Exclude thumbnails from normal query results
   18179: SAIL 214: Query Language Compliance: Check for valid object ids in IN_FOLDER and IN_TREE
   18210: SAIL-156:  Query Language Compliance: Support for simple column aliases in predicates/function arguments/embedded FTS. Check property/selector binding in embedded FTS.
   18211: SAIL-156:  Query Language Compliance: Support for simple column aliases in predicates/function arguments/embedded FTS. Check property/selector binding in embedded FTS.
   18215: SAIL 156: Query Language Compliance: Fix CMIS type info to reflect the underlying settings of the Alfresco type for includeInSuperTypeQuery
   18244: SAIL 156: Query Language Compliance: includeInSuperTypeQuery -> includedInSuperTypeQuery: First cut of cmis query test model. Fixed modelSchema.xml to validate
   18255: SAIL 156: Query Language Compliance: First set of tests for predicates using properties mapped to CMIS Strings.
   18261: CMIS-49 SAIL-163: Alfresco to CMIS Change Log mapping - New CMIS Audit mapping is implemented. ChangeLogDataExtractor was added.
   18263: Build Fix
   18285: SAIL 156: Query Language Compliance: Restrictions on predicates that may be used by single-valued and multi-valued properties
   18287: SAIL-186: Changes to make CMIS Rendition REST bindings pass new TCK tests
   18291: Fix Eclipse classpath problems
   18323: CMIS-44 SAIL-187: Change Log tests (WS) – Java and .NET tests for change log were implemented.
   18325: SAIL 156: Query Language Compliance: Fixes and tests for d:mltext mappings
   18329: Updated Chemistry TCK jar including Dave W's rendition tests.
   18333: Fix compile error - spurious imports.
   18334: Fix issue where absurl web script method failed when deployed to root context.
   18339: Update CMIS index page for start of public review 2.
   18387: SAIL-147: CMIS ACL REST bindings + framework fixes
   18392: Fix typo
   18394: SAIL 156: Query Language Compliance: Fixes and tests for d:<numeric>
   18406: SAIL 156: Query Language Compliance: Remaining type/predicate combinations. Restriction of In/Comparisons for ID/Boolean
   18408: CMIS Query language - remove (pointless) multi-valued column from language definition
   18409: Formatting change for CMIS.g
   18410: Formatting change for FTS.g
   18411: CMIS TCK tests were updated to CMIS 1.0 cd06 schemas.
   18412: SAIL 156: Query Language Compliance: Tests and fixes for aliases for all data types in simple predicates (they behave as the direct column reference)
   18417: Update Chemistry TCK which now incorporates Dave W's ACL tests.
   18419: Update CMIS index page to include public review end date.
   18427: SAIL 156: Query Language Compliance: Expose multi-valued properties in queries. Tests for all accessors. Fix content length to be long.
   18435: SAIL 156: Query Language Compliance: Use queryable correctly and fix up model mappings. Add tests for baseTypeId, contentStreamId and path.
   18472: SAIL 156: Query Language Compliance: Tests and fixes for FTS/Contains expressions. Adhere strictly to the spec - no extensions available by default. Improved FTS error reporting (and stop any recovery).
   18477: SAIL-164: CMIS change log REST bindings
   18495: SAIL 156: Query Language Compliance: Tests and fixes for escaping in string literals, LIKE and FTS expressions.
   18537: SAIL 156: Query Language Compliance: Sorting support. Basic sort test for all orderable/indexed CMIS properties.
   18538: SAIL-164: CMIS change log fixes for TCK compliance
   18547: SAIL 156: Query Language Compliance: Ordering tests for all datatypes, including null values. 
   18582: Incorporate latest Chemistry TCK
   18583: Update list of supported CMIS capabilities in index page.
   18606: SAIL-156, SAIL-157, SAIL-158: Query Language Compliance: Respect all query options including locale. Fixes and tests for MLText cross language support.
   18608: SAIL-159: Java / Javascript API access to CMIS Query Language
   18617: SAIL-158: Query Tests: Check policy and relationship types are not queryable.
   18636: SAIL-184: ACL tests (WS) 
   18663: ACL tests were updated in accordance with last requirements by David Caruana.
   18680: Update to CMIS CD07
   18681: Fix CMIS ContentStreamId property when document has no content.
   18700: CMIS: Head merge problem resolution.

Phase 1: Merge up to and including revision 18700, as this the point where both AtomPub and Web Services TCK tests succeed completely on dev branch.

Note: includes CMIS rendition support ready for integration and testing with DM renditions.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18790 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-02-23 17:23:42 +00:00
Derek Hulley
add74c1a59 Merged V3.2 to HEAD
17332: ETHREEOH-2020: Original tag disappears after a new one has been added to a wiki page
   17711: Fix ETHREEOH-3720 - blocker (upgrade from 2.x)
   17712: Build/test fix (FeedCleanerTest.testConcurrentAccessAndRemoval)
   17726: DownloadContentServlet wraps call in read-only RetryingTransactionHelper
   17736: Fix ETHREEOH-2821 - deployment of layered file (fix for 3.2 deployment)
   17745: Fixed broken PostgreSQL (AVM, audit, etc) and Oracle (audit)
   17746: Merged V3.1 to V3.2
      17290: Merged V2.2 to V3.1
         17282: (record-only) Fix for ETWOTWO-1387: Node deletions transactions not properly detected ...
      17381: (record-only) Putting explicit version name on PDFRenderer.jar
      17413: (record-only) Removed dev from label
   17749: Type handler fixes for PostgreSQL: Use LONGVARBINARY
   17750: Fixed propval mappings for DB2
   17754: Fixed "invalid character" in Oracle port of propval
   17757: Re-added fix for ETHREEOH-2789 that got lost in a merge.
   17762: Fix FeedCleanerTest (for Oracle 10g) + exposed feed cleaner issue (maxSize)
   17765: Assorted minor build fixes for Oracle
   17767: Empty String property values are persisted as '.empty'
   17768: Merged DEV/BELARUS/V3.2-2009_11_24 to V3.2
      17758: ETHREEOH-3757: Oracle upgrade issue: failed "inviteEmailTemplate" patch
   17772: Fix build (JBPMEngineUnitTest) - fallout from r17765
   17774: Fix JSONtoFmModelTest
   17781: Build/test fix (AVMCrawlTestP)
   17791: Fix for ETHREEOH-3793: Oracle unit test failure for JobLockServiceTest - Missing unique indexes for all DB ports
   17795: ETHREEOH-3696: Attempt to navigate into any existent web-project or create new one after upgrade from Enterprise 2.1.7 ...
   17799: ETHREEOH-3796: org.alfresco.repo.importer.ImporterComponentTest fails
   17807: Fix ETHREEOH-3723 - MT blocker (can't restart)
   17816: Merged DEV/BELARUS/V3.2-2009_12_15 to V3.2
      17814: ETHREEOH-3808: Upgrade fails if content cm:name contains curly brackets ('{}')
   17822: Fix for ETHREEOH-3828: Mistake porting AlfrescoPostCreate-3.2-PropertyValueTables.sql script to mssql dialect
   17823: Fix for ETHREEOH-3829: SQLServer index limit reached for 'idx_alf_props_str'
   17831: Fix ETHREEOH-3818 - upgrade from Community 3.2r2 to Enterprise 3.2
   17862: Merged V3.1 to V3.2
      17722: Fix ETHREEOH-3643 - WCM layered folders (flatten) - also add unit test
      17835: ETHREEOH-3763 - fix for WCM layered folders - also add unit test
   17871: Merged V3.1 to V3.2
      17855: ACT 12915 - create web project performance (-> setPermission -> buildIndirections)
      17863: ETHREEOH-3852 - perf tweak (WCM layered files)
-------------------------------------
Modified: svn:mergeinfo
   Merged /alfresco/BRANCHES/DEV/BELARUS/V3.2-2009_11_24:r17758
   Merged /alfresco/BRANCHES/DEV/BELARUS/V3.2-2009_12_15:r17814
   Merged /alfresco/BRANCHES/V2.2:r17282
   Merged /alfresco/BRANCHES/V3.1:r17290,17381,17413,17722,17835,17855,17863
   Merged /alfresco/BRANCHES/V3.2:r17332,17711-17712,17726,17736,17745-17746,17749-17750,17754,17757,17762,17765,17767-17768,17772,17774,17781,17791,17795,17799,17807,17816,17822-17823,17831,17862,17871


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

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18098 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-01-18 15:32:57 +00:00
Derek Hulley
eaacdeb2ed Example of how to get last audit entry ID for a given app name
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17773 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-12-11 12:23:19 +00:00
Derek Hulley
8e08b13852 Added audit entry ID (from and to) as search parameters (requ. for CMIS)
- This change will be needed when fixing ETHREEOH-3487: Searching on Events does not restrict the audit result.
 - Moved parameters from method arguments into AuditQueryParameters
 - Deprecated old auditQuery APIs and fixed up Alfresco usage


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17714 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-12-04 09:06:46 +00:00
Derek Hulley
48df5a03ac Created AuthenticationService-specific config for audit tests
- Makes for a clearer demonstration of API-based auditing


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17693 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-12-01 15:41:49 +00:00
Derek Hulley
7bc361268d Fixed MOB-1656: Audit Log: Log ordering is incorrect for "Last N" results
- Added option to have results in either ascending or descending order
 - RM uses descending listings where the query results are limited


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16628 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-09-30 15:56:05 +00:00
Derek Hulley
9c05bc8ca1 Fixed unit test: Forgot that auditing is not enabled by default in repo anymore
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16505 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-09-24 23:56:34 +00:00
Derek Hulley
7c68847cb6 Wired AuditMethodInterceptor into new audit framework
- Two new repo properties to control auditing:
     audit.enabled=false
     audit.useNewConfig=false
 - Auditing was enabled by default, but it is not enabled any more!
   The property has to be set in alfresco-global.properties
 - Unit tests for auditing successful and failed authentication attempts


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16496 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-09-24 14:52:25 +00:00
Derek Hulley
c0d49f6284 Added source-target mappings for Audit data
- Audit entry creation API no longer requires an application name
 - Inbound data is remapped according to the mappings in the audit XML files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16327 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-09-16 19:02:40 +00:00
Derek Hulley
2c33287ea3 Added 'enableAuditPath' and 'disableAuditPath'
- Various tests to see that the recorded data is changed
 - disabledPaths rely entirely on the property caching for fast retrieval


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16271 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-09-15 10:06:31 +00:00
Derek Hulley
034027961d Audit queries
- Any combination of application (e.g. RM, repo, etc), user and time
 - TODO: Extend queries to support finding audit entries by arbitrary audited values
 - TODO: Full map retrieval in single query


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16086 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-09-04 00:34:28 +00:00
Derek Hulley
2cdc1777f9 Audit changes and fixes
- Removed notion of audit session
 - Removed 'scope' attribute for DataGenerator elements
 - Removed alf_audit_session table and replaced with alf_audit_app (see script)
 - DataGenerators are working properly


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16053 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-09-02 14:45:23 +00:00
Derek Hulley
1793a46d7c Minor Audit test changes
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16015 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-09-01 14:37:26 +00:00
Derek Hulley
f0cd5ef0d8 Audit config, XSD and write-persistence tests
- Audit paths can now use mixed case (after alf_prop_string_value enhancements)
 - Pluggable data conversion when pushing values into persistence
 - Relaxed XSD to allow mixed-case key values
 - Regex checking of paths and names when building strings


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@15976 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-08-27 16:16:05 +00:00
Derek Hulley
b57ae75eff Added a registry for DataExtractors and DataGenerators
- Uses recently-added NamedObjectRegistry
 - Audit extractors and generators can now be Sprung using 'registeredName' instead of 'class'
 - Simpler to bring in complex, repo-dependent generators and extractors


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@15935 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-08-26 16:43:40 +00:00
Derek Hulley
ef67ac777a AuditComponent implementation and fallout
- alf_prop_string_value now includes a CRC column and handles Oracle empty string issues
 - All property values are/must now be Serializable for auditing
 - Pushing data into audit is working


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@15915 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-08-26 06:01:52 +00:00