Commit Graph

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


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@36576 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2012-05-18 17:00:53 +00:00
Dave Ward
52c0d4ddca Merged V3.4-BUG-FIX to HEAD
30947: ALF-10619: Merged PATCHES/V3.1.2 to V3.4-BUG-FIX
      30884: ALF-10588: Another possible race condition resulting in out of sync transactions - found on SQL Server and JBoss in 3.1.2
         - FTS could process updated and deleted nodes in the same transaction before the tracker got to them, leaving behind the correct transaction ID and deleted nodes but undeleted container docs!
         - We now have to validate all deletions have been honoured when index tracking
      30890: ALF-10588: Temporarily disable FTS during IndexCheckServiceImplTest
         - Otherwise can get confused by intermediate FTS state of its own nodes!
      30894: ALF-10588: Correction to deletion checking
         - Only search for deleted nodes, not updated ones too!
   30948: ALF-10619: Fixed merge issue
   30982: - ALF-10503 60k Site Performance: Admin Console | Groups: search with a value that matches all 60 groups: maxClasuesCount=10000
   - ALF-10511 60k Site Performance: Admin Console | Users | Edit User | Group Search with a value that matches all 60 groups: maxClauseCount=10000
   - ALF-10608 60k Site Performance: Searching for a group to add to a site with a value that matches all 60 groups: maxClauseCount=10000
   - ALF-10515 60k Site Performance: Edit Group Display Name: The first time, nothing appears to happen for 10 seconds after pressing [Save]
   - ALF-10514 60k Site Performance: Admin Console | Groups | Search | Delete Group: no feedback to user for 20 seconds after clicking delete icon
   30985: Increases in node, property and aspect caches.
   30987: Merged DEV/TEMPORARY to V3.4-BUG-FIX
      30984: ALF-9880 : ContentGet web script throws NullPointerException for nodes missing cm:modified property
         The check for null was added for cm:modified property (similar to BaseDownloadContentServlet).
   30995: Fix for ALF-9021
   30996: ALF-10324 Cannot disable Home Folder Creation
      - Bug introduced into V3.1 on the 8 March 2010
      - ChainingUserRegistrySynchronizerTest enhanced to check for this
      - Fix to PersonService: Home folder was not being created for 'missing' persons
      - PersonService: Changed autoCreate parameters to more descriptive names (okay long) and updated Javadoc
   30998: ALF-10512 60k Site Performance: Clicking on Sites (left hand side) in the Repository browser causes transactional limit to be reached
     - Changed node, aspect, property and parentAssoc cache sizes (based on Derek's Skype message)
   31006: ALF-10512 60k Site Performance: Clicking on Sites (left hand side) in the Repository browser causes a transactional limit to be reached
     - Having changed cache sizes in previous commit, the nodeOwner and acl transactional caches were then blown with test case for ALF-10512
       Changed to 20k from 10k. Tried 15k but it still had a problem.
   31052: Fix for ALF-10520
   Merged HEAD to V3.4-BUG-FIX
      31051: Performance improvements for Share Repository browser queries.
             DB with ~50,000 nodes under Company Home:
             Before:
             - I'm Editing - 16 secs, Favorites - 17 secs, Tag - 14 secs
             After: 
             - I'm Editing - 1.5 secs, Favorites - 1.2 secs, Tag - 1.25 secs
   31058: ALF-10324 Cannot disable Home Folder Creation
      - ChainingUserRegistrySynchronizerTest check using personService with both eager and non eager home folder creation
   31064: ALF-9360: Merged PATCHES/V3.4.4 to V3.4-BUG-FIX
      30244: Merged DEV/DAVEW/IMAP_NEW to PATCHES/V3.4.4
         29635: Rework of IMAP to use lightweight caching and correctly set UIDVALIDITY, NEXTUID and Marked / Unmarked state
         29668: 1. Changed get AlfrescoImapFolder.getFullNameInternal to be dynamic for cache support
         29692: 1. Reverts changed in AlfrescoImapServer to allow ImapHostManager to be a session key for folder.
         2. getFlags relies on FileInfo.getProperties()
         29741: 1. Changed AbstractMimeMessage.updateMessageId() to follow RFC2822 (3.6.4. Identification fields)
         2. Changed ImapServiceImpl to handle absent folders and return "NO" reply to a client.
         3. Changed ImapServiceImpl that behaviours don't fail when Alfresco is being first time bootstrapped with IMAP enabled.
         4. Cleared AlfrescoImapFolder constructor. 
         5. Fixed SelectCommand's response to adhere RFC3501 (6.3.1.  SELECT Command)
         6. Fixed CommandParser to be able parse the flag which is not surrounded by braces (STORE 2:4 +FLAGS \Deleted)
         30235: Completion of IMAP rework
         - Scalable caching
           - Proper transactional cache for assembled messages
           - No more assumption that EHcache will always hold entire folder set at once (and perhaps it can't)
           - Per session (TCP connection) cache of accessed folders
           - Session cache validation via a 'change token' that is incremented on all significant events
           - Folder status attributes evaluated once and reused until the change token changes
           - Now only changed folders need to be queried on an IMAP sync and the server doesn't have to hold all folders in memory
           - User's view is consistent with their security permissions
         - Simplification / overhaul of ImapServiceImpl including efficient recursive path building and matching
         - AlfrescoImapFolder immutable as it should be
         - Greenmail fixes
            - Fixed quoting of mailbox names
            - Fixed hanging problem in ImapRequestLineReader - regression caused by our 8 bit encoding fix. Avoid using an InputStreamReader to read ISO-8859-1 bytes as it has an internal buffer.
      30275: Fix failing IMAP tests broken by my recent refactor!
      - Fixed greenmail conversion of ISO-8859-1 bytes to chars
      - Transaction read write attributes on service
      - Read only commands on AbstractImapFolder
      - Imap aspect properties must be managed as SYSTEM user
      - Restored persistence of new mail messages
      - Avoid unit test txn rollback woes by making it possible to check for existence of a path with FileFolderService
      30487: ALF-10268: Merged V3.4-BUG-FIX to PATCHES/V3.4.4
         30264: ALF-10187: Merged V3.3 to V3.4-BUG-FIX
            30003: ALF-9898: More defensive exception handling to avoid packet pool leaks and extra logging on packet pool exhaustion
      30540: ALF-10257: Fixed logic error introduced into Greenmail ImapRequestLineReader
      30988: ALF-9361: Merged DEV/DAVEW/IMAP_NEW to PATCHES/V3.4.4 (by Arseny)
         30419: Remote test for generic client request sequence.
         30547: 1. A bug with FetchCommand particularly with FETCH (BODY.PEEK[1]) with an error 
            1315912197.789640 1.5 NO FETCH failed. java.lang.String cannot be cast to javax.mail.internet.MimeMultipart
            This happened while message content is being proceeded like MimeMultipart mp = (MimeMultipart) mimeMessage.getContent();, but javadoc of mimeMessage.getContent() says that this content can be a String in case of non-multipart message. Fixed FetchCommand accordingly to mimeMessage.getContent() javadoc. 
         2. A bug with RFC822MetadataExtracter 
            When mimeMessage.getHeader("received"); is used with the message with following header 
            Received: with ECARTIS (v1.0.0; list dovecot); Tue, 06 Aug 2002 13:01:17 +0300 (EEST) 
            It doesn't extract a date, because it uses lastReceived.indexOf(';') which returns the position IN the ECARTIS (v1.0.0; list dovecot) after v1.0.0, 
            So it should use lastReceived.lastIndexOf(';') to get the position after ECARTIS (v1.0.0; list dovecot). 
      31025: ALF-9361: IMAP Performance
      - Introduced folder status MRU cache
      - Keyed by user ID and change token so no need to cluster
      - Now means we should get reuse across IMAP sessions
      - Also fixed isMarked() implementation to only return true if there are recent or unseen mails
      31038: ALF-9361: Prevent the starting of unnecessary transactions in AlfrescoImapFolder interface
      - getFolderStatus regulates its own transaction
      - Dropped all those *Internal methods from the abstract class
      - getUnqualifiedMailboxPattern moved to AlfrescoImapHostManager
      - Fixes to session folder cache validation / reuse
      31039: ALF-9361: Repository tuning for IMAP performance
      - Backed out ALF-5575 60 second timeout on node caches - Should be covered by ALF-8607 fix
      - Also made TransactionalCache.NewCacheBucket save new values to the shared cache for 'mutable' caches. Previously it was only possibly to load into the node caches in a read only transaction!
      - Also added fix to make AbstractNodeDAOImpl bulk load empty node aspect sets
      - Result is a drastic speedup of full sync times as most items can be served from the cache`
      31042: ALF-9361: Fix ImapServiceImplTest
      31048: ALF-9361: Make ConcurrentNodeServiceTest work again, after relaxation of 'mutable' transactional caches
      - aspect and property caches validated by node transaction ID, as per parent assocs in ALF-8607
      31050: ALF-9361: Caching correction
         Always use the cached mailbox reference if it is equivalent (because the session remembers the last selected mailbox)
      31060: ALF-9361: Fix CacheTest, following back out of ALF-5575 behaviour
      31061: ALF-9361: More caching fixes
      31062: ALF-9361: Undo accidental changes to ConcurrentNodeServiceTest
      31063: ALF-9361: Build fix: replaced assertSame with assertEquals


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@31079 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-10-10 12:07:32 +00:00
Dave Ward
e93b7a3aa5 Merged V3.4-BUG-FIX to HEAD
29414: Fix for ALF-7437: CMIS query doesn't return any result when documents are created with a different lang
   and fixes duplicate ALF-8598 : Web QS - Dynamic asset collection failing for non en_US locale
   29445: ALF-9023: Cannot search/retrieve special characters of "???".
   - avoid requirement to escape unicode characters from classification "number, other" and others e.g. name:??? will generate a query (even ff it does not work due to tokenisation)
   29470: ALF-9632 "CMIS query fails if model name contains numbers" fix
      - Ensure CMIS query types are ISO9075 encoded
   29474: ALF-9668 / ALF-6434: Fix LDAP sync regression
   - On an incremental sync when there were no group->group association changes, new groups were getting ignored!


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@29475 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-08-01 14:55:28 +00:00
Dave Ward
73826a7892 Merged V3.4-BUG-FIX to HEAD
29333: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/V3.4-BUG-FIX:
      29311: Fixed tomcat shutdown problem (ALF-9574)
   29337: Merged DEV to V3.4-BUG-FIX
      29336: ALF-8554 : matchesEncodedPattern in ISO9075 class fails with some values
             Corrected matchesEncodedPattern method and unit test added to demonstrate the problem has gone.
   29340: Merged DEV to HEAD
      29330: ALF-3681 : Webdav lock issue returned on 3.3g and 4.0a
             LockMethod corrected: expiryDate (as lockOwner) should be cached in fileInfo's properties for correct response generation.
   29361: Fix for CIFS desktop actions are copied by copying a folder: ALF-8640.
   Pseudo file creates are converted to a file open, they are not writeable, writes are dumped.
   29380: ALF-6434: Better detection / prevention of cyclic group relationships in LDAP sync
   29387: Incremented version.revision for 3.4.5
   29388: Merged V3.4 to V3.4-BUG-FIX
      29307: Merged V3.4-BUG-FIX to V3.4 (3.4.4) (RECORD ONLY)
      29314: ALF-9612: Temporary placeholders for missing installer translations
      29385: ALF-9612: New installer translations from Gloria


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@29389 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2011-07-27 11:34:50 +00:00
Dave Ward
477cd0583e Merged V3.3-BUG-FIX to HEAD
22215: Fix compilation error
   22240: ALF-4207: Download servlets show error page with permissions error rather than login page when non-guest user has insufficient permissions
   22241: ALF-4469: External Access Servlet should also show status 403 errors to non-guest users, as in ALF-4207
   22244: ALF-4599: CIFS access to alfresco with Kerberos authentication creates wrong users with domain suffix
      ALF-4395: recognize Kerberos machine accounts with lower case names
   22247: ALF-4397: Properly handle null values in SortableSelectItem.compareTo()
   22248: Merged DEV/TEMPORARY to V3.3-BUG-FIX
      21963: ALF-4390: ModuleManagementTool is not returning error code in case of failure
         Error code constants and appropriate System.exit(code) invokations were added.
   22260: ALF-4597: InviteContentUsersWizard was caching permissions in a non-type-specific cache
      - removed the cache - didn't allow for dynamic model updates either
   22269: Merged V3.3 to V3.3-BUG-FIX (RECORD ONLY)
      22268: Merged V3.3-BUG-FIX to V3.3
         - Merged across all differences from V3.3-BUG-FIX
   22270: Incremented revision number
   22467: Merge from V3.3 to V3.3BUG-FIX. Fix for ALF-4741.
      V3.3: 22466 Merge from V3.2 to V3.3. Fix for ALF-4741.
         V3.2: 22465 Fix for ALF-4741. Repository Web Scripts can produce a corrupted response after a transaction collision/retry.
   22667: Merged DEV/TEMPORARY to V3.3-BUG-FIX
      22665: ALF-4825: Unlocking checked out content cause both original & working copy un-usable.
         Do not include unlock in the actions list when a node has a working copy.
   22691: Add missing "logAbandoned" (= false) prop to config - follow on to r15133 (related to ALF-4020 / ETWOTWO-562)
   22710: ALF-3948 - from time to time we have exception "Failed to init dictionaryRegistry"
   22718: Merge from V3.3 to V3.3-BUG-FIX
      r 22715 Merge from V3.2 to V3.3
         r 22713 Fix for ALF-4946 Possible NullPointerException during creation of thumbnails whose names are null-valued.
   22722: Merged V3.3 to V3.3-BUG-FIX
      22271: ALF-3712: Merged HEAD to V3.3
         22249: Bin contents were not being packaged.
      22272: Merged DEV/TEMPORARY to V3.3
         22067: ALF-4479: when using webdav inline edit on webdav + MS Word 2003 +IE6, one gets: Unable to check in Content Node due to system error. Access Denied. You do not have the appropriate permissions to perform this operation.
            - Do not unlock a working copy.
      22273: Merged DEV/TEMPORARY to V3.3
         21729: ALF-3112: Property parameterTemplates not resolved correctly for SimpleTemplateActionDefinition
            The temporary fix for unconfigurable valueSeparator property.
            https://jira.springframework.org/browse/SPR-7429
      22274: Merged DEV/TEMPORARY to V3.3
         21993: ALF-4396: webdav "supportedlock" propfind request returns malformed response
            WebDAV supported lock elements were wrapped by “lockentry” elements according to the WebDAV specification.
      22276: ALF-3890: FTP Change Working Directory (CWD) command works with root-relative paths with more than one component
      22277: Merged DEV/TEMPORARY to V3.3
         22076: ALF-3579: Open the Details Page URL removes the header, navigation bar etc
            The identifiers for modify action tag and details' actions tag should be different in the details pages. For documents:
            in the filelink-details.jsp and document-details.jsp. For spaces: in the space-details.jsp and spacelink-details.jsp.
      22285: Merged HEAD to V3.3
         22284: Fix for ALF-3063 "Incorrect behaviour on filtering by tag in Repository". Labels updated to more accurately reflect behaviour.
      22299: Fix for ALF-3893: lucene.indexer.mergerTargetIndexCount is redundant
         - this property is now used to control the merging of indexes as was intended
      22309: Merged DEV/TEMPORARY to V3.3 (Approved by Roy)
         21035: ALF-2588: RM: Export and import of file plan causes disposition errors
            When content is imported from acp the actionId that points to the action NodeRef is old in the imported content and NullPointerExcepption appears.
            To avoid this we changed DispositionScheduleImpl. Now it stores the action that has different name and ID (when action is create it name equals id) in a separate map. And when getDispositionActionDefinition(String id) method is called it tries to retrieve the action from this map, if it hasn’t been found earlier.
      22325: Fix for ALF-4428: Incorrect behaviour of Consumer and Contributor permissions with Quickr
         - unit test pass
      22334: Merged HEAD to V3.3
         22331: Fixes: ALF-3558: Input and variable encoding issues in Share Calendar & API JSON data.
      22355: ALF-4489: Special Characters Create Stack Overflow Exception in the Group Admin Console for Share in Internet Explorer.
         Fixed missing encoding and also added guard code to prevent stack overflow problem in case of future error.
      22356: Fix for ALF-4384 - missing JSP page directive
      22360: Fix for ALF-4428: Incorrect behaviour of Consumer and Contributor permissions with Quickr
         - unit test pass
         - no abstain allowed
      22365: Merged DEV/TEMPORARY to V3.3
         21874: ALF-2641: WebDav Permission Issues - MAC OSX Finder
            The createExclusive field was introduced instead of m_scope. New algorithm of lockscope determination was added.
            Also ALF-4008 compliant fix provided with this.
         21812: ALF-4008: save a MS Word change over webdav after a 2-3 minutes delay causes the error 'XXX.doc is currently in use. Please try again later.'
            Modified LOCK method, it gets a scope from NodeRef property if m_scope field is not defined.
      22367: Merged DEV/TEMPORARY to V3.3
         21442: ALF-2587: WEBDAV error in Windows 7
            - variant generateLockDiscoveryXML methods were factored into a single one capable of generating a namespaced LOCK response compatible with Windows 7 when its user agent header is detected.
      22368: Merged DEV/TEMPORARY to V3.3
         20919: ALF-2834: All day events created in Outlook not appearing in Meeting Workspace
            Different date format is used by Outlook when creating all day meeting request and meeting request specifying date and time. The code was changed to handle both situations accordingly.
      22369: Merged DEV/TEMPORARY to V3.3 (With simplifications)
         21470: ALF-3796: Locale is not always set/reset on every request thread
            - A GlobalLocalizationFilter sits in front of ALL requests and sets a default fallback locale on I18NUtil
            - Moved BaseServlet.setLanguageFromRequestHeader into this filter and made sure it always falls back to a default locale
            - Subsequent filters / servlets in faces chain may override this with user preferred locale after authentication
      22370: ALF-3868: Fix for compatibility with Sun Directory Server
      22371: Merged DEV/TEMPORARY to V3.3
         21811: ALF-4067: Display Value for Action Constraint breaking a java eval in Share
            When a node doesn't have a ContentModel.PROP_TITLE property it is added to AllowableValues with PROP_NAME value.
         21795: ALF-4067: Display Value for Action Constraint breaking a java eval in Share
            The fix introduces the code which doesn't add a node to AllowableValues if it doesn't have a ContentModel.PROP_TITLE property.
      22378: ALF-3796: Fixed compilation error - BaseServlet.setLanguageFromRequestHeader replaced by global filter
      22380: ALF-3761: War bundles + extension samples now include alfresco-global.properties in correct position in hierarchy
      22386: ALF-3887: Two versions of geronimo-activation are shipped
         - Removed the older version
      22402: WCM - add more debug logging only
      22405: Change notification handler not enabled by the server configuration bean. ALF-4715.
      22407: Merged DEV/TEMPORARY to V3.3
         22231: ALF-4096: Share point module is causing file descriptor leaks.
            The following changes were added to VtiIfHeaderAction and GetDocumentMethod: 
            - code that copies data between streams was replaced by org.apache.commons.io.IOUtils.copy()
            - correct stream closing was added for all cases including exceptions while copying
      22411: Merged DEV/TEMPORARY to V3.3
         21864: ALF-4371: Error occurs if user try to find event from meeting place
            Replaced incorrect NamespaceService.CONTENT_MODEL_PREFIX with NamespaceService.CONTENT_MODEL_1_0_URI in QName creation.
      22412: Merged DEV/TEMPORARY to V3.3
         22018: ALF-4403: Search on users in JSF client and SHARE do not specify "cm:person" type clause in the query leading to incorrect results in user searching.
            People searches in Alfresco and share are restricted by “cm:person” type. 
         21988: ALF-4403: Search on users in JSF client and SHARE do not specify "cm:person" type clause in the query leading to incorrect results in user searching.
            People searches in Alfresco and share are restricted by “cm:person” type. 
      22418: ALF-4578: Avoid ConcurrentModificationException in AVMDeploymentTarget
      22420: Fixed ALF-958: Target associations aren't copied
         - Added CopyBehaviourCallback. getAssociationCopyAction
         - Default behaviour:
           - Remove existing associations of same type when copying OVER an existing node (e.g. check-in)
           - Copy the association using a new target if the target is copied in the same call
           - Copy the association to the original target if the target is not copied in the same call
         - Abstract behaviour (for those that have implemented a CopyBehaviourCallback):
           - Remove existing associations of same type when copying OVER an existing node (e.g. check-in)
           - Only copy the association to a new target if the original target is copied 
      22421: ALF-4641: Strip ticket parameter on login page redirect to avoid endless redirect loop
      22422: Merged DEV/TEMPORARY to V3.3
         21201: ALF-1804: Passthru server check gets confused when a server goes offline
      22423: Merged DEV/TEMPORARY to V3.3
         21891: ALF-3356: Error changing own user role from coordinator to consumer
            When a user changes the Roles, all Permissions are immediately deleted and new selected permissions are created. If all permissions are deleted then the user doesn't have access for permissions creation.
            If the user currently has permission change permission the currently set of permissions is cleared and new permissions are added from a System User authority.
      22424: Merged DEV/TEMPORARY to V3.3
         21182: ALF-1786: Remote Opensearch request mimetype missing
            SearchProxy was changed to provide original User-Agent header. HTTPProxy was extended to set request headers. New overridable method setRequestHeaders was added to provide ability of setting headers.
      22425: Merged DEV/TEMPORARY to V3.3
         22165: ALF-197: When returning to the first step of Advanced Workflow creation from second or third steps it's always Adhoc Task chosen there
            The selectedWorkflow variable was reseting every time on "Choose Workflow" step
      22426:Merged DEV/TEMPORARY to V3.3
         21323: ALF-687: Error when invoking webservices via SSL repository location url.
            Add a new overload of ContentUtils.putContent() method with the isSSL argument at the end. 
            If this parameter value is true then SSLSocket is used and Socket otherwise. 
      22428: ALF-3490: Unfriendly error messages from WebDAV when content doesn't exist
         - Generalized ALF-4207 solution so that the error page instead displays a status 404 message
      22429: Merged DEV/TEMPORARY to V3.3
         21325: ALF-3502: Logging in FacesHelper.getManagedBean on failure to create bean
            Detailed logging of the EvaluationException for ValueBinding was added.
      22430: Merged DEV/TEMPORARY to V3.3
         20974: ALF-2695: mimetypes-extension-context.xml.sample does not use the correct classes
            Changed the type of the bean id="mimetypeConfigService" from “"org.alfresco.config.xml.XMLConfigService” to  “org.springframework.extensions.config.xml.XMLConfigService”
            Renamed mimetypes-extension-context.xml.sample file  to file  mimetypes-extension.xml.sample.  The file mimetypes-extension-context.xml.sample was interpreted like spring context file. It wasn’t correct.
      22431: Merged DEV/TEMPORARY to V3.3
         21099: ALF-3046: UI - Import feature not available to contributor user
            The fix also covers related bug ALF-2802.
            Permission ‘Write’ was replaced by ‘CreateChildren’ for import action because contributor has ‘AddChildren’ (not ‘Write’) permission.
      22432: Merged DEV/TEMPORARY to V3.3
         20973: ALF-3244: alfresco-sample-website.war does not deploy to bundled Tomcat
            The cause of the corrupted alfresco-sample-website.war deployment is the usage of the SSIFilter in the application.
            Only Contexts which are marked as privileged may use SSI features. For this reason, the context has been marked as privileged in META-INF/context.xml
      22433: Merged DEV/TEMPORARY to V3.3
         21190: ALF-3751: Unintentional copy/remove of 'Web Forms' space removes form associations in Web Projects
            Parent validation before deleting was added. Now deleted web form is removed from Web Project only if this form is located in original Web Form folder.
      22434: Merged DEV/TEMPORARY to V3.3
         21490: ALF-4099: Customer concern about String comparison operators == vs equals
            Comparison operator was replaced by equals/EqualsHelper.nullSafeEquals in the ContentFilterLanguagesMap DocumentNavigator UIAjaxTagPicker Presence classes. 
            DocumentNavigator.getAttributeName() method was changed because the previous method's logic always returned escapedLocalName in any case.
      22436: Merged DEV/TEMPORARY to V3.3
         22063: ALF-4494 : Share show error if versionable document has no version history.
            1. evaluator.lib.js was modified to prevent NPE if no version history exists for document.
            2. Result was manually tested.
      22437: ALF-2796: java.naming.referral is set to "follow" in the LDAP contexts to avoid PartialResultExceptions on LDAP sync
      22466: Merge from V3.2 to V3.3. Fix for ALF-4741.
         V3.2: 22465 Fix for ALF-4741. Repository Web Scripts can produce a corrupted response after a transaction collision/retry.
      22469: Fix for CIFS long directory path results in duplicate folder displays. ALF-3938.
         Removed (hopefully) last of the hardcoded buffer length limits.
      22472: Fixed ALF-4670: XAM retainUntil value does not propagate down the space hierarchy
      22473: Fixed ALF-4656: Deleted Content Backup should ignore unrecognised URLs
         - Also fixes ALF-4657: Content stored on XAM is not cleaned up correctly
         - Errors in the listeners are logged only
         - ContentStoreCleanerListener checks and warns if the URL is unsupported
      22474: Fix to web.xml to correctly validate and therefore deploy on JBoss5.1.0
      22485: Fix for NFS losing contents during edit or copy. ALF-4737.
      22492: ALF-4652 XAM bug fixes and improvements: Respect 0 'retentionPeriodDays'
      22501: Fixed ALF-4763 XAM-enabled nodes must not go to the archive://SpacesStore
      22504: Fix for MS Word mimetype is changed when editing via CIFS. ALF-3772.
      22520: ALF-4768: WCM (w/ virt svr) - submit  (no need to virtualize direct submit workflows)
      22526: Externalised setting of BINARIES, plus added bin with jars and dlls
      22561: ALF-4792: WCM virt svr - add experimental option for lazy deployment (defer startup of dependent webapps until accessed)
      22611: Fixed ALF-1893: Windows 7 SSP Read-only.
         Note: Relies on the patched Excel and PowerPoint mimetypes, but also falls back to file exension.
      22612: Merged HEAD to BRANCHES/V3.3:
         22609: Resolve ALF4822, ALF4818
      22628: ALF-3239: Added encoding elements to mysql db url
      22656: Fix for Solaris/Gedit problem, keep a mapping for the original file handle to the new path after a rename. ALF-4843.
      22673: ALF-4845: Person and Group member deletion performance fix
         - Don't batch load all a group's members when trying to delete one of them!
         - Can result in infeasibly large hibernate sessions when trying to delete a person / LDAP sync in a repository with very large groups
         - Switched off batch loading in NodeService.removeChild()
         - Avoided unnecessary use of removeAuthority in PersonService.deletePerson()
      22674: Merged DEV/TEMPORARY to V3.3
         22653: ALF-661: There is no way to determine the protocol, hostname and port from a javascript kicked off by JBPM
            These variables are now available for use in workflow and action javascript and they are wired to the corresponding parameters that already exist in the sysAdmin subsystem.
               urls.alfresco.protocol
               urls.alfresco.host
               urls.alfresco.port
               urls.alfresco.context
               urls.share.protocol
               urls.share.host
               urls.share.port
               urls.share.context
            See bug for example usage
      22676: Merged HEAD to V3.3:
         20306: Google Doc integration fixes:
          - Fixed up inconsistancies in powerpoint and excel mimetypes set throughout the code
          - Unit tests failures for excel sheets fixed
          - Able to now create and checkout docs, sheets and presentations successfullly
          - Docs, sheets and presentations downloadable and viewable
          - Fixed ALF-2700
         (See ALF-4827)
      22715: Merge from V3.2 to V3.3.
         r. 22713. Fix for ALF-4946 Possible NullPointerException during creation of thumbnails whose names are null-valued.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22725 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-09-27 12:47:35 +00:00
Dave Ward
1cc88d4978 Merged DEV/V3.3-BUG-FIX to HEAD
20884: Merged V3.3 to V3.3-BUG-FIX
      20883: ALF-3604: Fix PersonTest
      20881: Merged PATCHES/V3.2.r to V3.3
         20880: ALF-3264: Fix up handling of default namespace. Workaround to JXPATH-61
      20878: Merged V2.2 to V3.3
         20474: Fix for ALF-1362 - encode group identifiers when used inside embedded param tags
         20621: Fix for reopened ALF-1362 - UnknownAuthorityException when viewing/editing/deleting a user group with html entities in it's name
      20874: Merged HEAD to V3.3
         20873: ALF-3604: Correct case-sensitivity issues in LDAP sync
            - User names are now brought in line with the case of the LDAP directory during sync (in case the UID attribute is case sensitive)
            - User names are now compared according to Alfresco's case sensitivity setting
            - Group name comparisions are still case sensitive
            - Added unit test to ensure correct behaviour
      20868: Merged PATCHES/V3.2.r to V3.3
         20832: ALF-3264: XForms 'schema evolution': Remove nodes from XForms instance document with XPaths that don't occur in prototype document
      20867: Merged PATCHES/V3.2.r to V3.3 (RECORD ONLY)
         20833: Incremented version label
         20688: Incremented version label
         20687: Merged V3.3 to PATCHES/V3.2.r
            20398: Fixed ALF-2890: Upgrade removes content if transaction retries are triggered
               - Setting ContentData that was derived outside of the current transaction opened up a window
                 for the post-rollback code to delete the underlying binary. The binaries are only registered
                 for writers fetched via the ContentService now; the low-level DAO no longer does management
                 because it can't assume that a new content URL indicates a new underlying binary.
               - The contentUrlConverter was creating new URLs and thus the low-level DAO cleaned up
                 live content when retrying collisions took place. The cleanup is no longer on the stack
                 for the patch.
               - Removes the ALF-558 changes around ContentData.reference()
            20590: Fixed ALF-3189: Oracle/DB2/SQLServer/PostgreSQL are missing indexes to support many FK constraints
               - Reverses rev 17421
               - Added patchy bits to post-create script and declared patch
               - Patch only applies to *new* installations from 3.2.0 onwards (schema 3007 to 3400)
         20686: ALF-3259: Merged HEAD to PATCHES/V3.2.r
            19784: Fix for CIFS/CheckInOut.exe save of working copy breaks lock on original file. ALF-2028.
      20866: Merged PATCHES/V3.2.1 to V3.3 (RECORD ONLY)
         20840: Incremented version label
         20839: ALF-3691: Merged V3.3-BUG-FIX to PATCHES/V3.2.1
            20307: VersionStore - minor fixes if running deprecated V1 
               - warn in startup log
               - do not execute migration cleanup
            20367: ALF-2829: Avoid reading entire result set into memory in FixNameCrcValuesPatch
            20368: Work-around for ALF-2366: patch.updateDmPermissions takes too long to complete
               - this patch may now be deferred until 3.4 using the sample context (DM will use old permissions and AVM new as it did in 2.2.x)
               - this is only supported upgrading direct to 3.2.1.x
            20370: Version Migrator (ALF-1000) - use common batch processor to enable multiple workers
            20373: Version Migrator (ALF-1000) - resolve runtime conflict (w/ r20334)
            20387: Version Migrator (ALF-1000) - approx x3 boost (policies ignore version2 store)
            20431: Version Migrator (ALF-1000) - migrate 1st batch independently
         20738:ALF-3617: Merged V3.3-BUG-FIX to PATCHES/V3.2.1
            20438: ALF-479: Merged DEV/BELARUS/V3.2-2010_01_11 to DEV/V3.3-BUG-FIX
               18448: ETHREEOH-4044: External Authentication Subsystem does not perform user mapping for WebDAV requests
                  The changes listed in the bug comments have been made (and corrected).
         20728: Incremented version label
         20727: ALF-3617: Merged HEAD to PATCHES/V3.2.1
            20616: ALF-2265: Share 'Uber Filter' part 2
               - WebScriptNTLMAuthenticationFilter detached from its superclass and renamed to WebScriptSSOAuthenticationFilter
               - Now the filter simply chains to the downstream authentication filter rather than call its superclass
               - This means the same filter can be used for Kerberos-protected webscripts as well as NTLM
               - Wired globalAuthenticationFilter behind webscriptAuthenticationFilter in the filter chain in web.xml
               - Configured webscriptAuthenticationFilter for Kerberos subsystem
         20612: Incremented version label
         20610: Merged V3.3 to PATCHES/V3.2.1
            20590: Fixed ALF-3189: Oracle/DB2/SQLServer/PostgreSQL are missing indexes to support many FK constraints
              - Reverses rev 17421
              - Added patchy bits to post-create script and declared patch
              - Patch only applies to *new* installations from 3.2.0 onwards (schema 3007 to 3501)
         20403: Merged V3.3 to PATCHES/V3.2.1
            20398: Fixed ALF-2890: Upgrade removes content if transaction retries are triggered
               - Setting ContentData that was derived outside of the current transaction opened up a window for the post-rollback code to delete the underlying binary. The binaries are only registered for writers fetched via the ContentService now; the low-level DAO no longer does management because it can't assume that a new content URL indicates a new underlying binary.
               - The contentUrlConverter was creating new URLs and thus the low-level DAO cleaned up live content when retrying collisions took place. The cleanup is no longer on the stack for the patch.
               - Removes the ALF-558 changes around ContentData.reference()
         20391: Incremented version label
         20390: ALF-2966: Merged DEV/V3.3-BUG-FIX to PATCHES/V3.2.1
            20388: Merged BRANCHES/DEV/BELARUS/HEAD-2010_04_28 to BRANCHES/DEV/V3.3-BUG-FIX:
               20372: ALF-897: It is impossible to create content when default value selected in ContentHeadlineBackground field for intranet_rssi_landing_template web-form (also fixes ALF-2798 & ALF-791)
         20371: ALF-2861: Merged V3.2 to PATCHES/V3.2.1
            20028: Reverted (and fixed line endings) of log4j.properties
            20027: Merged BRANCHES/V3.1 to BRANCHES/V3.2:
               19983: Changes for ALF-2545: Cannot upgrade from 2.1.2a (b 209) to the 3.1.2 (.a3 458) on Oracle
               20008: ALF-2351: Oracle upgrade scripts need enhancements from 2.2SP7
         20362: ALF-2883: Merged HEAD to V3.2.1
            19750: Fix for ALF-2310: alfresco-mmt-3.3dev.jar shows NoClassDefFoundError: org/safehaus/uuid/UUIDGenerator
         20359: Merged PATCHES/V3.2.0 to PATCHES/V3.2.1
            20349: Merged V3.3 to PATCHES/V3.2.0
               20346: ALF-2839: Node pre-loading generates needless resultset rows
                  - Added missing Criteria.list() call
            20280: Fixed ALF-2839: Node pre-loading generates needless resultset rows
               - Split Criteria query to retrieve properties and aspects separately
            20272: Backports to help fix ALF-2839: Node pre-loading generates needless resultset rows
               Merged BRANCHES/V3.2 to PATCHES/V3.2.0:
                  18490: Added cache for alf_content_data
               Merged BRANCHES/DEV/V3.3-BUG-FIX to PATCHES/V3.2.0:
                  20231: Fixed ALF-2784: Degradation of performance between 3.1.1 and 3.2x (observed in JSF)
            20266: Test reproduction of ALF-2839 failure: Node pre-loading generates needless resultset rows
         20358: Increment version label
         20343: Incremented version label
         20342: Merged V3.3 to PATCHES/V3.2.1
            20322: Fixed ALF-1998: contentStoreCleanerJob leads to foreign key exception
               - Possible concurrent modification of alf_content_url.orphan_time led to false orphan detection
               - Fixed queries to check for dereferencing AND use the indexed orphan_time column
               - More robust use of EagerContentStoreCleaner: On eager cleanup, ensure that URLs are deleted
               - Added optimistic lock checks on updates and deletes of alf_content_url
      20864: Merged PATCHES/V3.2.0 to V3.3 (RECORD ONLY)
         20750: Merged V3.3 to PATCHES/V3.2.0
            20590: Fixed ALF-3189: Oracle/DB2/SQLServer/PostgreSQL are missing indexes to support many FK constraints
               - Reverses rev 17421
               - Added patchy bits to post-create script and declared patch
               - Patch only applies to *new* installations from 3.2.0 onwards (schema 3007 to 3400)
         20748: Incremented version label
         20745: ALF-3639: Merged V3.2 to PATCHES/V3.2.0
            18363: WCM clustering - ETHREEOH-3962 (duplicate root node entry)
      20863: Merged PATCHES/V3.1.2 to V3.3
         20830: ALF-934: Another go at making External Access Servlet reset JSF view state for the document it is requesting
         20701: ALF-3203: Guarantee a deterministic initialization sequence for WebClientConfigBootstrap (PARTIAL - Needs Surf fix)
      20861: Merged PATCHES/V3.2.1 to V3.3 (RECORD ONLY)
         20831: Incremented version label
         20702: Incremented version label
         20681: ALF-3109: Merged V3.2 to PATCHES/V3.1.2
            16933: Fix ETHREEOH-1788 - Bootstrap fails due to disabled-avm-indexing-context.xml
         20680: ALF-3109: Merged V3.2 to PATCHES/V3.1.2
            16714: WCM/AVM fixes
               - ETHREEOH-2697 - file system likely to get full with avm lucene directories for unindexed WCM store
               - ETHREEOH-1847 - re-starting cluster node may show non-staging WCM store indexes out-of-date (although not indexed)
         20611: Incremented version label
         20538: ALF-3117: Merged HEAD to PATCHES/V3.1.2
            17099: Build Fix for failing permission test (missing flush in DAO)
         20535: ALF-3141: Merged V3.2 to PATCHES/V3.1.2
            17441: Build fix: Fix AVM permission inheritance to match DM and fix common permission dao component
         20534: Incremented version label
         20533: ALF-3117: Merged DEV/V3.3-BUG-FIX to PATCHES/V3.1.2
            20368: Work-around for ALF-2366: patch.updateDmPermissions takes too long to complete
               - this patch may now be deferred until 3.4 using the sample context (DM will use old permissions and AVM new as it did in 2.2.x)
               - this is only supported upgrading direct to 3.3.1
         20532: ALF-3117: Merged V3.2 to PATCHES/V3.1.2
            17076: Improvements for ETHREEOH-2153: patch.updateDmPermissions takes too long to complete
         20531: ALF-3141: Merged V3.2 to PATCHES/V3.1.2
            17419: Fix for ETHREEOH-3296: Enterprise 3.X / Permissions Error When Cut & Paste on Sub-Folder
         20516: Incremented version label
         20515: ALF-3109: Merged V3.2 to PATCHES/V3.1.2
            18363: WCM clustering - ETHREEOH-3962 (duplicate root node entry)
      20860: Merged V3.1 to V3.3
         19424: Fix bug in permission evaluation time reporting
      20859: Merged V3.1 to V3.3 (RECORD ONLY)
         20599: Incremented version label
         20596: ALF-3184: Merged V3.3-BUGFIX to V3.1A
            20307: VersionStore - minor fixes if running deprecated V1 
               - warn in startup log
               - do not execute migration cleanup
            20370: Version Migrator (ALF-1000) - use common batch processor to enable multiple workers
            20373: Version Migrator (ALF-1000) - resolve runtime conflict (w/ r20334)
            20387: Version Migrator (ALF-1000) - approx x3 boost (policies ignore version2 store)
            20431: Version Migrator (ALF-1000) - migrate 1st batch independently
         20591: ALF-3184: Merged V3.2 to V3.1A (partial)
            19507: ALF-955: deletion of dynamic custom model
               - ignore policies/behaviours for node archive store (reviewed w/ DH)
            19553: Follow-on to r19507 (ALF-955) - fix testAutoRemovalOfVersionHistory
         20577: ALF-3184: Ported BatchProcessor to V3.1A in preparation for VersionMigrator port
         19426: Fix for eclipse build path: Part 2
         19425: Fix for eclipse build path
         19305: Merged V3.2 to V3.1 ('cause you never know!)
            19304: Removed static (singleton) usage of CacheFactory
         18996: MOB-388: Fixed copying of properties
         18919: CopyServiceChildAssocsFix on 3.1
         18566: Removed svn:mergeinfo
         18428: Backport of r14260:  fixed code typo which cased a ClassCastException with multiple pooled actors.
         18424: Updated version label to 3.1.2.1
         17861: Merge 2.2 to 3.1:
            17803: Re-use open files for the same session/process id so that writes on each file handle go to the same file. ETWOTWO-1250. (Record-only)
         17843: Re-use open files for the same session/process id so that writes on each file handle go to the same file. Port of ETWOTWO-1250.
         17842: Missing file from previous checkin.
         17839: Rewrite the rename file logic to handle MS Office file rename patterns. ETHREEOH-1951.
         17359: Fix for CIFS/Kerberos/SPNEGO logon problem with Win2008/Win7 client. ETHREEOH-3225.
         17193: ETHREEOH-3112: Issue for adding / deleting non-English files
            Appropriate encoding for non English symbols was added.
            Ported from V3.2.
         17181: Fixed typo on --record-only
         17130: Fix for cannot delete file via CIFS that has a thumbnail associated with it. ETHREEOH-3143 and ETHREEOH-3115.
      20858: Merged V2.2 to V3.3
         18568: (RECORD ONLY) Fix for CIFS SendTo->Compressed Folder 'not enough space' error. ETWOTWO-596.
         Ported latest v3 repo filesystem rename logic to v2, should fix a few other issues too.
         17803: (RECORD ONLY) Re-use open files for the same session/process id so that writes on each file handle go to the same file. ETWOTWO-1250.
      20857: Merged V2.2 to V3.3
         20504: Merged DEV/BELARUS/V2.2-2010_02_03 to V2.2 
            19346: ALF-1358: Deleting space with "execute a script" rule fails
               - The invocation of the RuleServiceImpl.getRule() was added on the ruleNodeRef to get updated associations of the last one. (???)
         20476: Fix for ALF-1863: Advanced Search does not work with custom type of type d:int with a constraint of type LIST
         20475: Merged DEV/TEMPORARY to V2.2
            20375: ALF-1830: Manage Task UI for Pooled Tasks: don't show Reject/Accept if user hasn't taken ownership 
         20472: (RECORD ONLY) ALF-1841: Merged DEV/BELARUS/V2.2-2009_12_01 to V2.2 (with corrections)
            17865: ETWOTWO-935: Regression: readOnly settings do not work in 2.2 causing bootstrap to fail
               The check on current mode is read only was added into AbstractLuceneIndexerAndSearcherFactory and  AlfrescoJobExecutorThread classes. 
         20068: Merged BRANCHES/DEV/BELARUS/V2.2-2010_02_03 to BRANCHES/V2.2:
            19326: ALF-1932: ALF-1358 Deleting space with "execute a script" rule fails: Unit Test move to RuleServiceImplTest.
         19670: Fix for ALF-1788: Renamed Category not usable in Query
            - renaming a category in the admin console now also renames the association and changes the PATH by which the category is known.
         19093: Fix ALF-1791
            - added unit test
         19055: Fix compile error introduced during pervious merge
         19048: Merge DEV/BELARUS/V2.2-2010_02_03 to V2.2
            19014 : ALF-883: Rule is not triggered for a item which is restored from the bin
         19045: Merge DEV/V2.1SP7 to V2.2
            12225 : ETWOONE-74 (Authentication tickets expire after set time, but would be more useful to have them expire after an inactivity timeout.)
         18958: Merged BELARUS/V2.2-2010_02_03 18850 Fixed ALF-1358: Deleting space with "execute a script" rule fails
            - Merged the fix only.  The unit test belongs to the RuleService.
         18918: (RECORD ONLY) Fixed backward compatibility of CopyServiceChildAssocsFix module
         18759: (RECORD ONLY) Merged DEV/BELARUS/V2.2-2010_02_03 to V2.2
            18553: ResultSet closing was added to methods
            This was fixed separately in V3.2; port forward selectively
         18561: (RECORD ONLY) Merged DEV to V2.2
            18552: Fix ETWOTWO-1389: Issues with ACL upgrade script for Oracle
             (DH: Removed commented-out SQL statements)
         16304: (RECORD ONLY) ETWOONE-335: Parallel Review does not store Priority and Due Date set at task creation
            1. Appropriate changes have been made in parallelreview_group_processdefinition.xml and parallelreview_processdefinition.xml files.
            2. Redeploy flag is kept with false value by default in the workflow-context.xml.sample file.
            3. A sorting of the list of workflow definitions by name has been already applied in all branches according to ETWOTWO-302 issue fix.
      20855: Fix for ALF-3690. Unable to FTP files into Share site documentLibrary folder.
         This fix corrects what it essentially a typo. The dictionaryService was injected twice into the CreateNodeRuleTrigger bean, rather than the dictionaryService and the ruleService.
      20853: Merged V2.2 to V3.3 (RECORD ONLY)
         20459: Build fix - don't try to delete the guest user in PersonTest
         20411: Merged BRANCHES/V3.1 to BRANCHES/V2.2: (for ALF-2628)
            14863: (RECORD ONLY) Fixed ETHREEOH-2223: Oracle version-specific schema update failure in upgrading from 2.1A build to 
         20383: Merged V3.2 to V2.2 (Fixes duplicate ALF-1359)
            16731: ETHREEOH-2411: Error message appears when trying to create advanced workflow with long description
         19303: Updated version to 2.2.7
         17811: Updated version to 2.2.6
         17433: Merged V3.1 to V2.2
            15894: Fix ETHREEOH-2416 and ALFCOM-3300: Duplicate name exceptions not being trapped correctly
               Fixes ETWOTWO-1261 
         15869: Port of desktop action client side EXE fixes from v3.x. ETWOTWO-1374.
      20849: (RECORD ONLY) Merged V3.3-BUG-FIX to V3.3
         20847: Fixes Recent Documents and My Tasks localisation issues: ALF-2021 & adds an FTL friendly medium length date format property
   20828: Missed svn:mergeinfo


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20885 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-07-01 08:25:06 +00:00
Dave Ward
3238ca154a ALF-3604: Correct case-sensitivity issues in LDAP sync
- User names are now brought in line with the case of the LDAP directory during sync (in case the UID attribute is case sensitive)
- User names are now compared according to Alfresco's case sensitivity setting
- Group name comparisions are still case sensitive
- Added unit test to ensure correct behaviour


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20873 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-06-30 13:03:27 +00:00
Dave Ward
890d3795ce Merged V3.3 to HEAD
20440: RM: CapabilitiesTest.testDestroyRecordsCapability (MS SQL Server build) - use non-public nodeService
   20441: Include virtual tomcat in installers
   20442: Change bitrock builder version to use.
   20443: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3: (Fixed tabs and removed 'svn:executable' and 'svn:eol-style')
      20384: Merged BRANCHES/DEV/BELARUS/HEAD-2010_04_28 to BRANCHES/DEV/V3.3-BUG-FIX:
         20271: ALF-803: Asset Service Improvements
      20386: Merged V2.2 to V3.3-BUG-FIX
         20385: Merged DEV/BELARUS/V2.2-2010_04_06 to V2.2
            20379: V2.2-ALF-1888 AssociationQuery was corrected to filter ...
      20387: Version Migrator (ALF-1000) - approx x3 boost (policies ignore version2 store)
      20388: Merged BRANCHES/DEV/BELARUS/HEAD-2010_04_28 to BRANCHES/DEV/V3.3-BUG-FIX:
         20372: ALF-897: It is impossible to create content when default value selected in ContentHeadlineBackground field for intranet_rssi_landing_template web-form (also fixes ALF-2798 & ALF-791)
      20389: Merged BRANCHES/DEV/BELARUS/HEAD-2010_04_28 to BRANCHES/DEV/V3.3-BUG-FIX:
         20374: ALF-2723: WCM - Http 500 creating content via webform
      20394: Fix for ALF-2257 - It's impossible to find and add group at Records Manage Permissions page
      20396: Fixed ALF-2956 "XSS attack is made when a rule is being deleted"
      20397: Fix for ALF-922: Mysql does not support unique keys that contain nulls as one would expect
      20402: ALF-2186 : Rules not being fired on datalist items - because it's a zero byte file?
      20404: Fixed ALF-2109 "Rule doesn't apply to the files in sub-folders when 'Run rule for this folder and its subfolders' action was performed"
      20406: Fix for ALF-2985 - Share document library throws error if document modifier or creator is deleted from Alfresco
      20409: Improved FormServiceImplTest, added more content related tests and some edge case tests using the FDK model (this test needs to be manually enabled though as the FDK model is not available by default)
      20414: Merged DEV/BELARUS/HEAD-2010_04_28 to DEV/V3.3-BUG-FIX
         20401: ALF-2616: Serious Web Form layout performance issues on IE8. This fix contains:
      20427: Merged DEV/BELARUS/HEAD-2010_04_28 to DEV/V3.3-BUG-FIX
         20042: ALF-1523: Failed Kerberos SSO auth doesn't fail through, simply returns a blank page
         20323: ALF-1523: Failed Kerberos SSO auth doesn't fail through, simply returns a blank page
      20428: Merged DEV/BELARUS/HEAD-2010_04_28 to DEV/V3.3-BUG-FIX
         20417: ALF-736: WebDAV Folder Renaming fails on Mac but works on Windows.
      20430: Fix for ALF-2313 - Accessing a Doclib folder in Share which has a link to a deleted node fails
      20431: Version Migrator (ALF-1000) - migrate 1st batch independently
      20432: Fix for ALF-2327 - Can not have more than one Transfer Step in a disposal schedule
      20438: ALF-479: Merged DEV/BELARUS/V3.2-2010_01_11 to DEV/V3.3-BUG-FIX
         18448: ETHREEOH-4044: External Authentication Subsystem does not perform user mapping for WebDAV requests
   20444: Fix for ConcurrentModificationException in file server quota manager. ALF-2970.
   20445: Merged HEAD to BRANCHES/V3.3: (RECORD ONLY)
      20413: Added clean of quickr project
   20446: Changed version to 3.3.1dev
   20447: Merged V3.3-BUG-FIX to V3.3
      20294: Fixes: ALF-1020 & ALF-1013 for all views except agenda.
   20451: Merged V2.2 to V3.3
      20450: Merged DEV/BELARUS/V2.2-2010_04_06 to V2.2
         20412: ALF-1887: too easy to break alfresco - one can remove the guest user and recreate it but then access to RSS is broken
            - PersonServiceImpl.beforeDeleteNode prohibits attempts to delete a guest user.
   20452: Fix for transaction error from NFS server file expiry thread. ALF-3016.
   20458: ALF-2729 - rationalise (and deprecate) VersionLabelComparator
   20460: Fix for ALF-2430
      - AVM nodes are not checked for exclusion - the default ACLEntryVoter will always vote for AVM
      - avoids embedded AVM permission checks for getType/getAspect and anything else that may be added
      - seems AVM read is not checked upon "lookup" for the last node in the PATH (getType should have failed too)
   20466: Merged V2.2 to V3.3
      20243: (RECORD ONLY) ALF-2814: Merged V3.2 to V2.2
         17891: Merged DEV_TEMPORARY to V3.2
            17873: ETHREEOH-3810: WCM - Recursion detector erroring
   20467: Merged V3.1 to V3.3 (RECORD ONLY)
      20276: Incremented version label
      20275: ALF-2845: Merged V3.2 to V3.1
         17768: Merged DEV/BELARUS/V3.2-2009_11_24 to V3.2
            17758: ETHREEOH-3757: Oracle upgrade issue: failed "inviteEmailTemplate" patch - also causes subsequent patches to not be applied
      19573: Merged V3.2 to V3.1
         19539: Merged HEAD to V3.2
            19538: Build fix - fix build speed
   20468: Merged PATCHES/V3.2.r to V3.3 (RECORD ONLY)
      20357: Merged PATCHES/V3.2.0 to PATCHES/V3.2.r
         20349: Merged V3.3 to PATCHES/V3.2.0
            20346: ALF-2839: Node pre-loading generates needless resultset rows
               - Added missing Criteria.list() call
      20339: Incremented version label
      20338: Merged PATCHES/V3.2.0 to PATCHES/V3.2.r
         20280: Fixed ALF-2839: Node pre-loading generates needless resultset rows
            - Split Criteria query to retrieve properties and aspects separately
         20272: Backports to help fix ALF-2839: Node pre-loading generates needless resultset rows
            Merged BRANCHES/V3.2 to PATCHES/V3.2.0:
               18490: Added cache for alf_content_data
            Merged BRANCHES/DEV/V3.3-BUG-FIX to PATCHES/V3.2.0:
               20231: Fixed ALF-2784: Degradation of performance between 3.1.1 and 3.2x (observed in JSF)
         20266: Test reproduction of ALF-2839 failure: Node pre-loading generates needless resultset rows
   20469: Merged PATCHES/V3.1.2 to V3.3 (RECORD ONLY)
      20393: Eclipse classpath fix to avoid problems in JBoss
      20309: ALF-2777: PrimaryChildAssocCopyBehaviour from MOB-388 corrupts cm:name attributes of copied child nodes
         - Folded example behaviours from previous AMP into repository
         - Fixed PrimaryChildAssocCopyBehaviour to back-up and set the cm:name property on copied children
   20470: Merged PATCHES/V3.2.0 to V3.3 (RECORD ONLY)
      20465: Incremented version label
      20464: ALF-3060: Merged V3.2 to PATCHES/V3.2.0
         19920: Merged HEAD to BRANCHES/V3.2:
            19918: Fix ALF-2499 (Deleting a web project also deletes similarly named web projects - Potential Data Loss)
      20448: Merged DEV/V3.3-BUG-FIX to PATCHES/V3.2.0
         20414: Merged DEV/BELARUS/HEAD-2010_04_28 to DEV/V3.3-BUG-FIX
            20401: ALF-2616: Serious Web Form layout performance issues on IE8. This fix contains:
               a) X-UA-Compatible head tag with IE=EmulateIE7 value
               b) alfresco.ieVersion and alfresco.ieEngine in common.js
               c) recurseOnChildren in _updateDisplay
               d) Some performance modifications in xforms.js
      20350: Increment version label
      20349: Merged V3.3 to PATCHES/V3.2.0
         20346: ALF-2839: Node pre-loading generates needless resultset rows
            - Added missing Criteria.list() call
   20471: Fix for offline sync losing metadata properties, due to rename/delete of original file. ALF-575.
   20478: Merged HEAD to BRANCHES/V3.3: (RECORD ONLY)
      20477: Fix ALF-3086: CMIS checkin of a non-versionable document should make it versionable
   20479: ALF-2110: Make it possible to determine which person properties are synced via LDAP and hence immutable
      - Added Set<QName> UserRegistrySynchronizer.getPersonMappedProperties(String username)
      - UI/Services Fix to follow
   20481: Latest SpringSurf libs:
      - Fix for ALF-1518 - Added support for HTTP and HTTPS proxies for Surf application remote api calls - via the standard JVM cmd line properties such as -Dhttp.proxyHost=...
   20484: ALF-2886: LDAP sync defaults display names incorrectly and can't cope with DNs containing escaped trailing whitespace.
      - Had to work around a JDK bug in LDAP RDN parsing
   20486: Added case sensitive flag to the file state cache. Part of ALF-570.
   20487: Fix for copy/rename of folders causing file exists errors in some cases. ALF-570.
   20488: Fix ALF-680: Previously valid content models now fail with CMISAbstractDictionaryService$DictionaryRegistry exception
   20489: Uploaded correct version of spring source jars and reunited them with 3rd-party/.classpath
   20490: Fix for cannot delete folders via CIFS from Mac OSX, due to desktop actions. ALF-2553.
   20491: Merged DEV/TEMPORARY to V3.3 (With corrections)
      20485: ALF-2290: a HTTP GET request of a document redirects to the Home Location when using NTLM SSO
         The logic related to ADB-61 in NTLMAuthenticationFilter clears previous location and redirects request to default home location. NTLMAuthenticationFilter was changed to process GET requests to documents correctly. Now, fix to ADB-61 processes only “/faces” requests and GET requests to documents are processed correctly.
         The same fix was made to KerberosAuthenticationFilter
   20492: Fix ALF-680: Previously valid content models now fail with CMISAbstractDictionaryService$DictionaryRegistry exception
      - missing remove directory
   20493: Fix ALF-2837: ClassCastException in getProperties()
   20498: Fix for ALF-2818: Failure to close index writer under certain conditions.
      - fix for index writer to close indexes when stopped by exceptions during FTS
      - fix FTS job to handle exceptions better
      - debug for FTS background operations
   20499: ALF-3094: In ticket authenticate method in AuthenticationHelper, invalidate the current session if its cached ticket doesn't match
   20500: Fix for ALF-2858 "Zero KB sized bin files will be created in the contentstore when new sites are created" (RECORD ONLY)
   20503: AVMTestSuite: minor fixes to cleanup ctx usage (avoid re-loading)
   20505: Merged BRANCHES/V2.2 to BRANCHES/V3.3 (record-only)
      13859: (record-only) Removed dev from version label
      14003: (record-only) Updated version to 2.2.5dev
      14566: (record-only) ETWOTWO-1239 - remove workflow interpreter/console bootstrap
      14572: (record-only) ETWOTWO-1239 - fix PersonTest to fix JBPMEngineTest (part-sourced from r13247)
      14776: (record-only) Merged V3.1 to V2.2
         14748: ETHREEOH-2225 - WCM upgrade (performance improvements for MySQL)
   20506: NFS ReadDir/ReadDirPlus skips some folder entries. JLAN-98. 
   20507: Fixed issue with folder search resume id being reset to the wrong value during NFS folder search. Part of JLAN-98.
   20508: Merged BRANCHES/V3.2 to BRANCHES/V3.3:
      18319: Merged BRANCHES/DEV/BELARUS/V3.2-2010_01_11 to V3.2
         18273: ETHREEOH-3834: WCM: An extral .xml.html file is created when editing newly created content
      19182: Merged V3.1 to V3.2
         18423: ETHREEOH-3850 - Content Manager unable to edit content items if there is a lock on a generated rendition
         18432: (RECORD ONLY) Added FTP data port range configuration via <dataPorts>n:n</dataPorts> config value. ETHREEOH-4103.
         18451: (RECORD ONLY) Fixed incorrect FTP debug level name.
         18577: (RECORD ONLY) Fix for ETHREEOH-4117, based on CHK-11154
         18792: Fix ETHREEOH-2729:  Import of property with @ symbol in name fails with "start tag unexpected character @ "
      19570: ALF-192 / ALF-1750:  System Error if user trying submit web content based on web form which was deleted
      19583: Merged DEV/BELARUS/V3.2-2010_03_17 to V3.2
         19545: ALF-1954: Regression: same item can be submitted multiple times to workflow
      19725: AVMStoreDescriptor - fix minor typo (for debugging)
      19917: (RECORD ONLY) Merged HEAD to BRANCHES/V3.2:
         19880: Fix ALF-898 - WCM: Deleting a file leads to error (only if RM/DOD installed)
      19920: (RECORD ONLY) Merged HEAD to BRANCHES/V3.2:
         19918: Fix ALF-2499 (Deleting a web project also deletes similarly named web projects - Potential Data Loss)
   20509: Merged BRANCHES/V3.2 to BRANCHES/V3.3 (RECORD ONLY):
      19825: (RECORD ONLY) Merged PATCHES/V3.2.r to BRANCHES/V3.2: 
         19804: Merged PATCHES/V3.2.0 to PATCHES/V3.2.r 
            Merged HEAD to V3.2.0 
            ...
   20510: Merged BRANCHES/V3.1 to BRANCHES/V3.3 (RECORD ONLY)
      17482: (RECORD ONLY) Merged V3.2 to V3.1
         17478: Fix ETHREEOH-3340 - WCM - Revert to snapshot failure (fix AVM getListing -> AVMSync compare -> WCM revertSnapshot)
      18783: (RECORD ONLY) MT: ensure group (EMAIL_CONTRIBUTORS) bootstraps tenant admin user (when creating tenant)
   20513: Added port change example for remote Alfresco server to share-config-custom.xml.sample
   20518: ALF-657 Created tests to check that the 'runas' functionality works in the AlfrescoJavaScript action handler. Also modified the handler to run as the System user if no Authentication is currently set, as may occur if the action handler is being executed asynchronously.
   20519: ALF-657 Created tests to check that the 'runas' functionality works in the AlfrescoJavaScript action handler. Also modified the handler to run as the System user if no Authentication is currently set, as may occur if the action handler is being executed asynchronously.
   20520: Removed dev version.label
   20522: ALF-3129: Map cm:organization property in LDAP as well as cm:organizationId, since cm:organization is what shows up in JSF and Share. Needed by ALF-2110.
   20523: First part of fix for ALF-2110:
      - Appropriate Person and webframework metadata APIs now return information on immutability of Person properties (as some properties are immutable when synced to LDAP etc.)
      - Share client  now correctly disables profile fields in User Profile and Admin User Console as appropriate based on individual user property mutability
      - Change Password button now correctly enabled/disabled based on account mutability
   20524: VersionMigrator - option to run as scheduled job (ALF-1000)
   20525: Fix for various IE6 CSS issues:
      ALF-3047 - It's impossible to destinate any action with data list item (IE6 specific)
      ALF-3049 - Incorrect layout of Manage aspects page
      ALF-3050 - Incorrect layout of Assign Workflow form
   20526: Fix for ALF-2915 - Select > None feature for Data Lists not working across multiple pages in IE
      Closed ALF-2846 - DataList UI not fully I18Ned [Old prototype code]
   20527: Fix for ALF-3082 - There is no Edit Offline action at Details page in Share site
   20528: Fix various script errors due to typo:
      ALF-3088 - Script error occurs on creating duplicated record seria
      ALF-3012 - Incorrect behaviour on creating duplicating folders
      ALF-3004 - Script error when submitting an item with long data in Prioprity field
   20529: Fix for ALF-3006 - Selected Items > Copy to... and Move to actions not working in Document Library
   20530: Dynamic Models - fix test(s)
      - fix concurrency test for Oracle build (retry if txn lock cannot be acquired)
      - when getting deployed models, skip if invalid (eg. cannot be parsed)
   20536: Remove @Override (ALF-657)
   20537: Activities - (minor) fix NPE for Oracle build/test
   20543: Final part of ALF-2110 - Appropriate person properties disabled for editing in Explorer Client if external mapped sync such as LDAP is used.
      Fixed issue with Change Password option being disabled incorrectly.
   20544: Follow-up fix to r20528
   20546: Fix for ALF-3151 - Freemarker causes NPE while deploying 3.3 enterprise onto WebSphere 7.0.0.7
      - NOTE: will need to submit patch to freemarker.org
   20552: Merged BRANCHES/V3.2 to BRANCHES/V3.3 (RECORD ONLY)
      20551: (RECORD ONLY) Merged BRANCHES/V3.3 to BRANCHES/V3.2:
         20090: Dynamic models: minor improvements to DictionaryModelType
   20553: Fix for escalated issue ALF-2856: Space returns to browse view after completing Add Content dialog; need a way to return to custom view (applied patch provided by customer).
   20554: Improvement to model delete validation (investigating intermittent failure of RepoAdminServiceImplTest.testSimpleDynamicModelViaNodeService)
   20558: Merged DEV/BELARUS/V3.3-2010_06_08 to V3.3
      20550: ALF-922: Mysql does not support unique keys that contain nulls as one would expect ...... duplicates in the alf_access_control_entry table
   20562: ALF-3177 - security fix.
   20563: Merged BRANCHES/V3.2 to BRANCHES/V3.3:
      19412: Fix for ALF-865 "WCM / Cluster: unexpected error when concurrently submitting content"
         ALF-862 "WCM submit execution will require locking in a clustered WCM authoring env"
   20564: Merged BRANCHES/V3.1 to BRANCHES/V3.3:
      20542: Fixed ALF-3152: ImporterComponent transaction retry settings can cause IllegalArgumentException
   20568: Follow-up on fix ALF-3152.  Fix jobLockService's retryWaitIncrementMs


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20572 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-06-09 14:53:24 +00:00
Dave Ward
2163f99539 Merged V3.3 to HEAD
20025: Created Enterprise branch V3.3
   20026: ALF-2597 : IMAP : permissions on home space.
      - now, by default, people can't read other's mail.
   20030: Merged BRANCHES/V3.2 to BRANCHES/V3.3:
      19919: Merged BRANCHES/V3.1 to BRANCHES/V3.2:
         19766: Fixed ALF-2351: Oracle upgrade scripts need enhancements from 2.2SP7
      20027: Merged BRANCHES/V3.1 to BRANCHES/V3.2:
         19983: Changes for ALF-2545: Cannot upgrade from 2.1.2a (b 209) to the 3.1.2 (.a3 458) on Oracle
         20008: ALF-2351: Oracle upgrade scripts need enhancements from 2.2SP7
   20032: Merged HEAD to BRANCHES/V3.3 (RECORD ONLY)
      20031: Fix ALF-2626 - Share Repository browser broken
   20035: Enterprise branding for Share & Explorer - DO NOT MERGE (RECORD ONLY)
      Also: SAIL-282: Update the Help URLs for 3.3 Enterprise
   20039: Fix ALF-2393 - Alfresco Comunity 3.3 deployment error on JBoss v6
   20044: Fix ALF-750 (versioning does not persist node associations)
      - TODO: review version migrator (if upgrading directly from Ent 2.x to Ent 3.3)
   20049: Merged PATCHES/V3.2.r to BRANCHES/V3.3
      20047: Fix for ALF-2640: Share: Edit Offline and Upload New Version fails with HTML uploader on FF3.5, works on IE
   20054: Fix ALF-750 (versioning does not persist node associations)
      - update version migrator (only applies if not already run, ie. upgrading directly from Ent 2.x to Ent 3.3)
   20057: Merged HEAD to BRANCHES/V3.3: (RECORD ONLY)
      20033: Accordion example was broken when FDK is deployed as a JAR
   20064: Fix for ALF-2623: Alfresco 3.3G's Share site is prone to cross site scripting attacks
      - Bug is actually in the wiki components
   20065: Fix unreported issue (auto-versioning for metadata-only updates stops working after checkin) & additional improvements to LockService
      - explicitly remove lockable aspect (rather than nullifying properties) for unlock / checkin
      - use txn resource to track ignorable nodes (for lockable aspect behaviours)
      - note: currently affects Alfresco Explorer only (since Alfresco Share explicitly disables autoVersionOnUpdateProps)
   20066: Increased PermGen space for tests to 256M from 128M
   20071: AVM - check for circular layered directories (ALF-813 / ALF-910)
   20073: Fix LockService tests
      - fix typo (introduced in r20065)
      - TODO: review LockOwnerDynamicAuthorityTest.testCheckOutCheckInAuthorities
   20076: Fix LockOwnerDynamicAuthorityTest.testCheckOutCheckInAuthorities
   20078: Fixed ALF-2464 "Missing i18n labels when rules fail to run"
   20081: Fixed ALF-1626 "The position:absolute behaviour of the Flash preview container needs a re-think"
      - Now handles long file names (resize was already fixed)
   20083: Fix for ALF-2708: Unmodifiable exception thrown when Web Script f/w attempts to report error (latest Spring Surf webscripts libraries)
   20084: Fixed ALF-253 "Unfriendly message appears when trying to login with username which contains symbol '\'"
      - also fixed bug whereerror messages for illegal characters was displayed as undefined for FF on Mac
   20085: Merging HEAD into BRANCHES/V3.3:
      20074: ALF-959 The invitation email 'subject' can now be set as a localizable property in invitation-services.properties:
      20080: Fixing failing test InvitationServiceImplTest.
   20087: ALF-1498: RM web script puts Alfresco in endless loop
      This was a general issue with the onUpdateProperties behaviour in the versionable aspect.  This code now disables the behaviour whilst it is executing to prevent the endless loop occuring.
   20088: Fixed an issue when uploading 2 or more documents for a new site. 
      - A failure occured since it asynchronously tried to create the documentLibrary container twice and the second attempt failed since it already existed.
   20089: SAIL-356: Action label changes
   20090: Dynamic models: minor improvements to DictionaryModelType
      - add (optional) concurrency locking
      - remove duplicate bean def
      - bind remaining class behaviours (onCreateNode, onRemoveAspect) based on type
   20091: Fixed ALF-1046 "Leave button is displayed for admin on Site Finder page near private site where admin is not invited"
   20092: Merged DEV/BELARUS/V3.2-2010_03_17 to V3.3
      20043: ALF-928: Upgrade from 2.1.7 to 3.2 with lots of content items - GC overhead limit exceeded exception
         Call getChildAssocs(NodeRef, QNamePattern, QNamePattern, boolean) with a value of 'false' for the preload argument to avoid preloading all the child nodes
   20093: Fix for ALF-2721: Upgrade clean 2.2.current + 20k users to 3.3.current fails in CalendarModelUriPatch updating URI that does not exist
   20094: ALF-2630: LDAP differential sync was failing to sync group memberships of users who themselves hadn't changed
      - New post process deals with group associations of unprocessed users
      - Modified unit test to properly simulate differential sync
   20095: Fix for ALF-2715: Rule creation in Alfresco Share 3.3G leads to an "Internal Server Error" failure message
   20096: Fix webview and wiki dashlet titles in yellow and gdocs themes.
   20097: Follow-up fix to cross-browser WebView dashlet (iframe) resizing
   20098: Workaround for ALF-2211: Share - Accessing User homes from Share/JSF integration freezes the browser.
      - The tree control has been given a configurable maximum folder count setting for both Site and Repository working modes. By default these are "unlimited" in Site mode and 500 in Repository mode. These values can be overridden in share-config-custom.xml - see the sample configuration file for details.
      - The workaround is to display a "Too many sub-folders to display" message when the maximum number of folders has been reached.
      - To aid users to select their User Home space (or sub-folder thereof) for Copy and Move actions, a new "My User Home" button is provided on the folder picker control.
   20099: Fix for ALF-2606: Manage Permissions on multiple nodes.
      - Toolbar action removed when in Repository Browser, as the fine-grained permissions page does not support multiple nodes.
   20100: Merged Outlook Meeting Workspace integration from BRANCHES/DEV/BELARUS/V3.2-2010_01_11
   20102: Fix for ALF-478: Authority CRC calculations must use UTF-8
   20103: Follow up from ALF-253 (Unfriendly message appears when trying to login with username which contains symbol '\')
      - Making lastName mandatory in Share ui since service otherwise complains
   20106: Fixed ALF-1041 "Revert action is available for SiteContributor and SiteConsumer" (and added a missing msg key for blogs)
   20108: ALF-2235: Permission exception when creating non-electronic records by Power User with Read and File permssions
   20109: Fix for ALF-2706 "ConcurrentModificationException in AsynchronousActionExecutionQueueImpl"
   20110: Merge Dev to V3.3
      ALF-1980 - Huge UIDVALIDITY giving IMAP client problems
   20111: Latest webeditor JAR containing change to orientation strings in WEF
   20113: Fix Share DocLib copy/move actions from recent refactor. Picker now appears with correct Site/Repository mode set upon opening.
   20114: Fix for ALF-2726: 'Transform and Copy content' action causes error.
   20115: Fix for ALF-2697 - File encoding is hard-coded for upload.post.js (Webscript API)
   20116: Fix for ALF-1090
   20119: ALF-2734 - Incorrect behaviour on creating google docs in Repository Browser
   20120: Enterprise build fix for Index check tests 
      - disable user usage updates
      - this should not be required
   20121: ALF-959 The site name/title should now correctly appear in the invite email subject, replacing '{0}'.
   20123: Merged HEAD to V3.3 (RECORD ONLY)
      20122: First part of fix for ALF-2718:  DOD5015 module breaks CMIS Atom DiscoveryService webscripts
   20126: Fix rule rest api json so numbers are not incorrectly formatted.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20565 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-06-09 12:47:50 +00:00
Dave Ward
ad11a47457 Merged V3.2 to HEAD
19109: Merged V3.2.0 to V3.2
      19098: ALF-1960: Fixed issues when syncing with deeply nested LDAP groups


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19116 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-03-08 11:27:25 +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
e0f29a76e4 Merged V3.2 to HEAD
18846: ETHREEOH-4233: LDAP sync now synchronizes group display names
      - New ldap.synchronization.groupDisplayNameAttributeName property provides name of LDAP attribute


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18856 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2010-02-25 17:17:04 +00:00
Dave Ward
be0482f06e Integrated Spring v3 snapshot CI-477
- Fixes SPR-6411 and SPR-6412
- Removes dependency on Hibernate v3.3

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


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17624 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-11-23 20:20:06 +00:00
Dave Ward
abe965cf15 Merged V3.2 to HEAD
17462: ETHREEOH-3346: New meaning to synchronization.synchronizeChangesOnly property
      - In the LDAP sync performance optimizations we always used the differential queries to determine the users and groups to be updated. Deletions were determined by a separate query.
      - This meant that if you ever did want to force the update of all users it wasn't possible.
      - So now when the flag is false it means don't use differential queries in the scheduled sync job.
      - The scheduled job now processes deletions regardless.
      - The default value for the property is now true.
   17431: ETHREEOH-3274: Refix NTLM support for share
      - Fixed NPE introduced by ETHREEOH-2767
      - Made web.xml validate against schema for JBoss
      - Reintroduced missing open comment in webscript-framework-config-custom.xml.sample
   17426: ETHREEOH-2997: Fix ticket parameter passing into NTLM/Kerberos WebDAV authentication filters
      - A NPE was stopping it from working
   17425: ETHREEOH-3282: Fixed NPE preventing upload from working with NTLM SSO enabled
   17368: ETHREEOH-3197: Use utf8_bin collation in MySQL out of the box to avoid problems with comparison of accented characters
   17361: ETHREEOH-3276: Don't attempt to start an LDAP sync when the repository is read only
   17347: ETHREEOH-3206: Fix LocalFeedTaskProcessor to work with JBoss 5


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17464 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-11-13 12:40:33 +00:00
Dave Ward
b8aaa9c372 Merged V3.2 to HEAD
17163: org.alfresco.repo.domain.hibernate.AclDaoComponentImpl.updateAuthority() needs to flush/dirty the session in order to work
   17160: Fix HeartBeat
      - Lazy initialization in scheduled job needed its own transaction
   17146: Fix failing unit tests
      - HibernateNodeDaoServiceImpl.moveNodeToStore() must invalidate parentAssocsCache now that it contains NodeRefs
   17145: Fixes to patches for new CRC schema changes
      - Sequenced patch.fixNameCrcValues-2 before all other patches
      - Fixed typos in schema upgrade script and added CRCs for the repository descriptor nodes, so that the descriptor service and patch service can boot up
      - HeartBeat initializes lazily so that it doesn't try to load information before the patch service has bootstrapped
      - Made FixNameCrcValuesPatch industrial strength by using BatchProcessor to handle multi threading, progress reporting and transaction delineation
   17097: Removal of spurious logs directory accidentally introduced in 17096
   17096: Performance tuning for improved throughput during high volume import from LDAP directory
      - Lucene indexer will now no longer index and then reindex the same node in the same transaction
      - lucene.indexer.mergerTargetOverlaysBlockingFactor reduced to 1 (improves indexing performance and no excessive throttling observed during 10 hour test)
      - HomeFolderManager fixed so that it pays attention to the eager home folder creation flag
      - HibernateNodeDaoServiceImpl.parentAssocsCache 'upgraded' to hold information about root nodes and node refs so that recursive methods such as prependPaths can run entirely out of the cache
      - Boolean argument added to getChildAssocs() so that preloading of all child nodes is optional
      - qname_crc column added to alf_child_assoc to allow efficient lookup and indexing of child associations by QName. CRC of (qname_namespace, qname_localname).
      - idx_alf_cass_qnln on qname_localname replaced with idx_alf_cass_qncrc (qname_crc, type_qname_id, parent_node_id)
      - All node service lookup queries involving qname_localname modified to include qname_crc in WHERE clause
      - schema patch provided
      - existing org.alfresco.repo.admin.patch.impl.FixNameCrcValuesPatch extended to also fill in qname_crc column and forced to run on newer schemas
      - Optimized ChainingUserRegistrySynchronizer so that it doesn't have to look up the entire set of authorities during  an 'empty' incremental sync
      - ChainingUserRegistrySynchronizer no longer starts an outer transaction around all its smaller transactions (used to die due to timeout)
      - rule service disabled for LDAP batch processing threads
      - org.alfresco.cache.parentAssocsCache and org.alfresco.cache.storeAndNodeIdCache size increased to 80,000
      - Fixed case sensitivity issue with person caching in PersonServiceImpl
      - Cache the people container in PersonServiceImpl for faster person lookups
      - PersonDAO removed and replaced with now more efficient node service child assoc lookup methods


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17168 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-10-26 15:52:59 +00:00
Dave Ward
8f6773284f Merged V3.2 to HEAD
16939: Merged V3.1 to V3.2
      16938: ETHREEOH-622: AuthorityServiceImpl uses userNameMatcher to check for admin users according to case sensitivity settings
      16934: ETHREEOH-2584: Coding error in BaseSSOAuthenticationFilter
   16924: LDAP Performance
      - Created NodeService addChild variants that can add associations to multiple parents (groups/zones) at the same time with a single path check.
      - Created AuthorityService addAuthority variant that can add an authority to multiple groups at the same time, using the above
      - Optimized group association creation strategy. Groups and Persons created in 'depth first' order (root groups first, parents last). Prevents the nodes having to be reindexed.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17070 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-10-21 15:52:13 +00:00
Dave Ward
b1433afacf Merged V3.2 to HEAD
16780: Fix failing unit test
      - HeartBeat now needs to be constructed inside a transaction.
   16765: Merged DEV/BELARUS/V3.2-2009_10_05 to V3.2
      16754: ETHREEOH-2534: SPP does not authenticate when authentication chain contains both alfrescoNtlm and passthru types.
         - NTLM Authentication handler for Sharepoint module was implemented as singleton. But after it was integrated into Alfresco Authentication Subsystem, instance of this object is created for each type of NTLM authentication. As result static field with NTLM flags was rewrited for each instance. Bug was resolved by removing static indicator.
   16751: LDAP sync improvements
      - Correction to the way retried transactional errors are reported
      - Addition of unit test for synchronization with a mock user registry generating a large volume of users, groups and associations
   16749: Removed UserUsageBootstrapJob from scheduled jobs and moved UserUsageTrackingComponent to bootstrap
      - files missed from CHK-9619
   16748: User Usage Tracking Component bootstrapped synchronously to avoid its expensive queries across all users 'stepping on top of' other bootstrap activity such as LDAP synchronization
      - Its startup messages are no longer masked out by log4j.properties
      - Logged ETHREEOH-3009 regarding upgrade impact of new faster queries
   16747: Lower impact of HeartBeat service on server performance
      - More efficient AuthorityService APIs used to determine the total number of groups and users more efficiently
      - Queries of all users and groups done synchronously at startup only
   16746: Improvements for faster user and group lookup and association on a large repository (unfortunately intertwined)
      - NodeService getChildAssocRefsByTypeQNames query rewritten to use a subquery to force a more logical evaluation order on MySQL
      - NodeService getChildAssocs method made to use more efficient getChildAssocRefsByTypeQNames DAO call when a type qname but no assoc qname is specified
      - NodeService getUsersWithoutUsage / getUsersWithUsage queries rewritten to avoid an expensive outer join on all users
      - PersonService getPersonIgnoreCase query corrected to include the type QName ID of the child associations it is querying (thus avoiding unnecessarily triggering duplicate person removal)
      - PersonService now supports an optional boolean argument to getPerson that indicates whether the auto-create + home folder creation behaviour should be triggered.
      - AuthorityDAOImpl now uses false argument to getPerson call to avoid lazy home folder creation during creation of group associations
      - AuthorityDAOImpl now specifies assoc type to getChildAssocs in getAllAuthoritiesInZone and findAuthorities calls so that the more efficient query variant is used
      - Redundant personExists() call removed from authorityServiceImpl


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16914 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-10-14 11:48:02 +00:00
Dave Ward
85c1b71826 Merged V3.2 to HEAD
16662: LDAP sync: improved group association filtering, referential integrity checking, deletion strategy and performance tuning of batch sizes
   16648: ETHREEOH-2752: Improved ticket validation fix
      - Invalidate user's tickets during person deletion rather than validation or it can mess up chained validation
   16647: ETHREEOH-2534: Fixed Sharepoint NTLM authentication
      - user details were never getting cached in the session
   16579: Small improvement to LDAP error reporting
      - Committed errors counted before successes in a logging interval
   16515: LDAP sync performance
      - Improved full sync strategy - run differential queries to work out required updates/additions and full queries to work out required deletions. Saves updating unchanged nodes.
      - Use a TreeSet rather than a HashSet to gather group associations in an attempt to avoid blowing the heap size
   16498: More LDAP performance improvements
      - Uses thread pool with 4 worker threads and blocking queue to process returned results. The number of worker threads can be controlled by the synchronization.workerThreads property.
      - Switched LDAP connection pooling back on again
      - Group Associations processsed individually so that errors are collated and we get a better idea of their throughput
      - Fixed potential bug. Group membership resolution done with isolated LDAP context to avoid cookies from paging creeping in.
   16424: Try switching off LDAP connection pooling to see if it works better with our flaky server.
   16414: Further LDAP fault tolerance
      - Log causes of group member resolution failures where possible
   16413: More fault tolerance for LDAP sync
      - Always commit last sync times before overall sync is complete to avoid the 'forgetting' of differential sync information
      - DN comparisons should be case insensitive to avoid issues resolving DNs to user and group IDs
   16398: Improved monitoring and fault tolerance for LDAP sync
      - When the batch is complete a summary of the number of errors and the last error stack trace will be logged at ERROR level
      - Each individual error is logged at WARN level and progress information (including % complete) is collated and logged at INFO level after a configurable interval
      - In the Enterprise Edition all metrics can be monitored in real time through JMX
      - Sanity testing to be performed by Mike!
   16319: Merged HEAD to V3.2
      16316: ALFCOM-3397: JBoss 5 compatibility fix
         - Relative paths used by LDAP subsystem configuration weren't being resolved correctly
         - See also https://jira.jboss.org/jira/browse/JBAS-6548 and https://jira.springsource.org/browse/SPR-5120
   16272: ETHREEOH-2752: Once more with feeling!
   16261: ETHREEOH-2752: Correct exception propagation.
   16260: ETHREEOH-2752: Fix ticket validation
      - Current ticket was getting forgotten by previous fix
      - Person validation in CHECK mode now done AFTER the current user is set, so that the current ticket is remembered
   16243: ETHREEOH-2752: Improve ticket validation used by all authentication filters
      - Now takes into account whether person actually exists or not
      - Tickets for non-nonexistent persons are now considered invalid and cached session information is invalidated
      - New BaseAuthenticationFilter superclass for all authentication filters
      - Improved fix to ETHREEOH-2839: WebDAV user is cached consistently using a different session attribute from the Web Client
   16233: ETHREEOH-2754: Correction to previous checkin.
      - relogin for SSO authentication, logout for normal login page
      - logout is default
   16232: ETHREEOH-2754: Log Out Action outcome passed as a parameter
      - relogin for SSO authentication, login for normal login page
      - Means the log out link always leads to the correct place, even when the session has expired
      - Also lowered ticket validation error logging to DEBUG level to avoid unnecessary noise in the logs from expired sessions
   16220: ETHREEOH-2839: Fixed potential ClassCastExceptions when Alfresco accessed via WebDAV and Web Client links in same browser
      - WebDAV side no longer directly casts session user to a WebDAVUser
      - ContextListener no longer casts session user to web client user
      - Web client side will 'promote' session user to a web client User if necessary via AuthenticationHelper
      - All authentication filters made to use appropriate AuthenticationHelper methods
   16211: ETHREEOH-2835: LDAP sync batches user and group deletions as well as creations
      - Also improved logging of sync failures
   16197: ETHREEOH-2782: LDAP subsystems now support search-based user DN resolution
      - When ldap.authentication.userNameFormat isn't set (now the default) converts a user ID to a DN by running ldap.synchronization.personQuery with an extra condition tacked on the end to find the user by ID
      - Structured directories and authentication by attributes not in the DN such as email address now supported
   16189: ALFCOM-3283: Prevent errors when user accepts an invite when not logged in
      - new isGuest attribute propagated to user object
      - header component (used by accept-invite page) needs to avoid calling prefs and site webscripts for guest user
      - Conditional stuff in header template changed to use user.isGuest


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16896 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-10-14 09:24:13 +00:00
Dave Ward
8fa726f7df Merged V3.2 to HEAD
15636: ETHREEOH-2626: LDAP sync will no longer delete and recreate colliding users and groups in zones that aren't even in the authentication chain.
      - Instead such users and groups will be 're-zoned' to the first zone where they were found
      - Avoids losing site memberships, etc. on upgrade or change of authentication chain
      - Will continue to recreate users and groups from lower priority zones in the authentication chain
      - Updated unit tests appropriately


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@15637 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-08-06 18:43:41 +00:00
Dave Ward
24f5a529c6 Merged V3.2 to HEAD
15473: ETHREEOH-2574: Fixed problem when LDAP sync attempts to delete a user who already exists but with username in a different case (e.g. guest -> Guest)
      - ACLs were getting left behind due to case issues
      - Now 'normalize' the name using getUserIdentifier()


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@15474 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-07-29 16:22:20 +00:00
Dave Ward
0d6a176f8d Merged V3.2 to HEAD
15388: ETHREEOH-1872: Better debug logging in authentication components
      - Now each authentication component logs every step of the authentication process (including reason for failure) if you switch on debug logging for that component or the entire org.alfresco.repo.security.authentication package. E.g.
      log4j.logger.org.alfresco.repo.security.authentication.ldap.LDAPAuthenticationComponentImpl=debug
      log4j.logger.org.alfresco.repo.security.authentication.AuthenticationComponentImpl=debug
      log4j.logger.org.alfresco.repo.security.authentication=debug
   15196: Further LDAP sync performance improvements
      - Bunch user and group creations into small transactions (except for differential sync on login)
      - Run a differential sync on startup (so that bulk of users are not brought over on first login)
      - Can be disabled by synchronization.syncOnStartup property
   15135: Node creation / ACL performance improvements
      - When an ACL was set on a leaf node such as a person, redundant 'shared' ACLs were created for child nodes with getInheritedAccessControlList(), even though no child nodes existed.
      - Now setInheritanceForChildren() makes a 'lazy' call to getInheritedAccessControlList(), only when it realises there are child nodes
   15133: Changes to datasource definition for improved performance
      - Enable caching and reuse of prepared statements (by default 40 for each connection)
      - Removed custom-connection-pool-context.xml.sample and instead introduced complete property set into repository.properties
      - Updated v3.2 Wiki docs http://wiki.alfresco.com/wiki/Database_Configuration#Overriding_the_Database_Connection_Properties


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@15439 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-07-28 10:12:16 +00:00
Dave Ward
a929a7fd74 Merged V3.2 to HEAD
15099: Do not allow referential integrity problems in user registry data (dangling references to users in groups) fail the whole sync operation. Just warn and continue.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@15100 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-07-08 09:59:43 +00:00
Andrew Hind
e3df62325d Extended zone support for multiple zones and added Authorities (including people) to zones. (MOB-762: Part 1)
WCM and Share groups are not in the default zones so they can be hidden in the UI.

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

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14588 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-06-08 16:16:32 +00:00