75 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
Jan Vonka	da8bdafbcc	Merged BRANCHES/DEV/CONV_HEAD to HEAD: ... 47880: Create branch for Cloud Convergence from the latest state of HEAD (Revision 47874) 47886: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 33052: (RECORD ONLY) Branch for Enterprise 4.0 service pack development 38002: (RECORD ONLY) Create branch for 4.1 Enterprise releases, based on 4.0.2 38003: (RECORD ONLY) Update version to 4.1.0 38079: (RECORD ONLY) Updated schema version to 5100 38536: (RECORD ONLY) Merged V4.1-BUG-FIX to V4.1 38219: ALF-14674: DOS voodoo to make start_deployment.bat work, as installed by Bitrock 38344: ALF-14674: Deployment installer still doesn't work - Use ${installdir.escape_backslashes} instead of ${installdir} 38471: ALF-14674: Deployment installer still doesn't work - Correction to use of ${installdir.escape_backslashes} 39519: (RECORD ONLY) Merged PATCHES/V4.0.2 to V4.1 38899: ALF-15005: Merged V4.0-BUG-FIX to PATCHES/V4.0.2 37920: ALF-13816: Permission Denied on web-client browsing if parent does not inherit permissions - FileFolderService getNamePath() now performs toFileInfo() as SystemUser. 38900: ALF-15005: Merged V4.1-BUG-FIX to PATCHES/V4.0.2 38549: ALF-11861: Maintain the same defuault root of WebDav for Alfresco 4.0 as was in pre-4.0 Removed overriding protocols.rootPath property from installer and enterprise overlay versions of alfresco-global.properties so that correct setting in repository.properties is used. 39494: ALF-15213 / ALF-15170: Can't change folder permissions in Private or Public-moderated sites - Fix by Dmitry V 44843: (RECORD ONLY) Created hotfix branch off V4.1 build 372 revision 44743 (candidate 4.1.2 release) 45708: (RECORD ONLY) Merged PATCHES/V4.1.2 to PATCHES/V4.1.3 45570: Merged V3.4-BUG-FIX to PATCHES/V4.1.2 43939: ALF-17197 / ALF-16917: Merged PATCHES/V3.4.11 to V3.4-BUG-FIX 43896: MNT-198: Activity feeds get not generated in private sites for added files if username in LDAP-AD contains uppercase letters - Now we can cope with a runAs where the username is in the wrong case 45714: (RECORD ONLY) Merged BRANCHES/DEV/V4.1-BUG-FIX to PATCHES/DEV/V4.1.3 45513: MNT-279: Use binary search in cached authority search to cut down search time when a group contains an astronomical number of authorities - Experimental fix to cut down on severe profiling hit 45715: (RECORD ONLY) Merged BRANCHES/DEV/V4.1-BUG-FIX to PATCHES/V4.1.3 44848: Fix for ALF-17178 SolrLuceneAnalyser.findAnalyser generating InavlidQNameExceptions wher they are easily protected. 46188: (RECORD ONLY) Merged BRANCHES/DEV/V4.1-BUG-FIX to PATCHES/V4.1.3 46014: Fix for ALF-17732 - SWF files are considered insecure content and should not be displayed directly in the browser. 46160: Fix for ALF-17759 - HTML files are stripped from metadata and style information after they are uploaded. 46165: Fix for ALF-17787 - Site Members 'All Members' link should not run query immediately 46169: Fix for ALF-17787 - Site Members 'All Members' link should not run query immediately - missing file 46186: Fix for ALF-17786 - Site dashboard page issues too many requests (Site Members dashlet issues avatar requests when it doesn't need too) 46242: (RECORD ONLY) Merged BRANCHES/DEV/V4.1-BUG-FIX to PATCHES/V4.1.3: 46184: Refactoring a test class to use JUnit Rules - as part of attempt to reproduce ALF-17797. 46192: Enhancement to JUnit Rule TemporaryNodes.java as required by fix for ALF-17797. 46194: Fix for ALF-17797. AddFailedThumbnailActionExecuter is failing. 46710: (RECORD ONLY) Create branch for Cloud Convergence from the latest state of 4.1.3 (RC5, Build 85, Revision 46648) 47908: Merged from DEV/CONV_V143 to DEV/CONV_HEAD 46788: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30323: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1: 30171: ALF-9613: caching content store. Various improvements and bug fixes. Including: 30325: THOR-114: S3 content store 30326: THOR-128: S3 content store 30333: THOR-139 F101: Get account for user e-mail id 30335: Merge from THOR0 to THOR1 r30274: THOR-135 is email address accepted by Alfresco? Part One. 30340: THOR-99: Thor module - enable tests 30341: Removing duplicate account-service-context.xml file. 30343: Merge THOR0 to THOR1 30339: Test email singup in Share complete 30338: New form runtime features: - Yellow background is displayed for mandatory fields without value - Red background dis displayed for fields with validation errors - Error message is displayed in a balloon when fields with error has focus - Using balloons is now the default method of displaying errors - Removed balloon code form create site menu since its now handled automatically - An alternative to balloons are "error containers" (div with clickable red text labels focusing the field): setErrorContainer(divEl) - Its possible to setMultipleErrors(true) to display all the forms/fields errors in the "error container"/ballon. - Its possible to turn of the balloons and error containers complete by setting setErrorContainer(null) - js validation handlers no longer needs to handle the messages OR the css classes for mandatory & invalid 30344: Missing value check caused js undefined error 30346: Minor css form fixes 30347: THOR-126: S3 content store - do not swallow exceptions 30348: THOR-66: disable unused services/features 30349: THOR-137 F88: Add existing external user (from another network) checkpoint 30350: THOR-135 Is email address accepted by Alfresco. 46789: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35594: Fix merge issue 47930: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 46762: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46768: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46769: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46778: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46780: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46786: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46791: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46792: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46808: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46809: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46819: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46829: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46839: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46842: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46844: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46846: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46847: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46876: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46877: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46878: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46879: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46880: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46881: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47947: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 46737: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 35288: Alfresco Cloud (from BRANCHES/V4.0) 35389: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30170: Thor branch based on Swift feature complete 30185: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: 28973: THOR-1: verify ability to create DB schema programatically on AWS RDS (for MySQL & Oracle) 28999: THOR-3: Tenant Routing Data Source (dynamic tenant-aware DB connection pools) 29022: THOR-1: verify ability to create DB schema programatically on AWS RDS (for MySQL & Oracle) 29031: THOR-1: verify ability to create DB schema programatically on AWS RDS (for MySQL & Oracle) 30186: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: (3 conflicts resolved) 29116: THOR-3: Tenant Routing Data Source (dynamic tenant-aware DB connection pools) 29174: THOR-24 Set up new Alfresco AMP module project. 29186: THOR-25 Copy and refactor Account Service from SambaJAM 29193: ImporterComponent - prep for THOR-7 29198: THOR-7: Tenant Service API - Create Tenant (using separate DB schema) 29204: THOR-29 Account Type Registry 29234: THOR-7: Tenant Service API - Create Tenant (using separate DB schema) 29246: THOR-7: Tenant Service API - Create Tenant (using separate DB schema) 29251: THOR-30 Added AccountDAO interface along with two implementations: AccountDAOImpl (not implemented) which will manage Account data in an RDB via iBatis. AccountDAO_InMemory which manages AccountInfo in simple HashMaps for testing purposes only. 29258: THOR-28 29259: Addendum to THOR-25. Moved account-service spring config into a subfolder. (trivial) 35393: (RECORD ONLY) Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: - fix up classpath (remove mybatis 1.0.0 -> 1.0.1 and chemistry 0.4.0 -> 0.6.0) 35411: (RECORD ONLY) Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/CLOUD1: 35409: Merged HEAD to BRANCHES/DEV/V4.0-BUG-FIX: 35399: ALF-12874: Schema reference files are out of date. 35452: (RECORD ONLY) Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/DEV/CLOUD1: 34219: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/V4.0-BUG-FIX: 32096: THOR-429: Fix "MT: Thumbnail + Preview are not updated (after uploading new version)" 32125: THOR-429: Fix "MT: Thumbnail + Preview are not updated (after uploading new version)" 34220: Minor: follow-on to r34219 (ALF-11563) 34747: ALF-13262: adding missing indexes for new schema's (activiti-schema create) + schema patch for existing schema 35417: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/V4.0-BUG-FIX: (THOR-6 / ALF-13755) 29356: THOR-6: MT is configured (but not enabled) by default - will be auto-enabled when first tenant is created 29455: THOR-6: build test/fix 29471: THOR-6: build test/fix 35423: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/V4.0-BUG-FIX: (THOR-4 / ALF-13756) 29500: THOR-4: Replace Tenant attributes with Tenant table (alf_tenant) 29501: THOR-4: Replace Tenant attributes with Tenant table (alf_tenant) 29503: THOR-4: Replace Tenant attributes with Tenant table (alf_tenant) 47949: Merged HEAD to BRANCHES/DEV/CONV_HEAD: 47914: Merge fix for org.alfresco.repo.cache.AbstractAsynchronouslyRefreshedCache<T> R 46078, 46079, 46121 47958: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 46746: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 35455: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30187: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: 29260: THOR: Initial Tenant Admin Service REST API - create, delete, get (list) web scripts 29356: THOR-6: MT is configured by default 29366: THOR-59: selectively disable certain test suites (for THOR dev build plan) 29377: THOR-59: selectively disable certain test suites (for THOR dev build plan) 29398: Refactoring of code to remove deprecation warnings. Replaced lots of object.field accesses with object.getField() calls.Trivial changes, but with so many warnings I can't see the wood for the trees. 29400: THOR-59: selectively disable certain test suites (for THOR dev build plan) 35456: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30188: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: 29442: THOR-59: selectively disable certain test suites (for THOR dev build plan) 29453: THOR-59: selectively disable certain test suites (for THOR dev build plan) 29455: THOR-76: track THOR build test failures and fix-up 29471: THOR-76: track THOR build test failures and fix-up 35459: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30189: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: 29473: Preliminary checkin for THOR-44. Created placeholder interface/impl/spring config for a new UserService. 29497: THOR-76: track THOR build test failures and fix-up ( LicenseComponentTest) 29500: THOR-4: Replace Tenant attributes with Tenant table (alf_tenant) 29501: THOR-4: Replace Tenant attributes with Tenant table (alf_tenant) 29503: THOR-4: Replace Tenant attributes with Tenant table (alf_tenant) 29511: THOR-59: selectively disable certain test suites (for THOR dev build plan) 29512: Adding a new JUnit4 test class with an @Ignore'd test in it - to see how Bamboo reports these. 29514: THOR: Initial Tenant Admin Service REST API - create, delete, list web scripts 29515: THOR-59: selectively disable certain test suites (for THOR dev build plan) 29521: THOR-79 - mark AVM sitestore as unindexed 35461: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30190: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: 29533: THOR-59: exclude certain N/A tests 29555: THOR-76: track THOR build test failures 29630: Added ant build targets for Cloud Module and a new executable for the Alfresco devenv. 29664: THOR-76: exclude system test suites 29667: THOR-64: add initial support for tenant routing data source 29676: THOR-76: exclude intermittent ActionTrackingServiceImplTest (pending ALF-9773 & ALF-9774) 29677: THOR-80: MT-aware S3 content store 29678: THOR-80: MT-aware S3 content store 29680: THOR-80: MT-aware S3 content store 29693: THOR-80: MT-aware S3 content store 29694: THOR-80: MT-aware S3 content store 47959: CONV_HEAD: CLOUD-1348 - comment back in MultiTDemoTest.testDeleteAllTenants 47967: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 46748: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 35464: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30195: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: 29774: Refactor Account DAO and Service. Boost Tests. Add appropriate headers. 29776: THOR-76: exclude intermittent ActionTrackingServiceImplTest (pending ALF-9773 & ALF-9774) 29795: Implemented MyBatis-backed Account DAO: 29817: Move (and rename) user service from repository to thor 30196: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: 29827: THOR-69: TenantAdminDAO 29832: THOR-78: fix tenantEntityCache (shared) 29834: THOR-111: experimental config option for S3 content store to support flat root (ie. all tenant files in single folder) 29856: THOR updates 29857: THOR-76: exclude build components/projects 46761: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 35478: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30198: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: 29869: THOR-92. BPMN2.0 workflow definition for account self-signup. 29871: THOR-93. REST API for self signup (and miscellaneous related items). 29882: THOR-102: Faster CreateTenant 29888: THOR-95. Placeholder email template for self-signup. 29889: Completion of THOR-95. Placeholder emails for self-signup. Added a 'you've already registered' template. 29896: THOR-89F100: Create User Foundation API… 29912: Fix issue where module believed it was still executed after delete tenant 29940: THOR-96. First cut of a signup email sender delegate. This will be refined later - probably both in this sprint and the next. 29966: Fixing InvitationServiceImplTest failing tests, which are failing because the email templates are not there. 29978: THOR-89: Switch tenant for person creation 29982: THOR-89: Fix multi-domain account creation test after review with Jan 29983: THOR-102: Faster CreateTenant 29985: THOR-90: F99 Is email address already registred foundation API 29991: THOR-99: Thor module build/packaging 29994: Changes for THOR-92, THOR-93 and THOR-96. 30199: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: 29995: THOR-93. Use the proper sspring config in the test case. 29996: THOR-99: Thor module build/packaging 29997: Consolidated DaveC's EmailAddressService and my EMailUtil into a single feature. 29998: Follow-on to previous check-in (29997). Deletion of now-unused folder. 30000: Blatant attempt to get svn r=30k. Removing some dead config. 30001: THOR-96. Ensure that we get a meaningful exception when attempting to activate an account with no pending workflow for that email. 30036: Resolve issues with tenant-independent user store - can now login via Share 30041: Package and auto deploy of license with Thor module 30048: Ensure that when a duplicate email prevents a workflow from creating an account, that the workflow still ends gracefully. 30049: Removing a dead class that I'd used to see how our Bamboo handles @Ignore(message=msg) @Test annotations. 30054: THOR-84 F82: List Accounts Foundation API 30067: THOR-87 List Accounts REST API. 30069: THOR-87. Completion of listAccounts REST API. Fixed the problems in the JUnit test case and tweaked the FTL slightly. 30071: Cosmetic changes as part of THOR-93. 30072: Oops. Broke a test case. Follow-on to previous (30071) check-in which cosmetically changed JSON as part of THOR-93. 30073: As part of THOR-93 (REST API signup) I have made the 2 webscripts usable without any authentication. 30074: Trivial fix to an error string. 30076: THOR-93. The account-activation.post webscript now includes the provided workflowInstanceId when identifying the ongoing workflow. 30077: Fix Email validator to allow for example domains 30202: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: 30140: Refactor of account signup workflow 30142: No longer require email address for activation step of sign-up 30143: Remove use of task query in account signup workflow 30146: thor-share project structure 30147: Buildfix (removed modules not used by THOR) 30151: Incorporate already registered use case into account signup workflow 30152: Finally resolve license loading in Eclipse based tests 30203: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: 30184: Build box fix as a result of not including certian components 30206: Fix blatant merge issues 47972: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 46766: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 35497: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/CLOUD1: 29723: THOR-31: MT-aware shared caches 29749: THOR-5: MT-aware immutable singletons 29762: THOR-31: MT-aware shared cache 46767: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 35507: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30237: Merged BRANCHES/DEV/THOR0 to BRANCHES/DEV/THOR1: 29532: THOR-79 - add ability to disable Lucene indexes (so that IndexInfo / IndexInfoBackup files are not created per store per tenant) 29723: THOR-31: MT-aware shared caches 29749: THOR-5: MT-aware immutable singletons 29762: THOR-31: MT-aware shared cache 47973: CONV_HEAD: CLOUD-1348 - comment back in MultiTDemoTest tests (testNonSharedGroupDeletion & testSharedGroupDeletion) 47975: CONV_HEAD: CLOUD-1348 - comment back in FeedNotifierTest.testFailedNotifications 47988: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 46775: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 35531: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30449: F66: add option to configure a common "contentRootContainerPath" 30564: THOR-156: prep - consolidate runAsSystemTenant/runAsPrimaryTenant 35532: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30777: THOR-201: temporarily comment-out MultiTDemoTest.testDeleteArchiveAndRestoreContent (pending fix for THOR-201) 48008: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 46844: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46895: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46903: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46907: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46922: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46974: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46991: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46992: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46994: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47107: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47265: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47267: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47272: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47277: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47284: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47286: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47289: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47292: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 48009: Merged DEV/CONV_V413 to DEV/CONV_HEAD 46801: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35602: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30513: Cloud Share module 30515: Fix issue with person replication between tenants. 30516: Slight mod to email validation web script response. 30518: Quick fix for workflow id generation in sign email 30534: THOR-163: Unable to get license file 30535: Fix Thor build process. 30536: Refine user's home site name and description 30539: THOR-96. When sending the signup email, execute the mail action asynchronously. 30542: Replace placeholder text in sign-up email 30543: Account Activation 46802: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35643: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30544: Account activation 30545: Account activation 30550: AMP build targets 30554: THOR-94. Cloud site invitation workflow. 30555: AMP build targets - added client side resources 48011: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 47056: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47087: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47228: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47271: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47297: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47299: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47300: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47301: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47304: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47328: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47330: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 47339: (RECORD ONLY) Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 48013: Merged DEV/CONV_V413 to DEV/CONV_HEAD (commiting the missing merge info for r48009) 46801: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35602: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30513: Cloud Share module 30515: Fix issue with person replication between tenants. 30516: Slight mod to email validation web script response. 30518: Quick fix for workflow id generation in sign email 30534: THOR-163: Unable to get license file 30535: Fix Thor build process. 30536: Refine user's home site name and description 30539: THOR-96. When sending the signup email, execute the mail action asynchronously. 30542: Replace placeholder text in sign-up email 30543: Account Activation 46802: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35643: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30544: Account activation 30545: Account activation 30550: AMP build targets 30554: THOR-94. Cloud site invitation workflow. 30555: AMP build targets - added client side resources 48015: Merged DEV/CONV_V413 to DEV/CONV_HEAD 46841: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35684: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30904: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1: 30270 ALF-9492 Can now update task properties through the Workflow JavaScript API. ALF-10087 Fixed failing Multi-tenancy tests. 30288 ALF-9492 Can now update task properties through the Workflow JavaScript API. 30309 Fixed failing MultiTDemoTest and re-enabled. 30356 ALF-10117: JBPM workflows should be hidden. 30358 Build fix, fallout from ALF-10117 (JBPM workflows should be hidden) 30415 Added parseRootElement() method to Activiti's BPMNParseListener. 30452 ALF-10276: Reject flow didn't set bpm_assignee property properly 30563 Added tests to ensure multi-tenancy works and fixed several multi-tenancy issues in workflow. 30698 ALF-9541: Fixed HistoricTaskEntity update when TaskEntity is loaded from DB 30699 ALF-10084, ALF-10242. Fixed issues and added WorkflowService methods to get workflow instances without filtering by definition id. 30750 ALF-10197, Added the ability to auto-complete Start Tasks in Activiti. If a start task extends the bpm:activitiStartTask type or implements the bpm:endAutomatically aspect then the task will be ended as soon as the workflow instance is started. 30796 ALF-10374 Fixed failing MultiTDemoTest 30908: Add logging for failed email domain lookups: 30922: Rolling back .classpath changes to Data Model. 30930: Basic version of site invite working 30931: THOR-172: Switch Tenant via public API 30936: Allow for repo web scripts to switch to user's default tenant via -default- tenant id: 30937: Implementation of THOR-214. There is now a new repo webscript to retrieve signup status for a given {id, key} pair. 30938: Allow dev email address to be specified in properties file: 30945: THOR-221: Add (EntityLookup) cache to AccountDAO 30946: Build fix. Renaming a test infrastructure class so that it doesn't get picked up by the ant test targets. 30955: THOR-222. Added inviter first and last name to invitation-status.get webscript. 46843: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35694: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30997: Firefox scrollbars removed on "invitation" and "signup" pages (now using new helper method Alfresco.util.createYUIOverlay) 31001: Impl of THOR-223. Webscripts for getting pending invitations. 31002: Invite - redirect bug fixed, removed old code matching previous webscript api, email picker style fixes 31003: Addendum for THOR-223. I've added an explicit test to record the fact that pending-invitations.get to a non-existent site returns 200 and an empty collection rather than a 404. 31004: Adding REST-client .rcq files as part of THOR-223 46848: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35700: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 31014: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1: 30999: ALF-9957 - MT: test and fix subscriptions (followers) 31020: Update invite email template to bring in line with wireframe and text 31021: Apply latest sanitized email blacklist: 31030: Fixed THOR-226 "DocLib "Detailed View" (default) does not list items - note: "Simple View" seems to be OK" 31033: THOR-228: Update aws sample file with quota config for cachingcontentstore 31036: Fixed THOR-236 "Webscript URL clash in signup" 31037: THOR-175: set and enforce per-tenant quota 31043: Fixed THOR-174 "F27: User can switch between networks they belong to" 46854: Merged from BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413 35725: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 31124: Fix for THOR-145. This check-in makes the Cloud Signup and Invitation workflows hidden within Share - users can't initiate them via "Start workflow..." 48016: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 46793: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46795: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46796: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 48030: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 46820: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 35657: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30556: THOR-135F103: Is e-mail address accepted by Alfresco? 30562: Fixing a typo in the email-validation FTL. It was returning invalid JSON - no opening " on a string. 30569: THOR-156: switch to secondary tenant (initially via @@login) 30571: THOR-99: Thor build 48037: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/CONV_HEAD: 46821: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 35659: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30586: THOR-166. I've added an additional check at the start of the signup workflow that checks if the email is blocked. 30587: THOR-163: S3ContentReader fails to getObjectDetails 30592: THOR-156: switch to secondary tenant (initially via @@login) 35660: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30607: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1: 30208: Remaining commits for ALF-9510 30218: Fix build - add missing files 30254: Encryption related documentation, source code comments 30392: Fix for ALF-10205 30405: Fix for ALF-10189 30406: Fix for ALF-10189: part 2 - minor update 30613: THOR-148. The cloud test target was accidentally excluding *RestTest.java. 30613: THOR-148. The cloud test target was accidentally excluding *RestTest.java. 30614: Revert some of the additional email checks in registration process 30615: Set ignore patterns for build dir in thor module 30619: Merged HEAD to BRANCHES/DEV/THOR1: 30618: Additional test classes that allow for easier testing of Notifications (emails mostly). 30622: Ensure use of System user, not system user 30624: Removed deep merge info 30625: Switch off creation of missing people, use Admin instead of System 46824: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 46828: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: 48038: Merged DEV/CONV_V413 to DEV/CONV_HEAD (ui-only) 46830: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30737: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1: 30736: ALF-6706 - MT: activities not generated (for tenants) 30738: Site invite (rough version, not finished) 30741: THOR-175: Set and enforce file space quota for tenant 30752: Site invite - added som padding to user suggestion list 30753: Disabling 2 tests while I fix them. 30758: THOR-172 F63: Switch Tenant via public REST API: 30764: Tweak to Activiti integration code to prevent it from trying to create person nodes for the System user. 30766: Implementation of THOR-196. Inviting multiple email addresses in a single call. 30769: Re-enable MultiTDemoTest 30775: Site invite 30776: THOR-172: Switch Tenant via public API 30785: Add tenant id to account info returned in Thor responses 48043: Merged DEV/CONV_V413 to DEV/CONV_HEAD 46831: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30813: Add Eclipse project for Thor-Share module: 30815: THOR-175: Set and enforce file space quota for tenant 30817: Switch network skeleton code and minor fixes 30818: Update Share Node Browser (at least for THOR) to allow option to retrieve "storeroot" via DB query 30826: Add distribute-solr to Thor builds 48045: Merged BRANCHES/DEV/CLOUD2 to BRANCHES/DEV/CONV_V413: Merged BRANCHES/DEV/THOR1 to BRANCHES/DEV/CLOUD1: 30737: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/THOR1: 30736: ALF-6706 - MT: activities not generated (for tenants) 30738: Site invite (rough version, not finished) 30741: THOR-175: Set and enforce file space quota for tenant 30752: Site invite - added som padding to user suggestion list 30753: Disabling 2 tests while I fix them. 30758: THOR-172 F63: Switch Tenant via public REST API: 30764: Tweak to Activiti integration code to prevent it from trying to create person nodes for the System user. 30766: Implementation of THOR-196. Inviting multiple email addresses in a single call. 30769: Re-enable MultiTDemoTest 30775: Site invite 30776: THOR-172: Switch Tenant via public API 30785: Add tenant id to account info returned in Thor responses git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@48251 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2013-03-18 09:23:29 +00:00
Kevin Roast	633aa15100	Merge of BRANCHES/DEV/4.2_ENT_DEV/ADMIN_CONSOLE2 - Admin Console 46677:46774 ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@46784 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2013-02-19 14:08:32 +00:00
Gethin James	a6f0a3b423	Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD: ... 46292: Fix for ALF-17783: Checks and creates the backup directory when needed. 46295: Added some more tests related to ALF-17783 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@46765 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2013-02-19 10:18:01 +00:00
Kevin Roast	a625d87120	Merge of BRANCHES/DEV/4.2_ENT_DEV/ADMIN_CONSOLE - Admin Console 46247-46672 ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@46677 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2013-02-15 11:44:53 +00:00
Dave Ward	b794365eaa	Merged V4.1-BUG-FIX to HEAD ... 42933: ALF-15328 could we add a sample log4j file in 'extension'? 42935: ALF-16455: Merged V3.4-BUG-FIX (3.4.12) to V4.1-BUG-FIX (4.1.2) 42934: ALF-16454 TransformerDebug id values have gaps 42955: ALF-15328 could we add a sample log4j file in 'extension'? - missing j in file name 42982: Merged DEV to V4.1-BUG-FIX 42873: ALF-16194: Checkout/Checkin leaves Lockable aspect on which disables autoVersionOnUpdateProps DoNothingCopyBehaviourCallback policy has been set for lockable aspect (implemented in LockServiceImpl); Unit test has been added. 43000: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_10_19 to BRANCHES/DEV/V4.1-BUG-FIX: 42936: ALF-11573: It's impossible to Modify settings for document versions 43010: ALF-16006 MT: Document Library is absent after upgrade from 3.4.x to 4.1.x (eg. 3.4.10 -> 4.1.1) - applied patch suggested in JIRA 43017: ALF-16457: "CmisObjectNotFoundException: No corresponding type found! Not a CMIS object?" thrown by AlfrescoCmisServiceImpl.getChildren - Check CMISNodeInfo for invalid type before processing. 43019: ALF-14353: Upgrade Activiti dependencies in Maven build 43022: ALF-14353: Upgrade Activiti dependencies in Maven build 43027: Merged DEV to V4.1-BUG-FIX 42426: ALF-15577: " does not support the method HEAD " when opening a MS Access file with "View In Browser" 43029: Merged DEV to 4.1-BUG-FIX (4.1.2) 42988: ALF-15791: Custom Types,Aspects defined with prefix using underscore cannot be loaded by API calls like api/classes/<type or aspect> Identical logic for old and new ClassDef API was moved to abstract super classes 42924: ALF-15791: Custom Types,Aspects defined with prefix using underscore cannot be loaded by API calls like api/classes/<type or aspect> New set of URL templates for class defenitions were provided to support requests with separated namespace prefixes and names 43031: ALF-16489: Typo in column-name of newly created index 43041: Merged DEV to 4.1-BUG-FIX (4.1.2) 43040: ALF-16425: API call to return all classes, returns wrong properties in classes Propertydefs and assocdefs are reordered to corelate with classdefs. Unit test was added for issue. 43052: ALF-16194: Checkout/Checkin leaves Lockable aspect on which disables autoVersionOnUpdateProps - Fix failing test 43055: Probable fix for ALF-15813. Replaced the 'skipCount' with the one in the query request, rather than query result. The Lucene query result does not support the reporting of the skipCount. 43065: Merged V3.4-BUG-FIX to V4.1-BUG-FIX 42958: ALF-14421: Inconsistencies when applying Versionable Aspect - We think the most preferable fix that will result in the best consistency between Share and old Explorer behaviour is to make the adding of the versionable aspect always result in an initial MAJOR version, if a version type has not been specified. Major/minor versions can still be controlled explicitly by checkout/checkin the versionable aspect properties and the version service API. 42998: ALF-14421: Fixed version label unit test fallout - back to what it used to be. 42999: Fix for ALF-16261 - IE script error occurs when email space users providing there are no users in this space 43006: Removed dependency on Apache Commons StringUtils. See ALF-12541, ALF-14254, AMZNSSS-17 43028: ALF-14722: Merged V4.1-BUG-FIX to V3.4-BUG-FIX 42902: Merged DEV to V4.1-BUG-FIX 42519: ALF-13588: Google Doc failed to authenticate after incorrect password being entered for google account Add ability to unregister class behaviours. Unregister googledocs behaviours when subsystem stops. 43066: ALF-16502: Merged PATCHES/V4.0.2 to V4.1-BUG-FIX 42969: Merged DEV to PATCHES/V4.0.2 42967: MNT-158: SharePoint Protocol Opening Documents in Read-Only for Site Consumer with Collaborator Privileges Remove manual throwing of AccessDeniedException is user has "consumer" or "contributor" role. Create "links" container from system user. 43067: Merged PATCHES/V4.1.1 to V4.1-BUG-FIX 42470: ALF-16503 / ALF-16256: Upgrade 3.4.6 HF to 4.1.1 - DuplicateChildNodeNameException: Duplicate child name not allowed: surf-config 42591: ALF-16504 / ALF-16332: Fixed synchronization around org.alfresco.repo.dictionary.NamespaceDAOImpl.namespaceRegistryCache - There was no 'double checking' after releasing the write lock, meaning that under high concurrency lots of threads would queue up to continuously re-initialize the registry. 42705: ALF-16504/ ALF-16332, ALF-16377: Revisited synchronization and initialization of mutually-dependent DictionaryDAO and NamespaceDAO to prevent deadlock and simultaneous re-initialization in more than one thread 43068: Merged DEV to V4.1-BUG-FIX - TODO: Update DB2 DDL in activiti 42388: ALF-15828: DB2: unexpected index found in database. Modify activity create script for db2 to create normal name for ACT_HI_PROCINST.PROC_INST_ID_ index. Introduce patch that will rename autogenerated name to normal name for ACT_HI_PROCINST.PROC_INST_ID_ index. Update schema reference file for DB2. 42429: ALF-15828: DB2: unexpected index found in database. Fix scripts from ALF-14983 and ALF-16038 to drop/recreate tables in DB2. 43069: ALF-11214: IMAP subsystem is not successfully restarted after incorrect modification of IMAP properties via Admin Console Stopped ChildApplicationContextFactory from caching a stale application context that didn't successfully refresh. 43071: ALF-13660: When using kerberos SSO, non domain explorer users requesting a download URL get a login page but after login do not get the requested document - Now the Web Client authentication filters use the same mechanism for preserving the request URL through a redirect to the login page 43076: ALF-15828: Fixed merge issue 43079: ALF-13602: Incorrect number of documents displayed in Share DocLib when a file is checked out - added ability for FileFolderService.list (-> FileFolder GetChildren CQ) to filter by one or more aspects, eg. cm:checkedOut 43080: ALF-14421: More version label unit test fallout 43092: Fix ALF-16460: Users may receive activity feed entries (from people they follow) for moderated sites to which they do not belong - also add unit test 43093: Fix for ALF-16091 - Unable to inline edit javascript file. 43096: Fix for ALF-16283 - When document is checked out, 'Edit Online' and 'Upload New Version' options should not be visible on the original document. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@43103 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2012-10-25 16:38:22 +00:00
Gethin James	4b4b1f72a7	Added a test case and fix for ALF-16060, now creates the module directory if it doesn't exist ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@43102 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2012-10-25 16:12:28 +00:00
Gethin James	06b7b23148	Can now read a MANIFEST from the file system. e.g. from an exploded share.war using inputstream ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@42834 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2012-10-19 08:54:04 +00:00
Gethin James	dfd8344895	Can now read a MANIFEST from the file system. e.g. from an exploded share.war ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@42833 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2012-10-19 08:53:58 +00:00
Gethin James	aaa1357100	Fix backup deletion issue identified by RM-516 ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@42788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2012-10-18 09:35:15 +00:00
Gethin James	c22d28e6e1	Improved the testing around editions/versions for MMT checking. ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@42787 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2012-10-18 09:35:12 +00:00
Gethin James	5c6e93521c	Removed dependency on commons StringUtils and cleaned up the warning message ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@42716 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2012-10-17 11:47:02 +00:00
Gethin James	a6fb91693a	Following ALF-14738, adding functionality to use the manifest to check the versions / editions ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@42689 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2012-10-16 15:18:28 +00:00
Gethin James	10e6541ff0	Fix merge conflict for ALF-14247 ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@39850 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2012-07-27 09:49:40 +00:00
Samuel Langlois	59236895ae	Follow-up on previous merge to fix compilation ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@39837 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2012-07-26 21:16:52 +00:00
Samuel Langlois	68b4af4b11	Merged V3.4-BUG-FIX to HEAD ... 39015: Upgrade of truezip to 7.5.5 see ALF-14247 39361: Added truezip-swing jar. It seems that Truezip needs Swing :( git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@39832 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2012-07-26 16:41:46 +00:00
Dave Ward	913fd94807	Merged V4.0-BUG-FIX to HEAD ... 37623: ALF-14183: Additional NP check for transition-id when building model 37626: ALF-13888: Merged V3.4-BUG-FIX to V4.0-BUG-FIX (missed merge) 33425: Merged DEV to V3.4-BUG-FIX 33359: ALF-12071: Windows 7 cannot open files stored on Alfresco mounted as a webdav network drive if the filename contains + (plus) character For Windows 7 we SHOULD decode the file name gotten from GET request taking into account that "+" is not encoded as "%2B" for GET request. 37630: Process queued responses at the end of the thread request run, before re-enabling socket read events. ALF-14179, ALF-14180. 37636: REVERSE Merge to V4.0-BUG-FIX (4.0.3) << Now that ALF-13933 allows startup of OpenOffice/LibreOffice and JOD transformers from Java (even on Mac), this hack is no longer required. >> << The hack started up OpenOffice from the cmd line so OpenOffice transformer would be working but not JOD. >> << The bitrock alfresco.sh and openoffice.xml fiels are now identical between V3.4-BUG-FIX and V4.0-BUG-FIX >> 32952: ALF-7944: OSX OOo started by script not by subsystem now 37647: RECORD ONLY Merge V4.0 (4.0.2) to V4.0-BUG-FIX (4.0.3) 37646: Merge to V4.0-BUG-FIX (4.0.3) to V4.0 (4.0.2) 37636: REVERSE Merge to V4.0-BUG-FIX (4.0.3) << Now that ALF-13933 allows startup of OpenOffice/LibreOffice and JOD transformers from Java (even on Mac), this hack is no longer required. >> << The hack started up OpenOffice from the cmd line so OpenOffice transformer would be working but not JOD. >> << The bitrock alfresco.sh and openoffice.xml fiels are now identical between V3.4-BUG-FIX and V4.0-BUG-FIX >> 32952: ALF-7944: OSX OOo started by script not by subsystem now 37657: Websphere libraries.xml has regressed due to ALF-12477 37667: ALF-14307: Upgraded Activiti lib, preventing diagram-generation on process-definition query when initial deploy-time generation failed 37676: Fix for ALF-14489 - Link with special charaters (i.e. &) in Site Activities doesn't work properly Note: 4.0 fix is different to 3.4 fix as wiki webscripts have all been converted to Java backed webscripts) Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX 37673: *Record only* Fix for ALF-14489 - Link with special charaters (i.e. &) in Site Activities doesn't work properly 37708: Increase version to 4.0.4 (4.0.3 being now dedicated to Cloud Sync) 37722: RECORD ONLY Merge V4.0 (4.0.2) to V4.0-BUG-FIX (4.0.3) 37679: ALF-14469: Reversed the reverse merge 37656, therefore reinstating ALF-13013 as it was actually a QA configuration problem! 37664: ALF-14053: Merged V4.0-BUG-FIX (4.0.3) to V4.0 (4.0.2) Missing commits that removed $DYLD_LIBRARY_PATH from the environment. Had thought they were already in V4.0. 37353: Merged V3.4-BUG-FIX (3.4.10) to V4.0-BUG-FIX (4.0.3) 37352: ALF-13452, ALF-13933 Alfresco needs to be able to support LibreOffice for transformations - Build test failure 37326: ALF-13933 Alfresco needs to be able to support LibreOffice for transformations ALF-13452 Open office startup from Java not working on OSX - Added code to start LibreOffice 3.5 on Mac (requires different options to the command and ure-link is a directory rather than a file on mac) - Removes $DYLD_LIBRARY_PATH from the environment when starting either openoffice or libreoffice on mac so does not need to rely on the installer moving the soffice.bin process to .soffice.bin and then creating a soffice.bin shell script that removed $DYLD_LIBRARY_PATH - Indent TransformerDebug a bit more now we have fail over transformers at the top and lower levels (saves N.N.N.N.N.N getting mixed up with text) 37656: Reverse merged 34391 and fix to ALF-13013 because it causes regression ALF-14469 on Websphere 37746: Merged V3.4-BUG-FIX to V4.0-BUG-FIX (RECORD ONLY) 37742: ALF-12486: Share - Calendar does not save past events - Fix reviewed by David We 37743: ALF-14340: Merged HEAD to V3.4-BUG-FIX 35582: ALF-8601: Alfresco installs different ImageMagick versions on different stacks - Now 6.5.6 is installed on all platforms 37748: Merged V3.4-BUG-FIX to V4.0-BUG-FIX 37655: ALF-14465: Bitrock installer: Advanced installation (apply AMP) finishes with error - added -force option to installer bundles - added warning (regardless of verbose flag) when files will be overwritten - added -help option (requested by product management) - removed replicated png from RM - reorganised code to differentiate between an install failure and command line parse failure. 37658: ALF-13063: Trailing spaces after the DB2 JDBC class name, causing me hours of puzzlement - Improved the URL so you get error messages out of the database 37663: ALF-13499: Share - Permissions page in the repository shows the groupid instead of displayname 37666: Fixed ALF-10790: DMDeploymentTargetTest consistently failing on SQL Server - Text match for 'fk_alf_cass_' in error message, which covers all FK violations but excludes the unique constraint - This is also a refix for ALF-10581, which should probably be retested 37697: ALF-11911 - Share: unable to externalise the raw role name 37712: Improvements to Forms runtime to handle empty json response when AccessDeniedException is thrown from the repository. Noticed during ALF-9861 investigation. 37744: ALF-14340: Patch from Bitrock to include Ghostscript with Windows-installed ImageMagick (already included with Unix versions) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@37750 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2012-06-13 19:48:38 +00:00
Derek Hulley	b76d38a7a7	Changed from time-based module and component names to GUID-based names. Not likely to affect anything. ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34673 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2012-03-21 18:48:48 +00:00
Dave Ward	31872bfce7	ALF-12898: Fixed up merge ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34056 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2012-02-19 11:19:12 +00:00
Dave Ward	6f7095f450	Merged V4.0-BUG-FIX to HEAD ... 33935: ALF-12854: SOLR - requires more detailed tracking information - Part 1: info reported for the SOLR SUMMARY action 33936: ALF-11693: Treat logging.properties the same way as log4j.properties and excluded it from the core .jar 33945: ALF-12867: RIP jmx-dumper.jar 33946: Fix minor issue introduced in r33920 33947: IT-6847 "Error displays on recent 4.0 TS upgrade while navigate to a document details page" - errors spotted on folder details & in document library list also resolved by this fix 33951: ALF-12867: Fixed typo 33955: Some unit tests and examples on how to implement file wiping or shredding - One API change: On EagerContentStoreCleaner, the following is now protected: protected boolean deleteFromStore(String contentUrl, ContentStore store) - Examples in unit test ContentStoreCleanerTest: testForcedImmediateShredding and testShreddingCleanup 33962: RIP hyperic plugin 33965: ALF-12697: Asynchronously get RSS items for dashlets on page load 33969: Fix for ALF-12307 Solr backup fills the disk - number to Keep can be set by property/subsystem/Share admin - set default backup localtion 33970: Fix for ALF-12854 SOLR - requires more detailed tracking information Part 2: basic stats added to JMX and improved statistical moment calculation 33984: Update 4.0.1 installers to use Tomcat 6.0.35 - Remembered to set useHttpOnly on <Context> - Also commented out JreMemoryLeakPreventionListener 33988: ALF-12717 CIFS: Unfriendly message occurs when a user with consumer/contributor role tries to rename space. 33997: ALF-12697: Remove async WebScript from dashlet family 33999: Fix for ALF-12854 SOLR - requires more detailed tracking information - Final part - Expose via share admin 34005: Fix for ALF-12708 34007: Merged V3.4-BUG-FIX (3.4.9) to 3.4-BUG-FIX (4.0.1) 34006: Merged V3.4 (3.4.8) to V3.4-BUG-FIX (3.4.9) 34002: ALF-12898: MMT does not calculate the current version number correctly and does not report errors - ModuleManagementTool was constructing the wrong current war file version number. The minor and revision values were the wrong way around. 3.4.8 became 3.8.4 - Modified unit test to use the actual version number in the test war 4.1.0 rather than 4.0.1 - Modified the ModuleManagementTool so that problems would be reported to the user even if they did not have -verbose set 34016: Update version.revision for 4.0.1 34022: Merged V3.4-BUG-FIX to V4.0-BUG-FIX 33952: ALF-5680: It is possible to cut/paste a locked file 34003: Merged DEV to V3.4-BUG-FIX 34001: ALF-12709: CLONE - Run action Wizard. Can't run action. Fixed regression connected with separator of AVM path in .NodeRef. id that has been changed from .;. to .|. 34023: Merged V3.4-BUG-FIX to V4.0-BUG-FIX (RECORD ONLY) 33912: ALF-9899: Merged HEAD to V3.4-BUG-FIX (PARTIAL) 31912: Merged DEV to HEAD 31823: TransactionalCache provides REPEATABLE READ - Values found in shared cache are placed into transactional cache - Previously, values could keep changing until first write (READ COMMITTED) but now the first read sets the value until it is changed by the current transaction 33981: Updated version.revision for 3.4.9 33985: ALF-12364: Merged V4.0-BUG-FIX to V3.4-BUG-FIX 33984: Update 3.4.9 installers to use Tomcat 6.0.35 - Remembered to set useHttpOnly on <Context> - Also commented out JreMemoryLeakPreventionListener git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34024 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2012-02-18 12:12:01 +00:00
Gethin James	4f1d0adc4d	FIXED : ALF-12777: MMT should not install AMPs which override pre-existing files in the war file, unless -force is provided ... The MMT is moving toward more of a validation phase (checks things, calculate changes) then an execution phase (makes the changes). git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@33880 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2012-02-14 10:50:04 +00:00
Gethin James	c3b86192d6	Better fix for ALF-12541 - AMP files need to be able to be pinned to specific "edition(s)" of Alfresco ... Share doesn't have a version.properties file so I need to cater for that scenario. I didn't want to create the LogOutput interface but its a stop-gap until the MMT gets re-worked. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@33793 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2012-02-09 10:56:44 +00:00
Gethin James	2973bda755	FIXED : ALF-12540: AMP - file-mapping.properties: white space at end of line is significant ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@33781 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2012-02-08 16:17:49 +00:00
Gethin James	1e8c35affa	Removed superseded changes brought in by the merge. ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@33777 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2012-02-08 16:05:05 +00:00
Dave Ward	811519ae48	Merged V4.0-BUG-FIX to HEAD ... 33116: Allow multiple deferred requests per oplock break, next level of fix for ALF-11935. 33136: Fix for ALF-12200: "Content type is not recognized on creating document from source" 33137: Activities feed generator: change info log messages to debug log messages 33139: ALF-12262 View in Source Repository works incorrect if the folder was created on target side at first 33141: Fix for ALF-12178 "Bulk import - status page shows broken link (Initiate another in-place import)" 33144: Fixes ALF-11119: The 2 tranformations didn't work - Segmentation fault in ffmpeg - it looks like a bug with ffmpeg and it was decided that compile/bug fixing ffmpeg is not a priority at the moment. The 2 entries have been commented out. If they are required, the user should consult the ffmpeg documentation for the correct version & o/s at the time. 33146: ALF-11345 Patch from Pavel Yurkevich to fix another VTI/SPP problem with site names that start with Alfresco 33147: FTP implemented set modification date/time command (MFMT). ALF-12105. 33148: ALF-12063 Pull some of the VTI list type definitions out to a common base class 33150: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX: 33076: ALF-12285: Allow dumping of schema to XML via JMX 33151: Fix problems with FTP and UTF-8. JLAN-81. When using the Java6 Normalizer use the NFC form. 33158: Fix NFS server swallows exceptions. ALF-11667. Startup exception details are now saved. 33160: Improve the Vti/SPP exception message for the case of the Vti port being already in use 33161: ALF-12063 Additional SPP/Vti list info required for Mac Office 2011 support 33162: Fixes: ALF-10322: Edit Dialogue gets out of sync if event moved using FullCalendar (extends FullCalendar to provide a callback after an event changes, which enables us to keep our event object up to date). 33163: Fixes: ALF-10248: Grey Placeholder image for unauthorised channels has now been replaced with yellow one. 33164: Fixes: ALF-11562; Refactors My Calendar dashlet to use timezone aware ISO8601 dates from updated Calendar API & removes obsolete properties from userevents calendar API 33165: Fixes: ALF-10645; i18n label doesn't appear in property bundle. 33167: Fix for ALF-11970 33168: Fix for ALF-10565 "Category manager in admin console needs query not search" - i18n'd the strings 33178: Publishing: Fixes: ALF-11552; Inline edit icon alignment issue fixed 33183: Minor fix to exception string in extendBuffer(). 33194: ALF-10545: NodeServicePolicies#onUpdateNodePolicy not adequate for NodeService#setType * Added beforeSetNodeType and onSetNodeType policies * Both callbacks have old and new types as parameters 33204: Fixes: ALF-11230, publishing tracking link opens in repository, not Doc Lib. Also fixes a couple of other minor bugs: - balloon pop up didn't appear when published from Doc Details page - tracking link appears black (on black) when hovered over. - adds defensive code to prevent an error if the expected element for the notification balloon isn't there. 33212: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX: 33211: ALF-12384: Failed schema dump can cause failure of repository start up 33217: Merged V3.4-BUG-FIX to V4.0-BUG-FIX 31840: Fix for ALF-10282 - Web Browser freezes with large xml files Web form transformation 31987: Proper fix for ALF-11489: 'patch.sitesSpacePermissions' failed on upgrade 2.2.8 -> 3.4.6 - Just handle missing defined ACLs 32341: Fix for ALF-9883 - WCM Forms: Changing 'abstract' type carries previously-added elements 32911: Add a (currently disabled) unit test for ALF-10466 - The HTML to Text transformer (not Tika based) should take account of the content encoding 32912: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2011_10_13 to BRANCHES/DEV/V3.4-BUG-FIX with changes + unit testing: 31742: ALF-10466 - The HTML to Text converter needs to take account of the Encoding set on the Content Property, to be able to correctly index MBCS text in wiki pages (and others) 32946: ALF-12161: Merged PATCHES/V3.4.5 to V3.4-BUG-FIX 32921: Merged DEV/TEMPORARY to PATCHES/V3.4.5 32913: ALF-11440: Content Manager unable to edit content from another user sandbox In order to allow a Content Manager to edit a locked document in other user's sandbox, it is needed to modify the AVMLockingAwareService.grabLock(). The 'lockState' variable could be set to 'LOCK_OWNER', if a user is ContentManager to bypass the check. 32964: Fixes ALF-11054: Sharepoint - Wrong sorting by date - incorporated patch from investigation team 32967: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2011_10_13 to BRANCHES/DEV/V3.4-BUG-FIX: 31828: Fixes ALF-10720: Webform performance improvement Minimize database usage by adding new variable to FormWrapper that holds a form's name. 32969: Fixes ALF-10471: Cannot correctly remove users from email notification rule list 32980: Merged DEV/TEMPORARY to V3.4-BUG-FIX 32961: ALF-12132: Set "common-placeholder-configurer" as parent for "lotusWSPlaceholderConfigurer" bean. 32996: ALF-12184: SchemaBootstrap must use same assumptions as PatchServiceImpl when deciding whether an alternative patch succeeded - Fixes regression introduced by r31972 / ALF-11489 33068: Added suggested fix to commit any current transactions in the NFS file expiry thread. ALF-11827. 33077: ALF-10142: Allow TinyMCE to accept <meta> element when editing HTML files inline in Share. 33094: Fix for ACT #15024-37148 (no JIRA yet) - issue where in a load balanced Share environment (multiple web-tiers behind a reverse proxy) the modification to the template layout selection for a site or user dashboard would not be reflected in all servers. 33118: ALF-12278: Prevent the copying over of headers specific to a POST request on to the touch GET request 33138: Upgraded SpringSurf to 1.0.0 rev 968 33140: Added missing json-simple jar to 3rd party eclipse classpath, which bizarrely is used to generate the JUnit cmd line unit test classpath, no really. 33145: Fix for native FTP timestamps returned in GMT timezone format. ALF-11986. 33175: ALF-12366: Cope with read committed DB behaviour in AbstractReindexComponent.reindexTransaction() 33179: ALF-12344 CLONE - Copyright notice shows Alfresco Software, Inc. © 2005-2011 All rights reserved.... should now be to 2012 as that is when we will release 3.4.7 - Being done in 3.4.8 not 3.4.7 33190: Latest SpringSurf libs: - much improved handling of multiple connections and connection reuse in RemoteClient - improves connection reuse generally, but also much more stable under load balancing condition with multiple Share web-tiers behind a reverse proxy 33193: ALF-12344 CLONE - Copyright notice shows Alfresco Software, Inc. © 2005-2011 All rights reserved.... should now be to 2012 as that is when we will release 3.4.7 - Found a few more having followed previous date changes and searches 33203: Fix for HttpClient issue: Error status 500 Unbuffered entity enclosing request can not be repeated. 33206: Fix to FormUIGet - no need to manually patch up the JSON request since rev 33138 (SpringSurf 1.0.0) 33218: Fix for ALF-11868 "CMIS: removeAcl() function doesn't work via atompub." 33220: Merged PATCHES/V3.4.6 to V4.0-BUG-FIX 32405: Merged V3.4.6 (3.4.6.1) to V3.4.1 (3.4.1.24) 32404: ALF-11727 CLONE - Pending Invite Search doesn't return anything if there's more than 1000 pending invites across all sites. Removed read only transaction from invites.get.desc.xml as it broke InviteServiceTest testRejectInvite 32397: ALF-11727 CLONE - Pending Invite Search doesn't return anything if there's more than 1000 pending invites across all sites. Return first 200 invitations (similar to 4.0 paging) Transaction used by the invites.get is now read only so does not force a flush of caches. 32503: Merged PATCHES/V3.4.6 to PATCHES/V3.4.1 32501: ALF-11727: Reinstated read-only transaction around invites.get and prevented it from trying to lazily create persons from rejected invites that had previously been deleted by InviteHelper.cleanUpStaleInviteeResources! 32650: ALF-11872: When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete Put back in cut off at 200 invites (removed in last merge) for UI, unless we know that we need all of them internally 32775: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete Even more changes: - reduce number of queries required to list pending invites to a site (uses moderated and nominated caches and only looks up IDs if possible) - change hibernate cache and flush modes (to avoid cache and the related slow flush), for queries and cancel of workflows - modified js which was making a query for each person in order to work out if they were already in a pending invites list 32838: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete - JBPMEngine now supports batch cancelWorkflows() method for canceling multiple workflows at the same time (e.g. on deleting a site) - Manual flushes only used at two points in the batch to minimize dirty checking overhead and yet avoid FK errors - Performance implications still to be checked but at least functionally correct - Corrected JPDL source jar 32857: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete - Search for Pending invites was slow on sites with > 0 pending invites (it was getting invites for all sites) 32861: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete - JBPMEngine uses an abstract list to 'lazily' convert hibernate objects on demand and avoid batch loading too many objects 32868: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete - Rationalization of batch fetching at hibernate layer 32881: ALF-11872: The saga goes on! Corrected empty list handling in InvitationServiceImpl.searchInvitation(). 32927: ALF-11872: Fix parameter validation in InvitationServiceImpl.getInvitationTasks() 32936: ALF-11872: A site with 1200 pending invites can now be deleted without the UI timing out - Pending invitation workflows are cancelled in an asynchronous action - The asynchronous action completes about 3 minutes later, due to the massive number of individual delete statements being run by Hibernate - Creating the rows in the first place took 20 minutes! 32956: ALF-11872: Corrected filtering in InvitationServiceImpl.getInvitationTasks() to only include start tasks - plus recautionary sleep() in InviteServiceTest.tearDown() to ensure asynchronous invite deletions complete 33169: ALF-12312 'org.hibernate.LazyInitializationException: could not initialize proxy - no Session' when clicking on a Pending Invite workflow task in JSF - Follow on from ALF-11872: Only use lazyloaded WorkflowTasks from JBPMEngine.getWorkflowTasks() when we are using the same session (currently only done from InvitationService). The fallback is to assume it is not the same session and return a normal list of Workflows. 33221: Merged V3.4-BUG-FIX to V4.0-BUG-FIX (RECORD ONLY) 30463: L10N Updates from Gloria (based on r30332): Fixes ALF-8211 and new string updates 30473: Merged HEAD to V3.4-BUG-FIX 30468: Fixed ALF-10280: Slow to report ® Duplicate entry ¯ in database. - DuplicateChildNodeNameException implements DoNotRetryException 30685: Merged HEAD to V3.4-BUG-FIX 30679: Unit test for ALF-1017 - Non site content in the Sites Space 30683: ALF-1017 Remove EVERYONE Contributor permissions from /Company Home/Sites/, to avoid misc nodes being created in there by mistake by users, and update the SiteService to runAsSystem when creating the Site node 30693: Merged HEAD to V3.4-BUG-FIX 30692: Fix ALF-1017 specific test following ALF-1017 changes to permissions 30808: Fixes: ALF-10485 (minor text update) 30873: Latest L10N update from Gloria (based on r30698): - Adds Web Quick Start translations (back port from 4.0) - Adds/updates new or previously missing strings 31019: Merged HEAD to V3.4-BUG-FIX 28974: added double-checks for associations when a potential failure is detected 31018: Fixed ALF-9591: Integrity check: Association source multiplicity checking is incorrect - Drop checks for source multiplicity when no associations are pointing to a type/aspect instance 31045: Merged HEAD to V3.4-BUG-FIX 31044: Performance improvements for PATH queries relating to Share dashboard dashlets and document library. - tweaks to generation of PATH queries - hugely improves performance when dealing with 1000's site memberships 31160: Merged HEAD to V3.4-BUG-FIX 31156: Various Share search related fixes as spotted by Andy: - increased resultset size that is used to retrieve raw results from query before Share specific results are filtered - this means sensible results are now shown from large repository wide and sorted queries, previously results would be "missing" if they dropped out of the resultset prefiltering - fix to Share Search component to correctly display if more than N results were found in the repository - fix to add default TYPE clause to generated Share search if no other TYPE is specified - this reduces masses of potentially matches results from repository wide searches that would otherwise need to be post-filtered 31345: Merged HEAD to BRANCHES/DEV/V3.4-BUG-FIX: 31330: Fixed WCM bulkImport's importDirectory 31442: Merged HEAD to V3.4-BUG-FIX 31441: Fixed ALF-11014: Content output stream close errors are absorbed silently - Found while testing XAMcontentStore - Pulled stream copy code into AbstractContentWriter - OutputStream closure (write-side) exception is rethrown to allow full rollback, etc 31444: Merged HEAD to BRANCHES/DEV/V3.4-BUG-FIX: 31383: MLPropertyInterceptor performance improvements: 31758: Merged V3.3 to V3.4-BUG-FIX 31757: ALF-11279: Fixed RetryingTransactionInterceptor so that it actually behaves like an interceptor and doesn't throw away the rest of the interceptor chain! 31798: Merged V3.3 to V3.4-BUG-FIX 31773: ALF-11279: Further RetryingTransactionInterceptor fixes - must do mark for rollback on propagating transactions 32051: ALF-7195: Merge HEAD (4.0) to V3.4-BUG-FIX (3.4.7) Merge was simply to take HEAD version to pick up changes made by Derek to DisableAuditableBehaviourInterceptor 32047: ALF-8882 Edit Online: Modifier and Modified date are changed even no changes were applied - needed to turn off ASPECT_AUDITABLE on removeProperty which is called on unlock - added code to not enable this aspect early if nested calls were made (this is not done, but is safer this way) 32088: Merging HEAD to 3.4-BUG-FIX: r32063: ALF-10947 Fixed issue where repeating JBPM timer was causing an infinite loop if an exception was thrown within the timer event. 32475: ALF-11727 Improved performance of pending invites search. 32512: Incremented version revision for 3.4.8 32917: ALF-12133: Merged HEAD to V3.4-BUG-FIX 32906: ALF-12068 - Zimbra desktop - corrected InternalDateAsString. 32923: ALF-12133: Merged HEAD to V3.4-BUG-FIX 32918: ALF-12133 - Attempt 2 to get Imap internal date correct. 33021: ALF-9878: Merge V3.4.1 (3.4.1.25) to V3.4-BUG-FIX (3.4.8) 32956: ALF-11872: Corrected filtering in InvitationServiceImpl.getInvitationTasks() to only include start tasks - plus recautionary sleep() in InviteServiceTest.tearDown() to ensure asynchronous invite deletions complete 32936: ALF-11872: A site with 1200 pending invites can now be deleted without the UI timing out - Pending invitation workflows are cancelled in an asynchronous action - The asynchronous action completes about 3 minutes later, due to the massive number of individual delete statements being run by Hibernate - Creating the rows in the first place took 20 minutes! 32927: ALF-11872: Fix parameter validation in InvitationServiceImpl.getInvitationTasks() 32881: ALF-11872: The saga goes on! Corrected empty list handling in InvitationServiceImpl.searchInvitation(). 32868: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete - Rationalization of batch fetching at hibernate layer 32861: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete - JBPMEngine uses an abstract list to 'lazily' convert hibernate objects on demand and avoid batch loading too many objects 32857: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete - Search for Pending invites was slow on sites with > 0 pending invites (it was getting invites for all sites) 32838: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete - JBPMEngine now supports batch cancelWorkflows() method for canceling multiple workflows at the same time (e.g. on deleting a site) - Manual flushes only used at two points in the batch to minimize dirty checking overhead and yet avoid FK errors - Performance implications still to be checked but at least functionally correct - Corrected JPDL source jar 32775: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete Even more changes: - reduce number of queries required to list pending invites to a site (uses moderated and nominated caches and only looks up IDs if possible) - change hibernate cache and flush modes (to avoid cache and the related slow flush), for queries and cancel of workflows - modified js which was making a query for each person in order to work out if they were already in a pending invites list 32650: ALF-11872: When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete Put back in cut off at 200 invites (removed in last merge) for UI, unless we know that we need all of them internally 33143: Merged BRANCHES/V3.4-TEAM to BRANCHES/DEV/V3.4-BUG-FIX 25103: ALF-6613 - SpringSurf improvements to allow easier refactoring of Document Details page - removed manual request level caching of remote calls responses in web-tier components - now completely automatic 25138: Flattening of user preferences remote calls - ensures /preferences hits the RequestCachingConnector - reduces no. of remote calls by 3 for the doclib and by 4 for a site dashboard. 33216: Merged PATCHES/V3.4.1 to V3.4-BUG-FIX (3.4.8) 32405: Merged V3.4.6 (3.4.6.1) to V3.4.1 (3.4.1.24) 32404: ALF-9878 / ALF-11727 CLONE - Pending Invite Search doesn't return anything if there's more than 1000 pending invites across all sites. Removed read only transaction from invites.get.desc.xml as it broke InviteServiceTest testRejectInvite 32397: ALF-9878 / ALF-11727 CLONE - Pending Invite Search doesn't return anything if there's more than 1000 pending invites across all sites. Return first 200 invitations (similar to 4.0 paging) Transaction used by the invites.get is now read only so does not force a flush of caches. 32503: Merged PATCHES/V3.4.6 to PATCHES/V3.4.1 32501: ALF-9878 / ALF-11727: Reinstated read-only transaction around invites.get and prevented it from trying to lazily create persons from rejected invites that had previously been deleted by InviteHelper.cleanUpStaleInviteeResources! 32641: ALF-12387 / ALF-11872: Merged V3.4-BUG-FIX (3.4.8) to V3.4.1 (3.4.1.25) 32475: ALF-11727 Improved performance of pending invites search. (N Smith changes to do with only using ONE search value - faster as multiple are taken as ORs rather than ANDs) 32650: ALF-12387 / ALF-11872: When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete Put back in cut off at 200 invites (removed in last merge) for UI, unless we know that we need all of them internally 32775: ALF-12387 / ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete Even more changes: - reduce number of queries required to list pending invites to a site (uses moderated and nominated caches and only looks up IDs if possible) - change hibernate cache and flush modes (to avoid cache and the related slow flush), for queries and cancel of workflows - modified js which was making a query for each person in order to work out if they were already in a pending invites list 32838: ALF-12387 / ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete - JBPMEngine now supports batch cancelWorkflows() method for canceling multiple workflows at the same time (e.g. on deleting a site) - Manual flushes only used at two points in the batch to minimize dirty checking overhead and yet avoid FK errors - Performance implications still to be checked but at least functionally correct - Corrected JPDL source jar 32857: ALF-12387 / ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete - Search for Pending invites was slow on sites with > 0 pending invites (it was getting invites for all sites) 32861: ALF-12387 / ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete - JBPMEngine uses an abstract list to 'lazily' convert hibernate objects on demand and avoid batch loading too many objects 32868: ALF-12387 / ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete - Rationalization of batch fetching at hibernate layer 32881: ALF-12387 / ALF-11872: The saga goes on! Corrected empty list handling in InvitationServiceImpl.searchInvitation(). 32927: ALF-12387 / ALF-11872: Fix parameter validation in InvitationServiceImpl.getInvitationTasks() 32936: ALF-12387 / ALF-11872: A site with 1200 pending invites can now be deleted without the UI timing out - Pending invitation workflows are cancelled in an asynchronous action - The asynchronous action completes about 3 minutes later, due to the massive number of individual delete statements being run by Hibernate - Creating the rows in the first place took 20 minutes! 32956: ALF-12387 / ALF-11872: Corrected filtering in InvitationServiceImpl.getInvitationTasks() to only include start tasks - plus recautionary sleep() in InviteServiceTest.tearDown() to ensure asynchronous invite deletions complete 33169: ALF-12382 / ALF-12312 'org.hibernate.LazyInitializationException: could not initialize proxy - no Session' when clicking on a Pending Invite workflow task in JSF - Follow on from ALF-11872: Only use lazyloaded WorkflowTasks from JBPMEngine.getWorkflowTasks() when we are using the same session (currently only done from InvitationService). The fallback is to assume it is not the same session and return a normal list of Workflows. 33224: Fix for ALF-12230 "Bootstrap re-encryption failed" 33225: Fix for ALF-12349 Transformations need to handle failures due to server being busy. Change to system behaviour: We want to support transient failures of thumbnail creations. Primary example now is the Polymorph Transformation Server which can fail transformations because it is under load and wishes to decline transform requests. Prior to this check-in, such failures would be interpreted by Alfresco as 'real' failures and the content node would be marked as FailedToTransform. The transformers' state data would also be affected by the failure. We need to allow transformers to fail and NOT trigger any negative consequences such as above. Changes in code: New exception type ActionServiceTransientException when thrown from an ActionExecuter will NOT trigger any compensating action that has been configured. This allows actions to fail 'normally' or due to some transient condition with the implication that if rerun later the action may succeed. Additional end-state for Actions in the ActionTrackingService: ActionStatus.Declined. The ActionExecuter has declined to execute the action at this time. New exception type ContentServiceTransientException which means that a content operation (currently only a transformation) has failed due to a transient condition. CreateThumbnailActionExecuter catches this exception type and throws the ActionServiceTransientException. Tests at the ActionServiceImpl, ActionTrackingServiceImpl and ThumbnailServiceImpl APIs & various test config & other changes. 33231: ALF-10581 - MySQLIntegrityConstraintViolationException: Cannot add or update a child row: a foreign key constraint fails ... fk_alf_cass_cnode - unexpected non-null child node id when creating a new node (see also THOR-906) - for now genericise ALF-10153 (to include at least MySQL in addition to MS SQL Server) 33237: Fixing JUnit jar's src attachment. 33238: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX: 33222: ALF-12351: Separate schema descriptor files for table prefixes: alf_, avm_, JBPM_, act_ 33235: ALF-12351: Separate schema descriptor files for table prefixes: alf_, avm_, JBPM_, act_ 33239: partial fix for: ALF-10446 - Upgraded FullCalendar to support ISO8601 Zulu timezone & told it not to ignore the timezone information. 33240: Implementation of improvement ALF-12404. This fix has been OK'd by Andy Hind. 33246: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX: 33244: ALF-12352: Add JMX support to trigger a schema check manually 33252: Merged V3.4-BUG-FIX to V4.0-BUG-FIX (RECORD ONLY) 33245: ALF-12366: Delete a node by deleting its row and inserting a new one with the deleted flag set - Forces a new ID to be generated for the deleted node - Makes it impossible to simultaneously delete a node and add new children in two concurrent transactions - Can't be merged to 4.0 due to SOLR - needs something more clever! 33250: ALF-12366: Derek code review 33254: Merge V3.4-BUG-FIX to V4.0 BUG-FIX 33249 - ALF-12342 Excel 2003 Patterns. 33256: ALF-12386 Change the simpler projects to use explicit dependencies, rather than blindly importing all of 3rd-party, to make generating downstream Maven POMs easier 33266: ALF-12163 - mail.parameters.from does not use the from address provided 33283: ALF-12185 SPP/Vti Mac Office checkin correction for Collaborators (Patch from Pavel Yurkevich) 33295: Fix to SMTP authentication implementation. 33296: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX 33285: Fix for ALF-12336 - Share loses performance if noncachableObjectTypes are defined (page & component) - New and improved mechanism for dealing with cache invalidation in Share load balancing and clustering based on the Hazelcast messaging system - See http://www.hazelcast.com/docs.jsp - and specifically http://www.hazelcast.com/docs/1.9.4/manual/single_html/#SpringIntegration - Sample per node cluster config provided in custom-slingshot-application-context.xml.sample - Tested with an Alfresco cluster plus a Share cluster both balanced via Apache server instances - Significantly improved Share stability with latest SpringSurf libs and individual node performance back up to non-clustered node speed Modified Alfresco JLan build to use newer hazelcast JAR and also modified existing build file references to use new jar location. 33297: Merge V3.4-BUG-FIX (3.4.8) to V4.0-BUG-FIX (4.0.1) (RECORD ONLY) 33292: ALF-12457: Merge V3.4.4 (3.4.4.8) to V3.4-BUG-FIX (3.4.8) 33287: ALF-12400: Merged DEV/BELARUS/V3.4-BUG-FIX-2012_01_10 to V3.4.4 (3.4.4.8) 33284: ALF-12400 CLONE - Security risk in Web View dashlet The check for user role was added to Web View and Site Links dashlets to disallow to configure Web View for Consumer, Contributor, and Collaborator roles and disallow to add Site Links for Consumer role. 33286: ALF-9514 I18N: Model constraint values need localized display names - Applied diff file attached to JIRA issue (with a minor compiler error correction). It appeared to be a merge of: DEV/SWIFT r27643, r27645, r27692, r27846 and HEAD r28405, r29364 33298: ALF-12461 If the OOXML file contains a thumbnail image, use this for the document thumbnail, plus improve the iWorks analoguous transformer 33305: Fix for ALF-12463 Error querying database was detected during upgrade process from 3.1 to 4.0.0. 33306: Experiment - adding an sdk-extras target for the enterprise specific bits of the SDK. 33308: Merged V3.4-BUG-FIX (3.4.8) to V4.0-BUG-FIX (4.0.1) 33242: ALF-5830 show_audit.ftl template doesn't work anymore - ISO9075 encode the node path 33271: ALF-9659 In auditing, nodeNameValue extractor never works on a deletion event. - As pre call audit is not discarded on transaction rollback, we need to be able to have access to pre call values in the post call audit application. One such value is the nodeName for the post call of NodeService.deleteNode() 33274: Merged DEV to V3.4-BUG-FIX 33273: ALF-12314: Failed to create content due to error: lockOwner is a mandatory parameter It is necessary to pass the correct 'lockOwner' of a rendition, for example, to use 'rr.getLockOwner()' instead of 'lockOwner' 33277: ALF-12436: Merged PATCHES/V3.4.6 to V3.4-BUG-FIX 33275: ALF-12426: Correction to joins in select_ContentDataByNodeIds - inner join to alf_node_properties first 33279: ALF-12366: Merged PATCHES/V3.4.6 to V3.4-BUG-FIX 33278: ALF-12393: Another indexing race condition when MySQL read committed is enabled, this time in the debug diagnostics! 33282: Merged V3.4 to V3.4-BUG-FIX 32979: ALF-12114: Reverse merged ALF-10282 and related changes from V3.4-BUG-FIX, which have caused serious regressions 31840: Fix for ALF-10282 - Web Browser freezes with large xml files Web form transformation 32341: Fix for ALF-9883 - WCM Forms: Changing 'abstract' type carries previously-added elements 32998: (RECORD ONLY) Merged V3.4-BUG-FIX to V3.4 32996: ALF-12184: SchemaBootstrap must use same assumptions as PatchServiceImpl when deciding whether an alternative patch succeeded - Fixes regression introduced by r31972 / ALF-11489 33084: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2011_12_06 to V3.4 (3.4.7) 33069: ALF-12266 NPE creating content using the web form Locale language can be passed not only as lang_country but as only country code as well. 33257: ALF-10340: patch.db-V2.2-CleanNodeStatuses must now have patch.db-V2.2-Upgrade-From-2.2SP1 as an alternative to allow upgrade from 2.2.8 - That's because patch.db-V2.2-Upgrade-From-2.2SP1 exists in 2.2.8 and once run it's too late to run patch.db-V2.2-CleanNodeStatuses 33260: Set failonany=true on distribute-installers parallel task so that the build actually fails if an installer fails to build 33301: ALF-12464: Merged PATCHES/V3.4.5 to V3.4-BUG-FIX 33299: ALF-12281: Memory leak in ReferenceCountingReadOnlyIndexReaderFactory - The diagnostic code I added to track memory leaks was actually causing some! - For some reason I was recording a new reference when the index reader was dereferenced rather than clearing it - Would affect scenarios where the main index is long-lived and there are no writes to it and lots of searches - Spotted by Pavel - Too much late night coding! 33303: ALF-12464: Merged PATCHES/V3.4.5 to V3.4-BUG-FIX 33302: ALF-12281: Correction to previous checkin - deal with the initial reference created by the constructor and cleared by closeIfRequired() 33315: ALF-11214 - IMAP subsystem is not successfully restarted after incorrect modification of IMAP properties via Admin Console 33321: Remove /hazelcast lib dir include which is no longer required as libs are now at lib root folder 33322: ALF-2550 - Enterprise SDK files do not contain enterprise repository project. 33323: SDK - Added Enterprise third party libs. 33327: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/V4.0-BUG-FIX: 33324: Fix for THOR-941. Some MIME types appear as Unknown in metadata form. The inconsistencies in the edit mimetype form were slightly different on V4.0.1 so I tidied them up. 33330: ALF-12487 In Mimetype Detection, if Tika detects a generic type of text/plain or XML, defer to the Alfresco filename based type (as we already do for octet stream) 33335: Quick build fix - comment out SDK enterprise docs while I work out what's wrong. 33353: Added more projects to Enterprise Generate Docs. 33357: When installing a module the tool reads the war's version.properties file and will not install if the war version is outside the repoVersionMin or repoVersionMax 33361: Merged DEV/GETHIN/FINDBUGS to V4.0-BUG-FIX 32962: Findbugs fix: Suspicious comparison of Integer references 32963: Findbugs fix: Call to equals() compares different types 32968: hashcode should be hashCode 32970: Findbugs fix: Suspicious comparison of Integer references 32972: Findbugs fix: Suspicious comparison of Integer or Long references 32976: Findbugs fix: .remove() incompatible with expected argument type String 32977: Findbugs fix: String is incompatible with expected argument type 32978: Findbugs fix: Call to equals() compares different types I prefer this fix to the previous one I did 32982: Findbugs fix: Call to equals() compares different types classDefinition.getName().equals instead of classDefinition.equals 32983: Findbugs fix: String is incompatible with expected argument type java.util.Locale 32984: Findbugs fix: An apparent infinite loop 32985: Findbugs fix: bad month value of 12 passed to new java.util.GregorianCalendar This code passes a constant month value outside the expected range of 0..11 to a method. 32986: Findbugs fix: authenticationComponent masks field from superclass 32987: Findbugs fix: Invocation of toString on Array Now uses Arrays.toString() 32988: Findbugs fix: Incorrect lazy initialization of static field Now uses static initialization block 32989: Findbugs fix: Dead code: A null pointer would have been thrown before these lines 32990: Findbugs fix: possible null pointer dereference Just made the code a little clearer 32991: Findbugs fix: class defines a clone() method but the class doesn't implement Cloneable. 32992: Findbugs fix: All equals() methods should return false if passed a null value. 32993: Findbugs fix: Invocation of toString on Array Now uses Arrays.toString() 32994: Findbugs fix: If the multiplication is done using long arithmetic, you can avoid the possibility that the result will overflow. 33006: Findbugs fix: possible null Just made the code a little clearer 33007: Findbugs fix: Invocation of toString on Array Now uses Arrays.toString() 33008: Findbugs fix: Call to String.equals(Character) Explicitly using String 33009: Findbugs fix: int converted to long and passed as absolute time to new java.util.Date(long) Now works after the year 2037! 33014: Findbugs fix: Invocation of toString on Array Now uses Arrays.toString() 33023: Findbugs fix: There is an apparent infinite recursive loop No longer 33025: Findbugs fix: possible null Just made the code a little clearer 33026: Findbugs fix: impossible null check Changed && to || 33029: Findbugs fix: Minor change to Integer.valueOf 33126: Findbugs fix: Comparison of String objects using == now used .equals 33127: Findbugs fix: Unwritten field. All reads of it will return the default value. Now sets values in the constructor 33128: Findbugs fix: Removed try/catch 33129: Findbugs fix: Added an assertTrue to the unit test 33130: Findbugs fix: Passes null for nonnull parameter Mocked the serviceReg and now the tests work! 33131: Findbugs fix: Call to a collection method contains an argument with an incompatible class from that of the collection's parameter 33133: Findbugs fix: Deadly embrace between inner class and thread local - not eligible for garbage collection. Made inner class static 33182: Findbugs fix: possible null Now intialises documentPaths correctly 33184: Findbugs fix: possible null pointer (no more) 33185: Findbugs fix: Comparison of itself Changed variable name to fixedValue 33186: Findbugs fix: Possible null pointer dereference of nodePair Now continues 33187: Findbugs fix: This code seems to be using non-short-circuit logic 33188: Findbugs fix: Possible null pointer dereference of entry Discussed with Andy. If there's no entry then throw the exception, we can't continue 33189: Findbugs fix: Call to a collection method contains an argument with an incompatible class from that of the collection's parameter It must want to remove the user 33199: Modified the end of line character 33209: Changed tabs for spaces 33210: I removed the "if" because it was never called, however Brian suggested moving it to a place where it would be called! 33363: Fix for ALF-12374 - Share sample 'share-config-custom.xml' is missing an endpoint 'activiti-admin' 33364: Merge V3.4-BUG-FIX to V4.0-BUG-FIX 33362 : ALF-12448 - Missing jars in enterprise SDK 33376: Merged (RECORD ONLY) V3.4-BUG-FIX (3.4.8) to V4.0-BUG-FIX (4.0.1) 33375: ALF-12154: Merged HEAD to V3.4-BUG-FIX (3.4.8) Requested to RECORD ONLY this change when merging back to HEAD/V4.0-BUG-FIX etc. - Removed duplicate 'List constraint display labels' values from bpm-messages*.properties and dictionarydaotest_model.properties. May have been introduced by ALF-9514 changes in the same area, which was also RECORD ONLY - Manual merge of JSON propertyLabels that exist in HEAD back into 3.4.8 32724: OPEN : ALF-11176: Untranslated strings in Group Review and Approve Task form Activiti has one default transition "Next". If there is no transition then the model builder was not finding a translation for the task outcome (and just using the english word, e.g. "Approve"). Now it looks up the translation workflowtask.outcome.[wf:outcome property] 32943: FIXED : ALF-11176: Untranslated stings in Group Review and Approve Task form I've changed the way task descriptions are retrieved. You can now enter translations for them. 33377: ALF-12509: ibooks Format Added quick.ibooks file 33378: ALF-12207 IMAP: Empty file is not opened/downloaded (using IMAP Content Links) if it was uploaded to Share via fileserver 33379: Add the TIFF mimetype 33380: Improve the stream to Tika conversion code, following review for THOR-952 33385: Upgrade to the latest Tika and POI, for recent bug fixes 33387: ALF-12492 - Email with empty subject sent to Alfresco by SMTP cause Null pointer Exception 33396: ALF-12497 - Opening and closing (not save) MS Exel 2003 file via CIFS adds new version 33397: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX: 33259: ALF-12354: DB2 reference files. 33261: ALF-12354: MySQL reference files. 33268: ALF-12354: Oracle reference files 33310: ALF-12354: Create schema reference files for MySQL, PostgreSQL, Oracle, DB2 33349: ALF-12354: Create schema reference files for MySQL, PostgreSQL, Oracle, DB2 33366: ALF-12412: Schema reference files should contain schema version number 33367: ALF-12412: Schema reference files should contain schema version number 33373: ALF-12354: Added comment to DB2 file regarding intermittent comparison failures. 33389: ALF-12516: Produce XML schema definition file (XSD) for schemacomp reference files. 33390: ALF-12516: added missing file (the actual XSD!) 33392: ALF-7260 RINF 03: Automate DB schema validation 33401: FindFindbugs fix: Maybe Derek expected null after all 33406: Latest SpringSurf libs - fixed use of java.util.UUID which blocks 33407: Merged BRANCHES\DEV\V3.4-BUG-FIX to BRANCHES\DEV\V4.0-BUG-FIX 33399: Fix for ALF-11962 Lucene queries searching on metadata (not on cm:content) with stopwords returns wrong results 33414: ALF-11746 Webscript to expose the repository mimetypes, along with their user facing display names and their extensions 33415: ALF-11746 Mimetype information can be available to all 33442: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX 33441: Latest SpringSurf libs - performance and thread safety improvements. 33447: Fix to email test - query error exposed by recent change. 33451: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX: 33446: ALF-12354: fixed DB2 intermittent unique index creation problems. 33448: ALF-7260: removed redundant code. 33454: Merged (RECORD ONLY) V3.4-BUG-FIX (3.4.8) to V4.0-BUG-FIX (4.0.1) 33388: Removed L10N that no longer have a default. 33437: ALF-9514 I18N: Model constraint values need localized display names - Undo changes to webclient_ja.properties that were made by r33286 for this issue. There were no changes in webclient.properties that did not already exist in webclient_ja.properties This should simplify translations. 33453: ALF-9514 I18N: Model constraint values need localized display names - Tidy up mess to do with the initial r33286 revision for this issue. Lots of L10N property changes. I think some of my trial merges from 4.0 did not get reverted before I applied the diff file. Reverse merged r33437 and r33286. Note r33388 and r33375 (for ALF-12154) already included changes to try and fix the initial revision. 33456: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX: 33455: ALF-12410: JMX Dumps taking very long to finish 33457: SDK build fix 33463: Add in Enterprise Docs to SDK (again) 33464: Merged V3.4-BUG-FIX to V4.0-BUG-FIX 33312: ALF-12448: Merged HEAD to V3.4-BUG-FIX (3.4.8) 33304: ALF-7542 SDK is missing spring-test.jar - ant script modified to copy org.springframework.test*.jar files into root\build\assemble\sdk\lib\server\dependencies 33382: ALF-10239 Form validation bug when content becomes invalid after XSD change - override isValidForSubmit function in alfresco.xforms.TextField as alfresco.xforms.Widget version does not check the max length 33383: Fix for ALF-11791 - Multiple search on category in Share Advanced Search return no result Merged HEAD to BRANCHES/DEV/V3.4-BUG-FIX 29710: SVC15: Contribution: Alfresco Share Adv Search Enhancement: Allow advanced search on category to include sub-categories in query by checking a checkbox as in Alfresco Explorer (ALF-7157) A new "showSubCategoriesOption" has been added to the "category.ftl" form control, that when set to true (as shown in the example config snippet below) will display a checkbox allowing the user to request all sub categories be searched as well as the selected ones. <field id="cm:categories"> <control> <control-param name="compactMode">true</control-param> <control-param name="showSubCategoriesOption">true</control-param> </control> </field> 30572: Fix for ALF-7008 - Double category in Share Advanced Search return no result 33384: Fix for ALF-12469 - Change method BaseAssociationEditor.generateFormSubmit to protected 33400: ALF-12366: Merged PATCHES/V3.4.6 to V3.4-BUG-FIX 33354: ALF-12393: Parent assocs must be cached with a txn ID, even when a node has no parents - Use left outer join in parent assocs query 33355: ALF-12393: Fixed typo in SQL + allowed assocIndex to be null 33413: ALF-12219: Fix CommandServlet to not mess up Document List and My Spaces List dashlets on Websphere 33416: ALF-12411: Merged DEV to V3.4-BUG-FIX (with corrections) 33404: Fix that introduces full Unicode character support into jBPM 3.3.1: - new patch that alters columns of the jBPM 3.3.1 tables to change 'TEXT' datatype to 'NVARCHAR(MAX)' (SQL Server and Generic dialects); - 'jbpm-upgrade.sql' patch modified to alter as in the new patch; - 'AlfrescoSQLServerDialect' fixed to allow create tables with 'CLOB' columns as 'NVARCHAR(MAX)' columns - devious chain of alternatives (suggested by Derek) introduced to make sure the right patch executes under the right circumstances 33418: ALF-9507: Fixed possible LDAP security hole Now we force RFC 2254 escaping of the user DN resolution query using argument substitution, as described here http://docs.oracle.com/javase/jndi/tutorial/ldap/search/search.html 33419: ALF-9658: Corrected AFTER_INACTIVITY cache update behaviour in InMemoryTicketComponentImpl - Now the key is preserved on entry update and not accidentally regenerated 33421: Merged DEV to V3.4-BUG-FIX 32042: ALF-11448: ArrayIndexOutOfBoundsException caused by unsynchronized call in org.alfresco.repo.webdav.WebDAV.formatModifiedDate Creation of SimpleDateFormatter was moved to a method. 33422: ALF-12302: /api/tags API returns badly-formed JSON - Resolved as suggested by MH 33423: ALF-10312: Parameter Based Redirection - Now we validate that the Explorer login page redirect URL is within the context path of the application (/alfresco) 33424: Merged DEV to V3.4-BUG-FIX 33358: ALF-11719: Webscript fails due to colon in password Split basic authentication header by first colon. Remaining part is user's password. 33425: Merged DEV to V3.4-BUG-FIX 33359: ALF-12071: Windows 7 cannot open files stored on Alfresco mounted as a webdav network drive if the filename contains + (plus) character For Windows 7 we SHOULD decode the file name gotten from GET request taking into account that "+" is not encoded as "%2B" for GET request. 33426: Merged DEV to V3.4-BUG-FIX (with corrections) 33374: ALF-10713: Remaining dependencies repo.remote.url from outboundSMTP-context.xml and activities-feed-context.xml was removed and SysAdminParams bean was injected instead. - MailActionExecuter.URLHelper returns url to alfresco using SysAdminParams. 33427: ALF-10713: repo.remote.url no longer used in 3.4.8 so removed altogether 33429: Merged HEAD to BRANCHES\DEV\V3.4-BUG-FIX 31191: First fix for ALF-10741 TAG field does not support wildcard, prefix, fuzzy queries etc -> wildcard searches entered by users will fail (for ALF-12162) 33433: ALF-12411: Fixed postUpdateScriptPatches declaration 33435: ALF-11719: Fix Authorization and AuthorizationTest 33436: ALF-12411: Fixed patch script paths 33445: Fixes: ALF-12389; internationalises the tool tip strings for changing the data list sort order. 33449: ALF-12411: Fixes from Dmitry - Corrected ID of patch.db-V3.4-Upgrade-JBPM - dependsOn property has no effect on a SchemaUpgradeScriptPatch - order controlled by schemaBootstrap.postUpdateScriptPatches 33459: ALF-9811: SSOAuthenticationFilter now supports basic auth as well. 33471: ALF-12297 Emailing to document via inbound SMTP causes integrity violation 33473: Reference schema files moved on from 5025 to 5026 33478: Fix for ALF-12515 33479: Fix for ALF-11116 33481: Fix for ALF-12099 33487: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX: 33485: ALF-12598: Incorrect column order on indexes and primary keys must be reported to user 33496: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX: 33494: ALF-12412: Schema reference files should contain schema version number 33508: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX: 33507: ALF-12412: Added missing files 33515: Merge (Record Only) V3.4-BUG-FIX to V4.0-BUG-FIX 33495 : SDK Build fix - do not merge to V4.0 33517: V4.0 version of the fix for ALF-12393 - The node caching structure in 4.0 is version-based and there was already a check to ensure that in-memory vs database versions matched for all calls to get parent associations. - Added an additional version check for cases where the node returns no parent associations - Removed right outer joins associated with the 3.4 fixes (minor complexity that is no longer required) 33555: Merged (RECORD ONLY) V3.4-BUG-FIX (3.4.8) to V4.0-BUG-FIX (4.0.1) 33554: Merged V3.4 (3.4.8) to V3.4-BUG-FIX (3.4.9) 33512: GERMAN: L10N Updates, fixes: ALF-12154, ALF-9514, ALF-12389 33513: SPANISH: L10N Updates, fixes: ALF-12154, ALF-9514, ALF-12389 33514: FRENCH: L10N Updates, fixes: ALF-12154, ALF-9514, ALF-12389 33516: ITALIAN: L10N Updates, fixes: ALF-12154, ALF-9514, ALF-12389 33526: JAPANESE: L10N Updates, fixes: ALF-12154, ALF-9514, ALF-12389 33544: SPANISH: Fixes additional Spanish translation bugs 33552: JAPANESE: Adds previously missing workflow related translations 33560: Fix the line endings to be consistent 33561: DOC-335 Provide a commented out example of SPP/Vti SSL Configuration in the Module 33563: Merge (Record Only) V3.4-Bug-FIX to V4.0-BUG-FIX 33328 : ALF-12098 Issue ALF-4010 not fully resolved. ftp transfer of a previously moved file copies it to the destination folder of the previous move 33566: fixed a comment. 33567: Small change to debug logging 33568: Removed deleteConfirm flag. Not neccessary as events are fired postCommit. 33570: Merged V3.4-BUG-FIX to V4.0-BUG-FIX 33550: Fixed ALF-10895 "Links, documents and folders: Unable to delete comments" - Made sure no "content" is sent when using HTTP DELETE to avoid proxy issues 33574: Merged (RECORD ONLY) V3.4-BUG-FIX (3.4.8) to V4.0-BUG-FIX (4.0.1) 33573: Merged V3.4 (3.4.8) to V3.4-BUG-FIX (3.4.9) 33557: JAPANESE: Removes redundant string 33576: ALF-12634 When building the edit online link to SPP/Vti, don't assume that the protocol (http/https) is the same as Share, but instead make that a module property (similar to how the port and hostname are set) 33577: Remove un-used imports 33584: ALF-12363: Protect against attempt to reference undefined rawPerms variable in folder-permissions WebScript controller 33586: ALF-12405: Always show delete site icon on My Sites dashlet when viewed on IE7 33605: Fixes: ALF-12408: Script Error when hovering on a row. 33616: Merged BRANCHES\DEV\V3.4-BUG-FIX to BRANCHES\DEV\V4.0-BUG-FIX 33500: Fix for ALF-12162 Searching for words with german umlaut does not show expected results 33624: ALF-12488 - CIFS error occurs if Hazelcast Config is enabled. 33637: ALF-11594: Disable comment field on upload dialog after version update 33643: ALF-12243: Fixed create HTML content via HTML editor 33649: Minor: tabs 33650: ALF-12657: We need to set maxSavePostSize for tomcat connectors to support SSL (e.g. ModelsGet from SOLR will truncate JSON to 4096 characters) 33662: Fix for ALF-12460 33663: Fix for ALF-12460 (part 2) 33664: Fix for ALF-12460 (part 2) 33665: Fix for ALF-12443 33672: Merged V3.4-BUG-FIX to V4.0-BUG-FIX 33468: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX 33467: Enterprise overlay update for MessagesWebScript 33470: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX 33469: Revert rev 33467 - not required 33482: Fixed ALF-12373 "IE7 Specific: incorrect displaying of "Link to Rule Set" window in Alfresco Share" - also fixed for ie6 removed javascript error thrown on click 33580: Minor formatting for easier debug stepping 33581: Fixed ALF-12638: No username in an audit context after an error 33589: ALF-12650: Merged V3.4.1 to V3.4-BUG-FIX (3.4.9) 33588: ALF-12620 Regression. Since 3.4.1.25 / 3.4.6.7 a user can be invited to a site multiple times - correction to js contains function. Bug introduced in r32775 33597: Merge DEV to V3.4-BUG-FIX 33465 : ALF-11193 - Consumer role cannot Unscribe/subscribe the IMAP folders. 33602: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2011_12_06 to BRANCHES/DEV/V3.4-BUG-FIX: 32551: ALF-10133: "Doc folder" for calendar events does not clear/reset itself 33630: Merge Dev to V3.4-BUG-FIX 33626 : ALF-4896 - Lock icon displayed for documents with expired lock 33633: Merge V3.4.7 (3.4.7.1) to V3.4-BUG-FIX (3.4.9) 33609: ALF-12589 CLONE - Content Manager unable to edit content from another user sandbox - Hot Fix for 3.4.7 needed Changed the permissions on the user's 'preview' store so that the group of ContentManagers was granted the ContentManager permission. It had been granting the permission to all current users in the group individually. As a result new ContentManagers could not FLATTEN or WRITE to the preview store. This had already been done for the main user store a few years back. As the managers parameter was no longer needed the was removed. 33647: Merged DEV to V3.4-BUG-FIX 33629: ALF-12585: Manage System Users shows "Change Password" icon for LDAP users in search results Sets "isMutable" property using addPropertyResolver in UsersDialog. 33648: Merged DEV to V3.4-BUG-FIX 33623: ALF-10586: CMIS: Trying to delete a multilingual document w/o translations via webscript There is no need to delete associations in CMISServicesImpl.deleteObject(). 33659: Merged V3.4 to V3.4-BUG-FIX 33594: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2011_12_06 to BRANCHES/V3.4: 32551: ALF-10133: "Doc folder" for calendar events does not clear/reset itself 33595: Reverse merge of the following. Should have been committed to V3.4-BUG-FIX 33594: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2011_12_06 to BRANCHES/V3.4: 32551: ALF-10133: "Doc folder" for calendar events does not clear/reset itself 33604: ALF-12597: WCMQS doesn't work out of the box 33654: Merged DEV to V3.4 33622: ALF-12655: Configure link isn't presented in Web View dashlet(My Dashboard page) User userIsSiteManager is true by default in webview.get.js. This allows to configure Web View dashlet on user's dashbord. 33651: ALF-12655: Configure link isn't presented in Web View dashlet(My Dashboard page) Sets userIsSiteManager=false before remote call, so if remote call fails it won't give site manager role to the user. 33655: ALF-12366: Merged PATCHES/V3.4.6 to V3.4 33548: ALF-12393: More changes to cope with read committed DB behaviour in AbstractReindexComponent - Reverted r33278, 33354, 33355 and introduced more generic solution - NodeRefs resolving to deleted nodes in the cache cause cache cleaning and transaction retry if they resolve OK in the database - Cached parent assocs are thrown away for non-deleted nodes if they are empty - Removes the need for the outer join and special case exception handling all over the place 33562: ALF-12393: Further improvments - Lookup of NodeRef to a deleted node must always result in cache clearing and transaction retrying (due to possible read committed behaviour half way through transaction) - Detection and correction of stale cached negative results (VALUE_NOT_FOUND) in node cache 33583: ALF-12393: Rework to getNodePair(NodeRef) to have less impact on existing code but still cope with read committed - Look ups of deleted nodes still cause InvalidNodeRefExceptions but these have a retryable cause so that both handlers can handle and retrying transactions can recover - Corrections to cached negative results (because the nodesCache remembers negative results) are written straight through and the transaction does not need to be retried 33660: Merged V3.4 to V3.4-BUG-FIX (RECORD ONLY) 33634: ALF-12161: Merge V3.4-BUG-FIX (3.4.9) to V3.4 (3.4.8) 33633: Merge V3.4.7 (3.4.7.1) to V3.4-BUG-FIX (3.4.9) 33609: ALF-12589 CLONE - Content Manager unable to edit content from another user sandbox - Hot Fix for 3.4.7 needed Changed the permissions on the user's 'preview' store so that the group of ContentManagers was granted the ContentManager permission. It had been granting the permission to all current users in the group individually. As a result new ContentManagers could not FLATTEN or WRITE to the preview store. This had already been done for the main user store a few years back. As the managers parameter was no longer needed the was removed. 33657: ALF-12650: Merged PATCHES/V3.4.6 to V3.4 33590: ALF-12620: Merged V3.4-BUG-FIX (3.4.9) to V3.4.6 (3.4.6.10) 33589: ALF-12650: Merged V3.4.1 to V3.4-BUG-FIX (3.4.9) 33588: ALF-12620 Regression. Since 3.4.1.25 / 3.4.6.7 a user can be invited to a site multiple times - correction to js contains function. Bug introduced in r32775 33673: Fixed compilation error 33678: Merged V3.4-BUG-FIX to V4.0-BUG-FIX 33677: Merged V3.4 to V3.4-BUG-FIX 33676: ALF-12436: Increase content data cache sizes to match node properties cache sizes to allow bulk loading without overflowing 33679: Merged V3.4-BUG-FIX to V4.0-BUG-FIX (RECORD ONLY) 33486: Merge V4.0-BUG-FIX to V3.4-BUG-FIX 33306 - experiment to add sdk-extras 33489: Merged V4.0-BUG-FIX to V3.4-BUG-FIX 33322 : Enterprise SDK 33323 33335 33353 33457 33463 33495: SDK Build fix - do not merge to V4.0. 33680: Merged DEV to V4.0-BUG-FIX 33675: ALF-12379: WebLogic: alfresco fails to start: java.lang.NoSuchMethodError: org.apache.commons.lang.mutable.MutableInt.increment()V org.apache.commons.* package should be used as application's preferrable for WebLogic. 33683: Merged V3.4-BUG-FIX to V4.0-BUG-FIX 33682: Merged V3.4 to V3.4-BUG-FIX 33681: ALF-12132: Fix Bitrock's copy of the custom lotus context. Yuck! 33689: Fix for ALF-12437 Switching from Lucene to Solr caused subsystems to be in inconsistent state and repository to hang - filter out changes to read only properties when set in bulk - ie they are ignored 33691: Fix for ALF-12667 33693: Fix for ALF-12695 SOLR should not appear to work with AVM - it should not silently fail. - AVM search and indexing will raise exceptions when used with SOLR - removed the AVM site bootstrap associated with Share in older versions of the product. 33701: Merged DEV to V4.0-BUG-FIX 33697: ALF-12691: Alfresco Explorer doesn't work: java.lang.NoClassDefFoundError: org/apache/commons/lang/builder/HashCodeBuilder Shared library for WAS was fixed. commons-lang-2.6.jar is used. 33704: ALF-12299 - NFS subsystem enable/disable needs a different attribute name 33714: ALF-10229: DOS Voodoo to set ALF_HOME to the parent parent directory of the apply_amps script - for /D %%D IN (%~dp0..\) do set ALF_HOME=%%~dpD - Yuck! 33721: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX: 33720: Merged BRANCHES/DEV/BELARUS/V4.0-BUG-FIX-2012_01_20 to BRANCHES/DEV/mward/schemacomp: 33631: LF-12355 : Create schema reference files for SQL Server 33727: Test fix - fallout from removing the bootstrap for the "sitestore" AVM store 33729: Fixes: ALF-12575 - missing i18n strings. (translations pending) 33738: SPANISH: Translation updates based on EN r33523 33739: Merged DEV to V4.0-BUG-FIX 33723: ALF-10229: apply_amps.bat doesn't work properly from alfresco-enterprise-4.0.0a.zip Fix for apply_amps.sh to set ALF_HOME to the parent parent directory of the apply_amps script 33746: ALF-10656 SOLR: Patches execute search during bootstrap causing deadlock - Part 1: - SOLR query use during bootstrap will throw an exception - tidy up some patch beans - ignore unused AVM "sitestore" in WCMPostPermissionSnapshotPatch 33753: Remove upgrade installers from build targets git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@33758 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2012-02-08 11:06:09 +00:00
Gethin James	cf0ef30fc7	FIXED : ALF-12533: When run with -directory, MMT should only backup the alfresco.war file once ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@33735 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2012-02-07 16:57:13 +00:00
Gethin James	c4a10bfe0c	Fixed : ALF-12532: MMT should fail with an error if the target war file doesn't exist ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@33725 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2012-02-07 14:57:24 +00:00
Gethin James	0a8c0a6622	Fixed failing test 8( ... getProperties needs to return the new Editions property git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@33707 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2012-02-06 17:57:14 +00:00
Gethin James	f530502bd3	FIXED : ALF-12531: MMT needs to properly support upgrading of AMP files ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@33695 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2012-02-06 15:43:56 +00:00
Gethin James	fdc9bdfe84	FIXED ALF-12541: AMP files need to be able to be pinned to specific "edition(s)" of Alfresco ... It is now possible to specify a module.editions property (eg. community) which is checked by the MMT. Also, the version is checked on install. Also, started refactoring some of the code for better reuse. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@33668 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2012-02-06 11:11:42 +00:00
Roy Wetherall	15e0e2b55a	ALF-10198: Module component execution passes installed version not current version at component start-up ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30277 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2011-09-06 21:56:46 +00:00
Derek Hulley	2f697cebb9	Merged DEV/SWIFT to HEAD ... 26373: WIP: ALF-7339: RSOLR 009: Index track and build from SOLR - track content, track dates, basic sorting 26388: WIP: ALF-7339: RSOLR 009: Index track and build from SOLR - basic tracking of d:text and d:mltext (not dual tokenisation and identifier support) 26527: WIP ALF-7339: RSOLR 009: Index track and build from SOLR - track d:content, d:mltext, d:text - start of cross locale search and ordering support int the index (not at query time yet) - no dual tokenisation support yet - currently adding all fields for tokenized BOTH - .sort needs additional tokenisation support to use a different separator (\u0000 used to indicate locale and split stuff - better toe use {en}woof style with \u0000 split 26822: ALF-8166: RINF 10: treenode.get.js - tweak to use "childFileFolders" 26825: ALF-8133: RINF 10: ScriptNode - update "childByNamePath" to use optimised NodeService.getChildByName 26850: ALF-8133: RINF 10: ScriptNode - update "childByNamePath" to use optimised NodeService.getChildByName - follow-on to r26825 26862: ALF-8110: RINF 10: doclist.get.js - update "path" filter to use DB-based queries (by default) - milestone check-in for review and comparison (note: sorting will be pushed down as part of paging support in lower layers) 26872: Updated SOLR dev env 26915: ALF-8224: part 1: encapsulate cmis dictionary for SOLR usage 27017: Javadoc: removed uncommented param 27018: Added 'namePattern' property to NamedObjectRegistry to enforce naming conventions where required 27019: CannedQuery interface and related infrastructure - Provides basic support for query, sort, filter and page - CannedQueryFactory allows more complex implementations where required - Should be enough of a starter for tasks requiring miscellaneous queries - ALF-7167: Canned queries 27037: WCM QS Needs the Web-Client, so define the dependency to Eclipse 27041: Move WCM-QS test setup to a common base class 27044: Start to conver the WCM QS behaviour from JS to Java 27080: Added comment section for NodeLocator script declarations 27081: General cleanup: Removed non-javadocs, empty javadocs, unused code, etc 27104: Fixed ALF-7476: Typo in output from MMT 27114: ALF-7479: RSOLR 016: Query Handler ALF-7480: RSOLR 017: SOLR result set ALF-7481: RSOLR 018: Execute query against SOLR - First working stack git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28286 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2011-06-08 15:38:14 +00:00
Dave Ward	4ef5672f4a	Merged V3.4 to HEAD ... 23336: Created a branch for 3.4 Enterprise releases 23344: replaced some un-neccessary non latin chars in variable name. 23347: Fix ALF-3200 - add a policy to Sites, which stops renames occuring (renames breaks things as the name is used in various association patterns). Includes unit tests 23349: Merged BRANCHES/DEV/BELARUS/HEAD-2010_03_30 to BRANCHES/V3.4 20198: ALF-2176: Incorrect pagination for resources on Advanced Workflow Wizard The javascript onkeyup event was changed to onkeypress event in UIDataPager. It prevents a form submission before js action. 23351: ALF-5109 transfer service : replace content results in "orphans exist" failure. 23352: New (currently disabled) unit test to check that multiple threads writing to different properties via the node service on the same node don't loose updates. Test disabled pending caching fix Also tweak the tagging multi threaded test (currently disabled) to make it try a few more tags in parallel 23366: Audit method interceptor switches to pass-through if the server is read-only (ALF-5424) 23375: Fixed ALF-2825 "Display problem on Rules page when rule has a long description" & more - ALF-2825 "Display problem on Rules page when rule has a long description" - Made drag and drop adjust the "empty space" to the dragged elements height - $html alias was missing on linked to folder page after a previous merge 23376: Fix for ALF-5401: CMIS: When specifying "cmis:objectTypeId=D❌yz" in the WHERE clause, nodes of subtypes of x:yz are also returned - now only returns the specific type - unit test included 23377: Merged V3.3-BUG-FIX to V3.4 23353: Merged DEV-TEMPORARY to V3.3-BUG-FIX 20930: Fix ALF-2564 "MS office addin does not work with kerberos and cifs". Also added to Excel and PowerPoint add-ins (supplied fix was for Word only). Also updated help URLs to Enterprise. 23378: Fix ALF-4786: Update the Web Editor Help URL for 3.4 Enterprise Beta and Enterprise 23380: Fixes: - ALF-5431 WQS: latest blog article component throws an exception if the description field is empty - ALF-5426 Using double-quotes in either the title or description of an asset collection causes an error 23381: Fixed ALF-4702 "The 'Most Recently Completed Task' area should also include a Completed By: label" 23382: Made sure "empty list message" gets padding in object-finder's "list" mode 23383: WQS: Merged CSS fix from HEAD $ svn merge https://svn.alfresco.com/repos/enterprise/alfresco/HEAD --- Merging r23336 through r23382 into '.': 23384: Fix for: ALF-3164 rename LuceneQueryLanguageSPI.executQuery(..) to executeQuery 23385: Fix for ALF-5166: After restore of indexes - AUTO hangs - bulk deletes are now handled as such during index tracking and rebuild (as they are normally) 23388: Merged V3.3-BUG-FIX to V3.4 23387: Merged V3.3 to V3.3-BUG-FIX 23370: Fix ALF-5277: Excel 2007 xlsx icon not displayed in Alfresco Explorer. Re-Merged V2.1 to V3.3 6464: Added Office 2007 document mimetypes and icons 23386: Fix ALF-5427: ALF-2639 causes Edit Online button in Share to only handle http not https 23389: Fixes: - ALF-5211 Error on search with wildcards 23390: Fixed ALF-4835 "Incorrect behaviour of Cancel action" 23392: Partly fixed ALF-4678 "Incorrect workflow details if creator or assgnee was deleted" - If the assignee has been deleted the username is still displayed (but only as text and not as a link) 23394: Fix for ALF-2780 - Share/Surf don't invalidate Alfresco tickets 23396: Removed direct System.err output in ArchiveContentTransformer 23399: Fix ALF-4321: use of Ajax technology in share leeds to a stuck interface as ajax code does not handle end of sessions cases when using CAS (external) authentication 23402: Fixed ALF-5456: IP address change can cause read-write errors on startup - Simply avoid writing in a read-only transaction 23411: Added web-tier cluster sample config (ALF-3873 related) 23412: Fixes ALF-5373: Duplicate date displayed at end of summer time. 23413: Fixes: ALF-4924 by displaying more data about an event in the Dashlets if the event doesn't finish on the same day, or is an all day event. 23415: Merged V3.3-BUG-FIX to V3.4 23414: Fix for ALF-5414 - IE6 specific fixes 23417: Added a unit test to JbpmEngineTest while investigating ALF-1557. Test is commented out/disabled as it relies on a specific process definition that might be added to the list of available process definitions int he main app. 23418: Fix for ALF-5451 - Typo in webclient.properties 23420: Merged V3.3-BUG-FIX to V3.4 23419: Fix for ALF-4533 - corrected list of email templates shown - other issues mentioned CNR 23422: Fixes: ALF-5374 - add support for displaying events that span multiple months. 23424: Fixes: ALF-2989 - Incorrect sideId reference in URL for event in Site Calendar Dashlet Adds support for displaying events that start in the past but finish in the future (previously only events that start in the future were shown) 23425: Fix for ALF-5256 - Change Password link under user's name pulldown in 3.4 shows when using AD authentication 23441: Fixes: ALF-5267 - CSS Background colour for current day was getting lost in the Month View, due to a style overriding it with a paler colour that wasn't much of a contrast to the usual colour. 23442: Fixed bug ALF-4988 and also fixed several disabled unit tests. 23444: Re-enabled and fixed some failing/disabled tests in AbstractRenderingEngineTest. 23447: Temp comment out new TransferServiceImplTest with greek paths. 23459: Fixed failing RenditionServiceIntegrationTest.testRenditionPlacement() 23461: ALF-5224: Edit Online action doesn't work for invited coordinator 23462: Fixing failing test RenditionServiceIntegrationTest.testRenditionPlacement(). 23468: Merged V3.3-BUG-FIX to V3.4 23463: Merged V3.3 to V3.3-BUG-FIX 23323: Fixed PostgreSQL upgrade from V3.2.2 to V3.3.4 (Addresses ALF-5344) 23472: Fixed ALF-5408: SQL Server missing ON DELETE CASCADE declarations 23479: ALF-2643 - Deployment Service does not protect itself from poorly implemented custom DeploymentTargets 23489: Fix for ALF-4214 allowing generation of Thumbnails using RuntimeExecutableTransformationOptions. Note that this fix does not pass any execution options specified in the thumbnail definition to the content transformer, instead default transformation options are used. To fix this we will either need to define a new RenderingEngine type or modify the ReformatRenderingEngine to become aware of RuntimeExecutableTransformationOptions. 23492: Fixed ALF-5550: DB2: Unable to insert values into alf_string_value 23506: Merged V3.3-BUG-FIX to V3.4 23500: Merged V3.3 to V3.3-BUG-FIX 23499: Additional change after fix for ALF-5403 to ensure Session is not created before login page auth is successfully processed 23507: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.4: 23504: Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.3-BUG-FIX: 23297: Fixed ALF-5146: Share - Content model issue with 'dot' in a property name Also added tests for a property with a dot in the name to the FDK. 23508: Fixed ALF-5559: Permission interceptors can fail if Lucene returns invalid NodeRefs - Problem is present when the 'unfilteredFor' property is added to 'afterAcl' bean - Reproduced specific issue with unit tests and found several other failures - Currently only affects installations that include the DOD5015 module 23512: Fixed ALF-5192: Pivot translation isn't changed after modifying 23513: Merged DEV to V3.4 23511 : ALF-4200 IMAP - LSUB failed. Access Denied 23516: Added a test to test_renditionService.js to confirm RenditionService.render() is working properly. 23519: Merged V3.3-BUG-FIX to V3.4 23518: Merged V3.3 to V3.3-BUG-FIX 23517: Fix for ALF-5552 - Search based javascript APIs now handle missing nodes returned from search indexes. 23521: Fixed ALF-5529 "Incorrect behavior of tab stop indexes at Edit Metadata page for images" - ...also makes date text selection work for date field after tabbing to it, enter strokes trigger help and calendar, focus outline being displayed on icon and focus being returned after calender select - ...also fixed bug in advanced search form for date range (the hidden field was never set if from/to values were cleared) 23526: Fixed ALF-4299: NodeService: review comment vs code for setting unique name on child assoc 23530: Fix for ALF-5482: "Some patches are not being executed during an upgrade" 23531: ALF-5272: Update rule works incorrecly 23539: Partial fix for ALF-439: "My Completed Tasks" dashlet doesn't scale in the presence of large numbers of completed tasks Added ability to limit the result set size of a workflow task query so it can be used by the UI to limit the number of completed tasks shown in the dashlet. 23542: ALF-4993 : prevent transfer to self. 23544: Updated to latest revision, following updates required for ALF-4655 (IE8 CSS issues) 23546: Fixed ALF-5501 "W3C : Incorrect tab stop indexes at Start workflow page" - Alfresco.util.createYUIButton now also handles enter keys when menu is used - Fixed bug when forms are loaded using ajax (the help toggle didn't work) 23547: Made keyboard events possible in advanced search menu 23549: Merged BRANCHES/DEV/BELARUS/HEAD_2010_10_06 to BRANCHES/V3.4: 23210: ALF-4378: Lotus Quickr connector does not work with IBM Lotus Symphony 23550: Merged BRANCHES/DEV/BELARUS/HEAD_2010_10_21 to BRANCHES/V3.4: 23443: ALF-5098: SPP Module creates documents using the wrong mimetype (Octet Stream) 23551: Merged BRANCHES/DEV/BELARUS/HEAD_2010_10_21 to BRANCHES/V3.4: 23474: ALF-5490: The Subsystems configuration folder does not seem to be read when Alfresco is deployed to later versions of JBoss 23552: Merged BRANCHES/DEV/BELARUS/HEAD_2010_10_21 to BRANCHES/V3.4: 23543: ALF-5402: mailService bean should not set username or password properties when mail.smtp.auth is false 23554: Fix ALF-5170 - when you don't have permission to change a user's password (either because you're not an admin, or you mis-typed your own password), give a friendly message rather than an error stacktrace 23558: Fixed ALF-5513 "Incorrect behavior of tab stop indexes at Create Site page" 23559: Fixed ALF-5136 "My Tasks dashlet: Incorrect capitalization on mouseover text" 23561: Fixes: ALF-4569 - Removes universal override of input width box and switches the editor form panel to adjust it's width based on content rather than window size. Fixes: ALF-4570 - Adds an override for the CSS 'top' property of the form dialogue to ensure it's always below the ribbon. (Was being set automatically by the YUI widget.panel call) 23569: Fixes: ALF-5606 - Ribbon wasn't resizing correctly after the form events. 23571: Improvements to missing page and general server 500 error handling in Share. 23572: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.4: 23570: Resolve ALF-5355: ClassCastException on server side when calling SCORE() predicate (web services binding) 23573: Fix for ALF-4840: Create Job button is enabled when Start Date isn't specified 23580: ALF-3586 Verified that RenderingEngine Actions are not displayed as available actions in Share and Exporer. Now publicAction defaults to false for all RenderingEngine actions, so future RenderingEngines should be hidden in the UI by default. 23582: Fixed (Explorer) ALF-439 "My Completed Tasks" dashlet doesn't scale in the presence of large numbers of completed tasks 23584: DateTime analysis related fixes: Fix for: (ALF-4056) Content with DateTime property with the time set to 00:00:00.000 will not be found in lucene search when search is run from 00:00:00 to 23:59:29 for the same date. - bug generating range query start queries Fix tests and test models CMIS and normal query tests all run with the date and datetime analysers configured for datetime properties Fixed unreported issue with CMIS range queries for dates when using the date time analyser 23585: Fixed ALF-5372 "JavaScript error on Groups management dialog with IE8 : document.getElementById is null" 23590: MERGED V3.3 to V3.4 23545: Fixes: ALF-6568 - Broken images caused by missing URL Rewrite rule. Updated existing rules from ** to (.*) following earlier bug fix. 23591: Probable fix for ALF-4440. Renditions are not updated for working copy. As suggested in the issue, we have relaxed the restriction such that working copies now have their renditions updated in the normal way. Therefore, updates to draft (working copies) in Quickr should now cause (asynchronous) updates to any webpreview and doclib thumbnails in the normal way. As part of this change, we have also changed the behaviour so that renditions are no longer copied when a node is copied. This is relevant as when a document is checked out, a copy is made (the working copy). In order to avoid potential problems with copied rendition children being updated separately from the rendition children on the original copy, we no longer copy renditions - they will be regenerated separately for the working copies. This fix needs to be verified by a tester who has access to a running Alfresco-Quickr integration module. 23592: ALF-4350 Fix for SiteService.updateSite() regarding Site Visibility change site:siteVisibility is a d:text property and is treated as a String in all places apart from within updateSite where a Java enum is written into the db. This seems to cause a problem on the DB specified in the issue. 23608: Merge from V3.3-BUG-FIX to V3.4 23606 Dmitry/Erik's fix for ALF-1052. Webpreview of swf files. 23610: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.4: 23579: Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.3-BUG-FIX: 23576: Merged BRANCHES/DEV/BELARUS/V3.3-BUG-FIX-2010_06_24 to BRANCHES/V3.3: 20998: ALF-3764: Filepicker be able to select URLs 23609: Merged BRANCHES/DEV/BELARUS/HEAD_2010_10_06 to BRANCHES/DEV/V3.3-BUG-FIX: 23158: ALF-1838: Need to support relative url for WCM TinyMCE Filepicker. Also fixes ALF-866 (cloned version of ALF-1838). 23612: Fix for ALF-3677: Editing inline html content 23615: Resolve ALF-5044: Alfresco 3.4 fails to start on Webshere 7 with org.alfresco.service.cmr.repository.MLText ClassNotFoundException 23621: Merged V3.3-BUG-FIX to V3.4 23620: Merged V3.3 to V3.3-BUG-FIX 23619: Fix for ALF-1537 - Presentation Tier JS processor now correctly outputs different messages for when scripts: a) load incorrectly, i.e. error resolving imports or import syntax error "Failed to load script..." b) runtime execution error "Failed to execute script..." Performance improvements Cache test delay fix 23625: Fix ALF-629 - Allow the thread pool size to increase to the maximum when the queue starts to fill up, rather than only when it gets full (which is rarely will, as we want a very large queue size to avoid dropping work) 23626: Fix for ALF-906: "Impossible to create web project if rule with Copy action was applied" o ensure that WCM web projects do not inherit DM rules 23632: ALF-906: "Impossible to create web project if rule with Copy action was applied" - added missing file 23635: Merge DEV to V3.4 23627 : ALF-4947 - EML files not showing up in folder list 23636: Reverse merged HEAD to V3.4 23195: Temp comment out of ImapMessageTest (The test or the code is not wrong but the IMAP server is not running in the automated build.) 23637: Merged V3.3-BUG-FIX to V3.4 (RECORD ONLY) 23314: Merge from V3.3 to V3.3-BUG-FIX r 23311: Further fix for ALF-3991. Renditions/thumbnails cause update to modifier property. This is a reimplementation of r 23290 which was checked in on HEAD earlier. The RenditionService has been refactored between 3.3 and 3.4 and straight merges are not always possible. 23355: Merged DEV/V3.3-DOCLIB-PORTLET to V3.3-BUG-FIX 20814: Share host portlet detection and portlet action URL template and associated client-side constants. Latest SpringSurf libs to bring branch up-to-date. 20995: DocLib Portlet checkpoint: URL encoding fixes, CSS fixes, Portlet URL links generators as client-side JavaScript & Freemarker macro. "My Document Libraries" landing page. 21008: DocLib Portlet: Login page recognizes portlet mode, replaces input boxes with message "Please login via your portal.". When portlet mode detected, JSESSIONID cookie for path=/share is removed to prevent ALF-3749. URL encoding fixes. CSS fixes. Reverted patch to YUI history module. 21047: DocLib Portlet: Site title shown on all Site pages for better usability. More CSS fixes to replace some default Liferay overrides. 21078: DocLib Portlet: User profile links related to DocLib are not rendered if in portlet mode. Client-side generated links all now use one central function. 21106: DocLib Portlet: Fix missing alias 21152: DocLib Portlet: Missed a URL translation step on Rules page and default path render. URL encoding fix for file highlight parameter (double encoding issue). Fix for IE7 "empty DIV" bug relating to panel resizer & footer placement. 21171: DocLib Portlet: Fix missing Freemarker macro include 21435: Fix variable alias typo ($userProfile on details page for locked document) 21698: *RECORD ONLY* New portal distribution zip target (to create alfresco-enterprise-war-3.3-portal.zip) and draft README.txt file. * DO NOT MERGE * 21712: *RECORD ONLY* Updated README.txt * DO NOT MERGE * 22600: DocLib Portlet: New "Site constrained" portlet added where site is configured via portlet preferences. Removed CMIS portlet. 23023: Fix Share DocLib Portlet CSS issues for Liferay 6. YUI Buttons back to normal. Background now set as white. Login page no longer sets background colo(u)r of body tag. Toolbar separator styling fix. 23050: Fix "My Document Libraries" page template mapping & css tweak 23522: Merged V3.3 to V3.3-BUGFIX 23346: Brought WebQS module in (including build process but not installer elements yet) 23524: Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.3-BUG-FIX: 23371: "Simply" added wcmqs to installer 23567: Merged HEAD to BRANCHES/DEV/V3.3-BUG-FIX: 22837: Resolve ALF-5042: Default root folder path '/Company Home' not found 22845: Fix regression from resolving ALF-5042 (Default root folder path '/Company Home' not found) 23596: Merged HEAD to BRANCHES/DEV/V3.3-BUG-FIX: 20636: ALF-3157 - Conflict between IMAP and Audit 20638: ALF-3157 - Conflict between IMAP and Audit - part II update the auditConfig.xml 23634: Merged V3.3 to V3.3-BUG-FIX 23259: Merged HEAD to V3.3 23256: Fix ALF-4573: Start Workflow action is absent for edited document and working copy in Share 23391: ALF-5367: Copy dlls into tomcat/bin as appropriate. 23485: Merged V3.4 to V3.3 (fix backported for V3.3.x lines) 23472: Fixed ALF-5408: SQL Server missing ON DELETE CASCADE declarations 23535: Merged V3.4 to V3.3 (complements 23517: ALF-5552) 23508: Fixed ALF-5559: Permission interceptors can fail if Lucene returns invalid NodeRefs 23586: MERGED V3.4 to V3.3 22864: Fix for ALF-5005: "Create and edit functions on AWE become "confused"" 23042: Fix ALF-5127: Impossible to create an article/blog (WCMQS) [Must clear panel hideEvent handler if manually hiding a YUI panel] 23561: Fixes: ALF-4569 - Removes universal override of input width box and switches the editor form panel to adjust it's width based on content rather than window size. Fixes: ALF-4570 - Adds an override for the CSS 'top' property of the form dialogue to ensure it's always below the ribbon. (Was being set automatically by the YUI widget.panel call) 23569: Fixes: ALF-5606 - Ribbon wasn't resizing correctly after the form events. 23630: Backport of installer 23631: Added 64-bit & deployment installers 23639: Fix for ALF-5670: "Repository fails to start when applying patch.wcmRuleInheritance if WCM is not enabled " - removed patch, replaced with check in WebPorjectServiceImpl.getWebProjectsRoot instead 23640: Merged V3.3-BUG-FIX to V3.4 23199: Over-ride the spring config and bring up the IMAP server in the unit test start-up. 23235: Merged V3.3 to V3.3 BUG FIX 23226 : RECORD ONLY fix up of unit test 23315: (RECORD ONLY) Merge from V3.3 to V3.3-BUG-FIX r 23312: Adding explicit test case for ALF-3991. r 23313: Adding some new test classes to the convenience suite AllRenditionTests.java 23423: Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.3-BUG-FIX: - ALF-5027: When node has been created and checked out in same transaction (e.g. via CMIS or Quickr) content rules will fail 23460: Added better logging of errors when mapping NFS users to Alfresco users. Use database node id counter field value as the file id. Part of ALF-4883 and ALF-5386. 23587: MERGED V3.3 to V3.3-BUG-FIX 22864: Fix for ALF-5005: "Create and edit functions on AWE become "confused"" 23042: Fix ALF-5127: Impossible to create an article/blog (WCMQS) [Must clear panel hideEvent handler if manually hiding a YUI panel] 23545: Fixes: ALF-4568 - Broken images caused by missing URL Rewrite rule. Updated existing rules from ** to (.*) following earlier bug fix. 23561: Fixes: ALF-4569 - Removes universal override of input width box and switches the editor form panel to adjust it's width based on content rather than window size. Fixes: ALF-4570 - Adds an override for the CSS 'top' property of the form dialogue to ensure it's always below the ribbon. (Was being set automatically by the YUI widget.panel call) 23569: Fixes: ALF-5606 - Ribbon wasn't resizing correctly after the form events. 23616: Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.3-BUG-FIX: 23614: Fix ALF-5627: Transfer Service not processing deleted nodes correctly. Causing NullPointerException in receiver. 23643: Speed up AuditMethodInterceptor when it is not used - Check path matching early in interceptor 23644: Merged V3.3-BUG-FIX to V3.4 23638: ALF-2731 - hash collision in TransactionBehaviorQueue 23642: Merged V3.3 to V3.3-BUG-FIX 23261: Fix for ALF-3385 - NullPointerException printed when new browser session opens to /alfresco/faces/jsp/dialog/container.jsp# 23291: Fix ALF-5189: JSF - Links to different spaces in my Company Home are not diplayed in MS Office Add-in 23295: Fix for ALF-481 - handle both missing surname and givenname from LDAP sync in Explorer client 23296: Fix for ALF-1881 - Alfresco doesn't have protection against double clicking (merge of port from 2.2) 23302: Fix for ALF-284 - Incorrect behaviour of radio buttons on Check Out page 23311: Further fix for ALF-3991. Renditions/thumbnails cause update to modifier property. This is a reimplementation of r 23290 which was checked in on HEAD earlier. The RenditionService has been refactored between 3.3 and 3.4 and straight merges are not always possible. 23312: Adding explicit test case for ALF-3991. This is a separate check-in to 23311 a moment ago as I want to merge this test class through to HEAD but I do not want to merge 23311 to HEAD. 23313: Adding some new test classes to the convenience suite AllRenditionTests.java 23325: Fix for ALF-2098 - Incorrect work of Close button inside of created group 23327: Fix for ALF-5383 - Wiki html page viewer does not render indentation properly 23328: Merged BRANCHES/DEV/BELARUS/V3.3-BUG-FIX-2010_06_24 to V3.3 21094: Workaround provided in issue description can be used as fix because of folowing code: - Object[] params = new Object[] {action, approveFolderName, Utils.encode(approveStepName)}; - out.write(Utils.encode(MessageFormat.format(actionPattern, params))); - Utils.encode method is called twice when generating output. One of this call can be removed as unnecessary. 23337: Fixed ALF-26 "Audit Tool: Event filter doesn't work" - Commented out ui controls for "Event" & "Property" log-filters (which is implemented in the REST API but NOT in RecordsManagementAuditServiceImpl and therefore didn't work) 23342: Resolve ALF-4703: Share Unable to Edit Metadata more than Once with Auditing Enabled - if audit internal is enabled, then category service methods missing audit tags fail (also, there's an audit service method missing a tag too) 23354: Fixed ALF-5026: Change XAM property names to XAM standards - Global prefix: xam.archive.globalPropertiesPrefix=vnd.com.alfresco. - Node property prefix: xam.archive.nodePropertiesPrefix=xam.archive.node. - e.g.'vnd.com.alfresco.xam.archive.node.cm:created' 23357: ALF-4745: Removed tomcat bundles as these were incomplete and 32/64 bit specific. Installation docs already updated. 23401: Fixed ALF-4659 (ALF-4652): Configurable XAM Bindings - Added property: xam.archive.bindingPropertiesPattern=vnd\\.com\\.alfresco\\..* - Properties are non-binding unless they match pattern defined - Content property (vnd.com.alfresco.content) is always binding 23410: Merged DEV/BELARUS/V3.3-BUG-FIX-2010_10_04 to V3.3 23162: ALF-4934 Problem creating a folder using CIFS with permissions Contributor 23467: ALF-2762 : Customer-provided fix to 3.2R-SQLServer-Microsoft JDBC driver issue 1. Support of Microsoft JDBC driver was implemented. 2. Classpath was updated (jtds driver was removed Microsoft jdbc driver was added). 23471: Forget to remove old jdbc driver 23473: Fixed compile error after merge 23483: Removed MS SQL JDBC driver following rev 23467 fixing ALF-2762 23484: Re-added JTDS driver following rev 23471 fixing ALF-2762 23491: Merge DEV to V3.3 23486 : ALF-5389 - If we contribute via IMAP in outlook or outlook express,an EML file, which has embedded images and attachments, has not his body content indexed 23537: Fix to RM module since changes to action service config. 23545: Fixes: ALF-6568 - Broken images caused by missing URL Rewrite rule. Updated existing rules from ** to (.*) following earlier bug fix. 23566: Fixed ALF-5545: XAM connector xam.archive.node.* properties not set 23623: Merged PATCHES/V3.3.3 to V3.3 23622: ALF-5611: Fix calendar page by bracketing freemarker default operator to avoid any ambiguity. See http://freemarker.sourceforge.net/docs/dgui_template_exp.html#dgui_template_exp_precedence 23624: Merged BRANCHES/DEV/BELARUS/V3.3-2010_11_10 to BRANCHES/V3.3: 23602: ALF-5517: Webdav "supportedlock" propfind request fails if locking enabled 23646: Merged V3.3-BUG-FIX to V3.4 23430: Merged V3.3 to V3.3-BUG-FIX 23429: Merged PATCHES/V3.2.0 to V3.3 23428: ALF-5141: Further refinement of transaction limiting behaviour - Once accepted a transaction will be retried until it succeeds or the retry limit is exceeded. No limiting of retries by time as otherwise likelihood of any transaction succeeding under load is small - Default web transaction threshold is now 20 seconds to avoid problems on non-loaded systems - Record stack traces of tracked transactions to help debug slow transactions 23645: (RECORD ONLY) Merged V3.3 to V3.3-BUG-FIX 23515: Merged PATCHES/V3.2.0 to V3.3 23514: ALF-5554: Merged HEAD to V3.2.0 23153: When updating tag scopes following system shutdown/restore, be smarter about quickly skipping tag scopes that another (new) thread is currently working on 23283: More debugging level logging for tagging updates, to help identify the problem with periodic multi-threaded test failures on bamboo 23564: ALF-5600: Merged V3.4 to V3.3 23424: Fixes: ALF-2989 - Incorrect sideId reference in URL for event in Site Calendar Dashlet Adds support for displaying events that start in the past but finish in the future (previously only events that start in the future were shown) 23648: Update Tika + dependencies (including PDFBox to 1.3.1, and a slightly newer POI). Fixes ALF-5645 and ALF-5646 23649: ALF-5648 - When rendering word to html in body contents only mode, don't include the xml definition 23653: Performance improvements: - reduce calls to servlet container getResource() method during REST heavy apps - improve audit interceptor (Derek supplied 1st part of improvements in rev 23643) Overall 20% improvement since performance issues noted a few days ago. Share multi-user read tests with x20 users. Performance is now slightly better than previous record from 3.4 on 5/7/10. ENT 3.4.0E 11/11/10 10 users x5 rep, 10sec so - time 3rd run - 80ms, 20 users x5 rep, 10sec so - time 2rd run - 168ms ENT 3.4.0E 15/11/10 (after performance tweaks) 10 users x5 rep, 10sec so - time 3rd run - 55ms 20 users x5 rep, 10sec so - time 2rd run - 125ms 23655: Add more tests for name and role filtering when listing site membership (Related to ALF-5314) 23656: Fix for ALF-5674: The association picker control allows content nodes with children to be navigated 23657: Fix ALF-5314 - expose the siteService flag of collapseGroups from listMembers to the listMembers method on the site object itself, and make use of this when searching for people who are site members in Share 23658: Follow-up to r23644: Add reference to validation.js in Enterprise overlay file 23659: Fix for ALF-906: "Impossible to create web project if rule with Copy action was applied" - moved add aspect to createWebProject method 23660: Fixes ALF-3783: When searching in Advanced Search, russian letters are encoded incorrectly. Mootools replaced with uncompressed source copy with annotated modifications. Then YUICompressed at build-time to generate mootools-v1.11.js 23663: Fixed ALF-5462 "The workflow details doesn't/can't display the group the current task is assigned to when it is pooled and not claimed" 23665: Fixed ALF-4556 "Error occurs on search by wildcards" 23667: Push the logging log4j definition bean out into another context file, included from core-services-context.xml (rather than being defined directly in it). This allows you to write a unit test without the main context, but still with our log4j settings 23668: Tweak DynamicallySizedThreadPoolExecutor logging, and have log4j settings used by DynamicallySizedThreadPoolExecutorTest even if the full repo context isn't loaded 23670: Fix ALF-5609: Incorrect behavior of messages mimetype for Share and Quickr connector 23671: Merged /BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.4: 23666 (record-only): Fixes ALF-5691: TransferService: Multi-byte characters are not encoded correctly 23673: RM Audit: - ALF-5307: Audit doesn't work for RMA - Buttons on audit console now reflect the current state and are initialised correctly when the console is first shown. - ALF-5616: Start and stop date are not being set correctly 23675: Fix for ALF-5244: Issues with selectmany.ftl control Option and label separators can now be configured like selectone, the control now also shows the label (when present) not the raw value in view mode. Also fixed a couple of selection bugs. 23677: Merged V3.3-BUG-FIX to V3.4 23676: Fix ALF-4035: Properties with underscores are not displayed in datalists 23678: Fix transformationOptionOverrides related warnings for the includeEmbedded, by converting the string to boolean before setting the bean property if needed 23679: Fixes: ALF-5595 - updated files to reflect supported language packs & added the file to the enterprise overlays build/clean targets 23680: If thumbnailing cannot be performed either due to no transformer existing, or the transformer being unavailable, deliver more helpful log messages than before (but at the same priority). Related to ALF-5158 23685: Fixed ALF-4744 "Selectable resources aren't limited to the current site in case workflow is started from details page" - added "item.location.parent.nodeRef" in remote-api slingshot webscript 23686: Merged BRANCHES/DEV/BELARUS/V3.4-2010_11_11 to BRANCHES/V3.4: 23672: ALF-5597: Nodref is a mandatory parameter notification pops up when Sites is selected (Quickr connector v 8.1.1.175). 23688: ALF-5405: Strange behavior with long names - Now if at NodeService enters invalid QName will occur IllegalArgumentException instead of DuplicateChildNodeNameException - Method QName createValidLocalName( ) is override - It is added jUnit test Such behavior allows to avoid an undesirable situation 23693: Fixing bug introduced when fixing ALF-5529 (r23546) - Enter key & mouse click events from Alfresco.util.useAsButton returned different parameters to the same callback, now fixed 23698: Use the smaller netcdf jar to avoid SFLJ warnings 23699: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.4: 23697 (record-only): Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.3-BUG-FIX: 23695: Fixed bug exposed after fixing ALF-5699. Parsing of MLText properties out of the transfer snapshot file was incorrect, and that was causing multi-lingual property values to be duplicated 23700: ALF-3084 Checking out documents no longer updates the modifier/modified date. 23702: Fixes ALF-5671: TransferService: BeforeStartInboundTransferPolicy now being fired *after* the transfer lock has been taken 23703: Fixes: ALF-5633 - Date string not localisable in Blog Archives list 23710: Fix for ALF-4678: Incorrect workflow details if creator or assignee was deleted 23715: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.4: 23713 (record-only): Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.3-BUG-FIX: 23709: ALF-5699: Fix NPE in ManifestIntegrationTest 23719: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.4: 23717: Fix for ALF-5703: Error when creating a folder within a container using Webscript 23720: Merged BRANCHES/DEV/BELARUS/V3.4-2010_11_11 to BRANCHES/V3.4: 23669: ALF-4357: Bitrock Installer: Remote JMX connections fail 23721: ALF-3044: Audit log is incorrect when trying to filed it as record 23722: ALF-5405: Strange behavior with long names Code justify in according to coding conventions: - 4 spaces for a tab - Braces on new new line - 120 char line lengths 23723: Declare all Share UI support webscripts as "internal" lifecycle 23724: Remove unnecessary css include from RM-audit component 23729: Fixed ALF-5087 "My Sites Dashlet does not persist the filter setting for All Sites | Sites | Favorite Sites etc" - Filter is now persisted as property - Calls to get sites & preferences was implemented both server and client side, now client only. - Cell renderers has been refactored from inline to member methods - Native button/dropdown are hidden until yui components is created to avoid ui jumping around... - ...which also causes the annoying "gap" when resizing which now has been fixed for both My Tasks & My Sites 23730: ALF-2598 - temp disable Imap Cache - will murder performance but pass unit tests. 23732: Fix to output of error message in doc summary and image dashlet 23733: Performance tweak 23736: Merged V3.3-BUG-FIX to V3.4 23735: *RECORD ONLY* Merged V3.3 to V3.3-BUG-FIX 23734: Merged V3.4 to V3.3 23731: Fixes for ALF-3098 and ALF-3097 - Share - Security check on Personal Dashboard - only the owning user can view a user dashboard page - Share - Security issue on Customize Site Dashboard - private and moderated site dashboard pages no longer visible to non-members, customise site and dashboard pages only accessible to SiteManager 23739: A bit more logging to try to spot why bamboo is different, and add another test 23741: ALF-4947 - EML files not showing up in folder list 23749: Fixed formatting: Removed tabs (ALF-5405 fix follow-up) 23750: Fix unit test (ALF-5405) to check for expected exception 23751: Prepare for ALF-5575: Remove redundant cache config entries and fix typos 23753: Fixed ALF-5087 "My Sites Dashlet does not persist the filter setting for All Sites | Sites | Favorite Sites etc" part 2 - My Tasks dashlets second toolbar became a bit to high, now fixed 23754: Fixed ALF-2975 "Layout is broken for Audit in IE" 23755: Work around the fact that some JVMs fail to properly implement the ThreadPoolExecutor specification, and consequently sometimes kill off threads that are in the core pool. Tests now look for either the specification required behaviour, or the broken behaviour 23756: Change to test code for DynamicallySizedThreadPoolExecuter. Removed unecessary assert which fails on some OSes. Nick B. 23763: Clean-up login template controller script 23764: Fixing a typo in test include/exclude spec which meant that WebScriptTestSuite was not being run. 23766: Fixed ALF-3823 "Share: RSS feed can't be read: http://cds-srv.sun.com:8700/rss/update/public/sunalert_update.xml - ok with other RSS client." 23768: Add new unit test for international category names. Shows that english, spanish and french works fine, but that there's something a little iffy with japenses 23773: Fix for ALF-5240: Something odd happens in My Content page on adding comment 23785: Fix for ALF-1728: User with administrative rights can paste content into staging. 23788: Method naming fix (ALF-5405 follow-up) 23793: Merge from V3.3-BUG-FIX to V3.4 r. 23791 Fix for failing test cases SiteServiceTest and InviteServiceTest. I have used susbsystem bean overriding to turn off emails on the MailActionExecuter bean. 23800: Fix for ALF-5569: Error trying to change discussion's name 23805: Add a pure nodeService test for the Japanese write/read issue in ALF-5594. This test will almost certainly break on some db flavour builds on panda, but we want to know which systems are affected (before commenting it out pending the fix) 23806: ALF-5087 "My Sites Dashlet does not persist the filter setting for All Sites | Sites | Favorite Sites etc" part 2 - Now provides default filter if not set 23810: Merged from V3.3-BUG-FIX to V3.4 (RECORD ONLY) 23809: Merged from V3.3 to V3.3-BUG-FIX 23790: Fixed ALF-3823 "Share: RSS feed can't be read: http://cds-srv.sun.com:8700/rss/update/public/sunalert_update.xml - ok with other RSS client." 23818: Merge from V3.3-BUG-FIX to V3.4 r. 23817: Further fix for InviteServiceTest failing tests. 23825: ALF-3066: Google docs - Document not deleted when checked in 23826: Prevent 'nodeOwner' cache invalidation during node creation 23827: Prevent cache case flip-flopping on encoding strings 23828: Removed some TODO notes 23829: Single minor format 23830: Generics warnings 23831: Added 60s timeout on mutable node-related caches (ALF-5575) 23832: Trimming on cache invalidation during put 23833: Fixed ALF-5575: Enable ConcurrentNodeServiceTest.testMultiThreadedNodePropertiesWrites - Prevent read txns from adding stale data to caches while writes are in progress - Added cache tests for mutable caches and read-only transactions 23834: Fixed ALF-5763: Corrected capitalization. 23838: Corrected an overzealous method rename refactor in QName to not throw a null-ptr-exception. 23839: Merge from V3.3-BUG-FIX to V3.4 r.23837: Reimplementation of the build fix for InviteServiceTest. This one won't send emails. 23840: Merge from V3.3-BUG-FIX to V3.4 r.23837 Reimplementation of the build fix for InviteServiceTest. This one won't send emails. This check-in is merge properties on root. Couldn't check in previously (23839). 23843: Added debug output for failing workflow REST API test as it works fine on my local machine. 23852: Fix for ALF-5664: Aspect Mandatory Aspect leads to failed to find property/association definition for property/association 23856: Added explicit failure for dangling test transactions 23858: Fix ALF-4277: Link with a long description is displayed incorrectly 23861: Fail on dangling transactions 23869: Added system property 'system.cache.disableMutableSharedCaches' (false by default) - Equivalent to disabling Hibernate L2 cache - Can be used as a diagnostic feature to quickly check for cache problems 23871: Merged DEV/TEMPORARY to V3.4 23759: ALF-4357: Bitrock Installer: Remote JMX connections fail 1. Default RMI bind to all interfaces via alfresco.rmi.services.host 2. New property alfresco.rmi.services.external.host with default value ${localname}. This represents the externally-resolvable host name of the RMI server that should be published in the stubs. 3. jmxUrl gets a hostname from sysAdminParams 23770: ALF-4357: Bitrock Installer: Remote JMX connections fail Additional jmx.remote.rmi.server.socket.factory configuration for ConnectorServerFactoryBean 23781: ALF-4357: Bitrock Installer: Remote JMX connections fail Configuration of alfresco-virtserver-context for use a alfresco.rmi.services.external.host property 23783: ALF-4357: Bitrock Installer: Remote JMX connections fail Configuration of alfresco-virtserver-context for use a alfresco.rmi.services.external.host property 23879: Fixed ALF-4687 "Folder with name 'null' is created in the site space" 23882: Merged V3.3 to V3.4 23860: Improved fix for ALF-5448 - Pickers no longer return hasChildren information. This reduces the number of getChildAssoc() calls required from N+1 to 1. - Cleaned up and improved hasChildren() methods on ScriptNode and BaseContentNode. - Fixed up Share pickers to not expect hasChildren info Fix for ALF-5848 - object picker now allows navigation down into cm:category objects 23884: When testing the Replication Service and the underlying Transfer Service blows up, tidy up the transactions before reporting the problem. This allows all the tests to run even if some are failing (which they currently are, due to a TransferService regression) 23888: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.4: 23886 (record-only): Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.3-BUG-FIX: 23883: Fixes ALF-5759: WQS: Attempt to copy a website section fails 23890: Fixes for date time ALF-695: Date time tokeniser will include all parts of date and time - even when searching with just date - so lenient dates fail Fixed CMIS date ranges (with unit test) Other unreported date-time fixes 23892: Upgrade Tika and POI, so we get lower memory parsing of .xlsx files (switches from DOM based to SAX based). Custom build containing TIKA-521 23893: Fix for ALF-466: Impossible to 'remove' association in a workflow (Explorer client) 23894: Merged V3.3-BUG-FIX to 3.4 23872: Merged V3.3 to V3.3-BUG-FIX 23868: Merged PATCHES/V3.3 to V3.3 23848: (RECORD ONLY) Merged DEV/TEMPORARY to PATCHES/V3.3.3 23847: ALF-5448 Cannot upload attachments to data lists (https://issues.alfresco.com/jira/browse/ALF-5448) Additional property hasChildren and corresponding getter method was added to ScriptNode and BaseContentNode. 23860: (RECORD ONLY) Improved fix for ALF-5448 - Pickers no longer return hasChildren information. This reduces the number of getChildAssoc() calls required from N+1 to 1. - Cleaned up and improved hasChildren() methods on ScriptNode and BaseContentNode. - Fixed up Share pickers to not expect hasChildren info 23863: Fix PolicyTest 23899: When trying to figure out the encoding of a piece of text, if the current guesser doesn't know, try Tika before giving up and going for the default. (ALF-2534) Also adds some more tests for encoding detection 23908: ALF-5435: Declare as record action is missing for emails 23914: Merged V3.3-BUG-FIX to V3.4 23913: Fix ALF-3067: Script error at the 'View Details' for record 23916: Fix ALF-3173: Favorite sites a user is not a member of cannot be removed from the Sites dropdown. 23918: Fix up transfer unit tests and wcm quickstart following ALF-5575 23925: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.4: 23911: Fix for ALF-5621: "Long-running patches can result in a database connection closed exception" - added requiresTransaction flag to patch-services-context - refactoring to allow a patch to be called with no enclosing transaction if requiresTransaction == false 23915: Fix for ALF-5621: "Long-running patches can result in a database connection closed exception" - added missing file 23928: Merged V3.3-BUG-FIX to V3.4 23927: Fix for ALF-5867 - Forms dependencies (CSS and JS) not getting loaded by Forms UI 23932: Merging from V3.3-BUG-FIX to V3.4 r23903: ALF-5385 Now paging is enabled on groups GET REST API. Also fixed an issue where GroupsTest.testSearchGroups() was failing. 23933: Follow-up fix to r23908 23940: Fix for ALF-5880 23944: Merged V3.3-BUG-FIX to V3.4 23943: Fix ALF-5316: Event isn't removed after re-scheduling disposition. Also fixes tree not updating when new containers are created. 23950: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.4: 23942: Fix for ALF-5783: Not possible to override the output path pattern anymore when a webform is edited for a specific website 23951: Backing out previous change as the solution needs re-implementing for the 3.4 branch 23954: Merged V3.3-BUG-FIX to V3.4 23953: Fixed ALF-2830FOR "REVIEW: In mytasks(panel) webscript, "Task Done" button hidden in French" part 2 23949: Fixed ALF-2830 "FOR REVIEW: In mytasks(panel) webscript, "Task Done" button hidden in French" * Removed hardcoded width 23955: When the Text to PDF content transformer is reading in the text file, pay attention to the encoding of the file when constructing the InputStreamReader. Also includes a disabled unit test, which seems to show up a PDFBox bug. (ALF-2534) 23960: Merged DEV/BELARUS/V3.4-2010_11_11 to V3.4 23910: WCM: upgrade / re-index can fail on 3.4 if link validation (now removed) was previously being used - Incremented schema number as well 23963: Merged V3.3-BUG-FIX to V3.4 23962: (RECORD-ONLY) Merged V3.3 to V3.3-BUG-FIX 23961: Fixed ALF-5686 "Incorrect behaviour of "All" filter in "My Tasks" dashlet" 23967: Merged V3.3-BUG-FIX to V3.3 - 23966: DOCLIB: Tags are not displayed 23969: Removed case sensitivity for UTF-8 encoding 23972: Fix for ALF-5798: "Quartz 1.7.3 and higher phones home" - added a flag to quartz.properties to stop the phone home 23975: ALF-5346 Added a unit test to AlfrescoJavaScriptIntegrationTest. 23980: Merged: From V3.3-BUG-FIX to V3.4 23979: Merged From V3.3 to V3.3-BUG-FIX 23970: Fixes: ALF-5858 (Javascript error caused by files 404'ing) - URLRewriting bug introduced in r23545 23986: Fix for ALF-4646: Workflow REST API webscripts do not have sufficient documentation 23992: Enhanced the select controls to allow a default, initial selection to be specified either in component binding properties or on the URL. The value is ignored if a value is already set for the property. To use this feature use the new "defaultValueContextProperty" control parameter, for example: <field id="ws:language"> <control template="/org/alfresco/components/form/controls/selectone.ftl"> <control-param name="options">en|English,fr|French,de|German,es|Spanish,it|Italian</control-param> <control-param name="defaultValueContextProperty">localeId</control-param> </control> </field> 23993: Building blocks for ALF-5084. A new ActionConditionEvaluator for has-child. 23997: Fix ALF-5731: Saving a doc from Office 2003 via WebDAV fails 24003: BatchProcessor always calls afterProcess now (as per Javadoc) 24004: Undid rev 23827: Prevent cache case flip-flopping on encoding strings 24006: Merged V3.3-BUG-FIX to V3.4 24005: Fix ALF-4368: Share - File menu not loading properly on IE 24010: Merged V3.3-BUG-FIX to V3.4 24009: *RECORD ONLY* Fix ALF-3155: Site Calendar dashboard works incorrectly 24015: Merged V3.3-BUG-FIX to V3.4 24014: Merged V3.3 to V3.3-BUG-FIX 24013: Fix for ALF-5897 - AWE - HTTP authentication requested when page loaded - AWE login fails 24018: Avoid a NullPointerException if the action lacks a noderef 24024: ALF-4066: Creating RM Folders via IMAP in email client throws errors - Adding a folder to a category now automatically downcast the folder to a record folder 24026: Fix ALF-5567: TinyMCE language fails to load custom language in forms engine. Also code standards for some related code. 24028: Fix for ALF-5788: Outlook 2003: event isn't deleted in Share if it was deleted in Outlook 24032: Fixes ALF-5885: Inserting document to wiki page causes an error 24048: Fix for ALF-5897 - updated surf.xml to set correct user factory 24051: Removed 'Delete All Items' from trashcan dialog' (part of ALF-1990) 24052: Fixed ALF-1990: Trashcan "Delete All Items" button might not delete all items - Pulls back all items for batch-processing - Fixes bug but needs enhancement to use pageable node query 24056: Fixed SAIL-367 "REfactor header.css to avoid needing a ie8.css" 24057: Fix for ALF-5620 sitePreset filter in siteService.listSites not working 24068: Merged V3.3-BUG-FIX to V3.4 24067: *RECORD ONLY* Fix ALF-5973: Web QuickStart module breaks Share DocLib since Portlet merges 24069: Merged BRANCHES/DEV/BELARUS/V3.4-2010_11_11 to BRANCHES/V3.4: 24045: ALF-5781: Non-recurrent event is displayed with "Recurring" label 24090: Fixed ALF-4972 "Custom workflow is not sorted in workflow list" - now ignoring case and falls back to name if title isn't present 24097: Fix for ALF-5802 - comment based discussions removed from repository search results. 24098: Add user/permissions related copy test. Currently disabled as something relating to ALF-5288 seems to be wrong 24099: Fix for ALF-5976: Email Notify Templates not being picked up in Share Rules Send Email UI (requires server restart) The allowable values of parameter constraints were indeed being cached, I have added a new property on BaseParameterConstraint which allows the caching to be turned off as follows: <property name="cacheAllowableValues" value="false" /> 24100: ALF-4357: Fix random unit test failures due to RMI registry lookup - Implement equals() and hashCode() methods in HostConfigurableSocketFactory! - Don't ask me how many hours I wasted on this! 24102: Further ALF-1990: Removed redundant permission check and fixed tests to check failure reports properly 24103: Encoding DAO returns uppercase values; internally, DB was always using lowercase 24104: More put and set trimming to avoid cache remove calls 24105: Fixed unit test to explicitly recognisable UTF-8 characters - Tika was interpreting lame text as ISO-8859-1 - EncodingDAO case-sensitivity fix got past first failure and onto second, thus obfuscating the root cause 24114: Fix for ALF-2309: "FTP server can retrieve and overwrite files already moved away from current folder" - node paths were inconsistent for moveNode. Fixed them to be consistent. 24115: Fix failing unit test. In WorkflowTestSuite, shut down the application context used by the other tests before starting JBPMEngineUnitTest. Also reset the WorkflowTaskInstance singleton. 24123: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.4: 24122: (RECORD ONLY) Fix for ALF-5710: It is impossible to create category in RM with FDK installed 24126: Fixes: ALF-4775: UI Spelling mistake corrections 24140: ALF-170: The user has all rights for audit once "Access Audit" capability is added to him - Capabilities added to the underlying audit service blocking access to audit functions as expected - TODO UI still needs updating - TODO export fn still needs isolating 24142: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.4: 24141: (RECORD ONLY) Build fix 24144: Removed tabs 24145: Fixed test to use 'system' user after permissions were tightened around RM audit (ALF-170) 24146: Correctly disable a supposedly disabled test, pending a proper fix for the underlying issue (ALF-5288) 24154: Merged V3.3-BUG-FIX to V3.4 24152: Merged V3.3 to V3.3-BUG-FIX 24151: Merged V3.3.3 to V3.3 24150: Further fix for links list issue identified in ALF-5966 24163: Fix for ALF-5954 - username uri encoding 24164: Put tearDown deletes in transaction 24174: Added 3rd-party license 24180: 24186: Fix for ALF-438: Error appears after adding a content to space where content rule 'Check Out in the current space' was created. 24187: ALF-5400: Merged V3.3 to V3.4 23650: Switch off transaction limiting for now, pending further investigation 24191: MERGED V3.3-BUG-FIX to V3.4 23864:Merge BRANCHES/DEV/BELARUS/V3.3-2010_10_22 to V3.3_BUG_FIX 23229 : ALF-5239 WebDAV shows incorrect creation date 23652 : ALF-4902 - MS Word 2003 stuck and exception org.alfresco.jlan.server.filesys.AccessDeniedException: Get file information 24192: Performance and scalability improvements related to thread blocking in FreeMarker related classes - replacement of single ObjectWrapper related class with threadlocal version - replacement of MRU cache implementation (synchronized) with concurrent version 24193: Removed svn:mergeinfo again. Please read: https://ts.alfresco.com/share/page/site/eng/wiki-page?title=Merging_Guide 24194: Merged V3.3-BUG-FIX to V3.4 24138: Fix bootstrap ordering so that modules can override Enterprise-only beans (ALF-6010) 24139: Fixed ALF-6010: Content URL recognition errors during bootstrap re-indexing 24170: XAM: Removed more hacks (ALF-6010) 24196: Test refactoring as part of investigation into ALF-5969. JodConverter-based transformation/extraction tests now pass if OOo is not available on the machine running the test. Also some minor refactoring of the temporary node tidy-up code. And I've enabled these tests in the build. 24197: Merge V3.3-BUG-FIX to V3.4 23742 : Merge DEV to V3.3_BUG_FIX 23738 : ALF-5520 - IMAP metadata extractor fails to extract dates spanned on two lines 23865 : Merge V3.3-BUG-FIX-2010_07_13 to V3.3_BUG_FIX 21263 : ALF-2880: Share - Exception when making a site "moderated". 23866 : Merge V3.3-BUG-FIX-2010_09_20 to V3.3_BUG_FIX 22634 : ALF-3859 Module Management Tool stops applying amps if one amp fails when using the -directory option. 24031 : ALF-5553 - Email preview style lost on Outlook 2007 24085 : ALF-5928 - Undeclared email can't be copied 24092 : Fix unit test following change for ALF-3859 24169 : ALF-5919 - Error on start Alfresco page in read-only mode (NTLM specific) 24198: Merged V3.3-BUG-FIX to V3.4 23758: (RECORD ONLY) Merged V3.4 to V3.3-BUG-FIX 23787: ContentStoreCleaner exits silenty if it can't get the job lock 23906: Fixed ALF-5119 (ALF-4652): Prevent lock and archive removal until retention period has passed 23934: (RECORD ONLY) Merged V3.3 to V3.3-BUG-FIX 24002: CreateNodeRuleTrigger was not doing anything when cm:noContent aspect was added 24201: Merged V3.3-BUG-FIX to V3.4 24172: Orphan cleanup code is more sensitive to unsupported URLs (helps ALF-5533) 24173: Part 1 of ALF-5533: XAM orphan cleanup after rollback or retention job cleanup 24175: Part 2 of ALF-5533: XAM orphan cleanup after rollback or retention job cleanup 24210: Merged V3.3-BUG-FIX to V3.4 23956 : Merged DEV TO V3.3_BUG_FIX ALF-4546 : Moving a secondary child node using a file protocol adapter (such as CIFS) moves the primary child node 24214: When the tagging service updates the tag scope values in the background, don't fire behaviours for the change as it's an internal system task. Adds a unit test for this, and for general permissions + tagging for ALF-5504 24217: Put deletes into transaction in tearDown() 24218: Merge V3.3-BUG-FIX to V3.4 24017 : ALF-5647 : Empty 'addressee(s)' metadata in share when a mail rfc822 is pushed using IMAP 24027 : ALF-4647 - missed check in from 24017 Merged DEV/BELARUS/V3.3-BUG-FIX-2010_11_09 to V3.3_BUG_FIX 24086: ALF-5495 - IMAP encoding bug: pushing-poping a message with Content-Transfer-Encoding: 8bit to IMAP server corrupts encoding Merged BELARUS/V3.3-BUG-FIX-2010_11_09 to V3.3-BUF_FIX 24121 : ALF-5647 - Empty 'addressee(s)' metadata in share when a mail rfc822 is pushed using IMAP 24219: removed file that should not have been added. 24220: Fix ALF-5568: Shortcoming of export/import mechanism 24221: Patched build of JodConverter. Hopefully this will help with ALF-5969. I have added logging during JodConverter init and during soffice process init. 24222: Fix typo in message bundle whilst investigating ALF-5650 24223: Null pointer exception in ImapFolderSecurityInterceptor 24224: Fix for ALF-219. Impossible to transform from .html to .pdf for empty files This was due to a bug within JooConverter - the Community Edition 3rd party lib for OOo connection. It handles zero-length files a little unpredictably, producing NullPointers, unreadable PDF docs and someties crashing the soffice process depending on input. OOo seems to do a good job itself with empty files, so OOo is not the problem. I have added a workaround whereby for zero-length files that are going to OOo via JooConverter for transformation, instead of using OOo we use Apache PDFBox to produce an empty PDF file. 24225: Excluding **OOoTest from the JUnit test patterns as they are causing the build to hang. They work fine on my machine. Honest! Will investigate more closely on Windows OS next week. 24226: Added an impl comment about a potential future pdfbox improvement. 24229: Fixes: ALF-5991 - Removed space to fix JDK specific issues w/ string. 24231: Custom build of JodConverter. Added logging to WindowsProcessManager. Removed an unnecessary executor.shutDown() call from ManagedOfficeProcess. 24232: Completed fix for ALF-5802 - comments filtered for document library items as well as repository items 24233: Removed svn:mergeinfo on root 24235: Merge V3.3_BUG-FIX to V3.4 24234 : ALF-5844 - Defining the Lockable aspect as mandatory causes UnsupportedOperationException when checking out content 24236: Fix for ALF-3941: SSO Share with CAS - external-auth and SSOAuthenticationFilter - SSOAuthenticationFilter uses Kerberos example condition - its name has been changed so you have to rename it into scope. - Added supporting comments to both sections 24240: Fixed ALF-5999: Alfresco 3.4 startup fails with XAM connector module - Enterprise modules were not being built (Kofax and XAM) - Added release version number to AMP files as well as XAM jar 24241: Merged V3.3-BUG-FIX to V3.4 24077: ALF-5471 part 1: 'authorityMigration' patch can report 'Node does not exist' 24078: ALF-5471 part 2: 'authorityMigration' patch can report 'Node does not exist' 24243: Fixed ALF-6028 "Impossible to reject invitation due to script error" 24244: Merged V3.3-BUG-FIX to V3.4 24242: Fix ALF-5608: Script error after 'Edit' on My Spaces List Dashlet. Also fix "More actions..." link going to wrong details page. 24247: temp commit of imap message test - will be reinstated soon 24251: Fix ALF-5992: Language pack errors in Share - It's impossible to delete group with native chars in names (IE specific) 24265: Merged V3.3-BUG-FIX to V3.4 (RECORD ONLY) 23744: Merge V3.4 to V3.3_BUG_FIX 23513 : Merge DEV to V3.4 ALF-4200 IMAP - LSUB Failed. AccessDenied. 23758: Merged V3.4 to V3.3-BUG-FIX 23688: ALF-5405: Strange behavior with long names 23722: ALF-5405: Strange behavior with long names 23749: Fixed formatting: Removed tabs (ALF-5405 fix follow-up) 23750: Fix unit test (ALF-5405) to check for expected exception 24120: ALF-5997: Merged V3.4 to V3.3-BUG-FIX 23551: Merged BRANCHES/DEV/BELARUS/HEAD_2010_10_21 to BRANCHES/V3.4: 23474: ALF-5490: The Subsystems configuration folder does not seem to be read when Alfresco is deployed to later versions of JBoss 24124: ALF-5988: Merged HEAD to V3.3-BUG-FIX 23231: Merged DEV/TEMPORARY to HEAD 23227: ALF-5271 : Win7+Kerberos+Spp problem 1. Vti-context.xml was updated for sharepoint module to allow jetty support requests with total size of headers up to 8k. 24177: ALF-5178: Merged V3.4 to V3.3-BUG-FIX 24070: Merged DEV/BELARUS/V3.4-2010_11_11 to V3.4 24011: ALF-5618: Webdav with MAC OS X problems - Locking / unlocking creates new versions 1. WebDAV locking properties was added to excluded in VersionableAspect 2. Appropriate JUnit test created. 24101: Disabled test and reopened ALF-5618 24117: Fixed test inter-dependencies on 'excludedOnUpdateProps' for ALF-5618 24259: Merged V3.3 to V3.3-BUG-FIX 23747: ALF-5696: Merged V3.4 to V3.3 23585: Fixed ALF-5372 "JavaScript error on Groups management dialog with IE8 : document.getElementById is null" 24132: Disable intermittent failing unit test 24148: ALF-6007: Merged HEAD to V3.3 23049: Fixed ALF-5099: Error when trying to go back in Create Web Content Wizard (only with certain XSDs) 24266: Merged V3.3-BUG-FIX to V3.4 23761: ALF-5358: Invalid JavaBean property 'blockedSenders' being accessed! - renamed List versions of setAllowedSenders and setBlockedSenders 23769: Fixing typo in build.xml that means WebScriptTestSuite was not being run. 23844: Fix for ALF-1084, ALF-5792 - handling of character encoding as specified in XML file header when missing from response headers. Fixes issue with non-ascii characters in RSS feeds in Share. 23878: Build fix. InvitationTest. Minimally refactored a test case to disable email sending properly. 23895: Backported fix from rev 23838 - QName refactor causes null-ptr-exception from Upload Content dialog in Explorer. 23917: Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.3-BUG-FIX: 23912: Fixes ALF-5878: WQS: Alfresco sessions ramping up rapidly 23921: Fix for ALF-5826 - Infinite loop while closing "Manage Multilingual Content" dialog. 23924: Merged V3.3-BUG-FIX-2010_10_04 to V3.3-BUG-FIX 23416: ALF-5301: TinyMCE is replacing carriage return with white spaces. 23979: Merged V3.3 to V3.3-BUG-FIX: 23970: Fixes: ALF-5858 (Javascript error caused by files 404'ing) - URLRewriting bug introduced in r23545 24001: Merged BRANCHES/DEV/BELARUS/V3.3-2010_11_10 to BRANCHES/DEV/V3.3-BUG-FIX: 23971: ALF-1948: Deleting a freshly created file doesn't remove it from a user sandbox - also minor formatting & extra tests 24007: Merged BRANCHES/DEV/BELARUS/V3.3-2010_11_10 to BRANCHES/DEV/V3.3-BUG-FIX: 23971: ALF-1948: (commit mergeinfo !) 24055: ALF-5897: Updated surf.xml to set correct User Factory 24108: Fix CIFS memory pool leak, in IPC$ processing. ALF-483. 24129: ALF-5458 Adding paging support to Groups REST APIs. 24156: ALF-5663 - Deadlock during StatusTemplate lookup in AbstractWebScript (already present in V3.4) 24181: Added catch block for access denied error in store file processing, returns a 451 error to the FTP client. Part of ALF-6020. 24182: Convert open content for write errors to an access denied exception, fix for FTP NPE and will also be handled by CIFS protocol code. ALF-6020. 24252: Fixed ALF-5677: Extremely long launch of the Alfresco server with connector V1.2 - Avoid any ContentReader interaction (incl. exists checks) when 'lucene.maxAtomicTransformationTime=0' - Prevents slow XAM-based XSet operations from slowing reindexing - As a side-effect, text/plain content is now treated the same as transformable content when the transformation time is 0 24255: Check URL support and read-only state in afterRollback cleanup of orphaned content URLs (ALF-5677) 24256: Neatened code 24257: Fixed integrity checking when properties have been removed from model 24258: Helper DEBUG for diagnosing ALF-5677 and future XAM issues 24260: Merged V3.3 to V3.3-BUG-FIX (RECORD ONLY) 23707: Merged V3.3-BUG-FIX to V3.3 23596: Merged HEAD to BRANCHES/DEV/V3.3-BUG-FIX: 20636: ALF-3157 - Conflict between IMAP and Audit 20638: ALF-3157 - Conflict between IMAP and Audit - part II update the auditConfig.xml 23946: Merged V3.3-BUG-FIX to V3.3 23942: Fix for ALF-5783: Not possible to override the output path pattern anymore when a webform is edited for a specific website 24261: Merged V3.3 to V3.3-BUG-FIX 23650: Switch off transaction limiting for now, pending further investigation 23706: Merged PATCHES/V3.3.3 to V3.3 23704: ALF-5720: Merged V3.3-BUG-FIX to PATCHES/V3.3.3 23609: Merged BRANCHES/DEV/BELARUS/HEAD_2010_10_06 to BRANCHES/DEV/V3.3-BUG-FIX: 23158: ALF-1838: Need to support relative url for WCM TinyMCE Filepicker. Also fixes ALF-866 & ALF-5420 23708: Merged DEV/TEMPORARY to V3.3 22697: ALF-4809: The confirmation step to Revert action implementation. New dialog. 23970: ALF-5858 (Javascript error caused by files 404'ing) - URLRewriting bug introduced in r23545 23998: Add tomcat bundles 24053: ALF-5897: Updated surf config to set correct user factory 24061: Merged V3.2 to V3.3 19170: Fixed ALF-730: MLText is not fully carried during cut-paste or copy-paste - Fetching of properties for copy now uses 'mlAwareNodeService' 24130: Ensure mysql symlinks created 24131: ALF-5930: Correct bogus configuration template for Quickr 24262: Stress test code for ALF-5025: Support background processing of archiving 24267: Reverting partial merge of build script changes 24268: Removed svn:mergeinfo on root 24270: Merged V3.3 to V3.4 24269: Merge fallout: rename of ASPECT_MAILED to ASPECT_EMAILED 24271: Merge fallout: fix compilation error (masked by a crashed Eclipse) 24275: FTP command input buffer resizes on overflow (up to a maximum of 64K), allow long paths in commands. ALF-210. 24281: Performance improvements relating to WebScripts, Surf, FreeMarker and Apache HTTP synchronization under heavy multi-threaded load. 24282: Merged V3.3 to V3.4 24279: Fix for ALF-6025 - increased cluster cache size for webScriptsRegisteryCache 24284: Fix for ALF-5723: Sharepoint Protocol doesn't seem to work in 3.4.a and 3.4.b with NTLM passthru 24285: Unit test fallout from merge. Removed NPE-causing mailActionExecutor member 24286: Reinstate ImapMessageTest (a required bug fix was incorrectly removed by merge 22725) 24288: Fix for ALF-4282 Site Contributor can't create datalist until Site Manager creates new one. The first user who views the data lists page for a Share site kicks off the lazy creation of the necessary site container node. In fact it creates the container, sets its cm:description to "Data Lists" and saves that ScriptNode. See parse-args.lib.js circa line 144. However if that user is not a Site Manager then they do not have permissions to create the container and an exception is thrown which results in a disabled 'New List' button. In fact, the creation of the container node was already being run as system. But the Site.save() call was not and that was the call that was producing a permissions exception. In order to run the whole thing as system (which is not available in the JS layer), I have extracted the JavaScript logic into a new Java-layer method createAndSaveContainer(...) and JS now makes that one call. 24289: Fixed misleading javadoc comment relating to ALF-4282 24290: Merged BRANCHES/DEV/BELARUS/V3.4-2010_11_29 to BRANCHES/V3.4: 24238: ALF-5556 : Items disappear from document library after changing its name Also added new unit test to verify that site containers can not be renamed. 24295: Fixes ALF-4290: Installer text errors 24302: Fixes for dependencies for the SDK. 24305: Added logging to JodConverterSharedInstance (Alfresco's JodC-facing class) Re-enabled the JodC-related test classes - these may break the build. Set logging in JodC to DEBUG 24307: Removing a debug statement which is verbose and unhelpful at a high frequency. 24310: Merged BRANCHES/V3.3 to BRANCHES/V3.4: 24283: Fix for ALF-2232: "Collaborator actions in CIFS(Share) are incorrect" 24311: Fix for ALF-2232: "Collaborator actions in CIFS(Share) are incorrect" - missed root dir and import 24313: ALF-3044: Audit log is incorrect when trying to filed it as record 24315: Merged BRANCHES/V3.3 to BRANCHES/V3.4: 24314: If the repo is running in read only mode, skip the periodic Tag Scope sweep and update (ALF-6067) 24317: Disabled the OOoJodC tests again as I should have some info to proceed while we get a good build on this plan. "You put your left leg in..." 24319: Moved logging of soffice file permissions to before the attempt to start JodConverter. 24321: 24323: Changing the use of File.createTempFile to TempFileProvider.createTempFile mostly in test code. None of these temporary files are needed for longer than a few seconds. By using our own TempFileProvider there will be a chance that our tempFileCleaner will delete temporary files. Derek pointed out that there are a lot of such temporary files in our build server's temp dir. 24330: Data generation for perf. tests: Ensure content is written to file 24333: Merged V3.4-2010_11_29 to V3.4 24237: ALF-5829: Cannot upload files to Records Managemennt site using WebDav from Mac OS X. Return "403 Forbidden" status if WebDAVMethod.execute() fails with AccessDeniedException. 24339: Fixed a bug where task properties were not being updated when task was transitioned. 24340: Fixed a bug where task properties were not being updated when task was transitioned. 24349: turn off debug logging 24351: ALF-3584 Cleaning up SDK list of libs. (I think there may be a limit on the size somewhere) 24355: Tika update to better support encrypted PDFs (ALF-6040) 24357: Turned off JodConverter hanging tests again. I won't turn these back on again now. Apologies for all the disruption. I have a basis on which to address the hanging issue on my own machine now. 24359: Add code to probe intermittent test failure. 24368: Patched build of JodConverter. This changes jodconverter's OfficeUtils.toUrl(File) method so that it uses Alfresco's mechanism for creating OpenOffice URIs. 24371: Fix for ALF-5563: Sorting documents with multiple locales - d:text now uses the .no_locale field for sorting using the user's locale collation 24372: Turning the jodconverter-related logging down from 'debug' to 'info' by default. 24373: Merged V3.3 to V3.4 (Missed merge) 21907: ALF-4401: Web services not working on Websphere 7 (ever?) - Added in Sun SAAJ and JAXP reference implementations to shared library in order to make CXF work - Removed old Sun SAAJ libraries as these are embedded into JDK 1.6 24376: ALF-2761: RM adds rma:record to IMAP messages in non RM folders 24378: When copying content, reset the auditable properties. This makes the person doing the copy the creator/modifier, and resets the created/modified at times to now. Avoids the issue of being able to copy a node but then not edit it. Fixes ALF-5288 24381: Fixed ALF-6002 "Share links and images break when saving html content" - Editor content was never persisted to hidden textarea after non "keyup" events, such as embedding links & images - Also added tinymce's src files when running alfresco in debug mode 24383: Fix for ALF-5967 - reset the SpringMVC View Resolvers when the Surf Refresh Object Registry cmd is used. 24385: Merged BRANCHES/V3.3 to BRANCHES/V3.4 24384: Merged PATCHES/V3.3.4 to BRANCHES/V3.3 24382: Fixed ALF-6087 "Wiki: all buttons are disabled in IE" by quoting "delete" (as it is a reserved js word) 24386: Fix for ALF-1339: Share - Posts in discussions can be edited and deleted by any members 24389: Merged V3.3 to V3.4 24388: Fix ALF-6128: Upload/recall documents with apostrophe/accent via Alfresco Office plugin 24395: Fix for ALF-6009: Workflow "View More Actions" link incorrect when first char of site URL is numeric 24398: Merged DEV-TEMPORARY to V3.4 24320: Fix ALF-4868: An error occurs, while adding content to space with "has-tag" rule 24401: More code to probe intermittent IMAP test failure. 24402: Fix for performance degredation related to ALF-3823. RSS feed processing in JavaScript relies on Rhino impl of regex - this is extreemly slow as Rhino regex is by far the slowest component of the library. Switched code to use the Java Regex libraries to improve performance and reduce memory usage. Time to process 4 small rss feeds while running in the profiler: Using Rhino regex: 6670ms (required ~3500MB of temp RAM) Using Java regex: 1550ms (required ~30MB of temp RAM) 24404: Merge V3.3 to V3.4 (RECORD ONLY) 24403 : Merge V3.4 to V3.3 ALF-5539 24415: Merged BRANCHES/V3.3 to BRANCHES/V3.4: 24306: ALF-5987: AVM - AVMNodeDAOIbatis.getRootNodeByID does not seem to handle nulls properly 24416: Merged BRANCHES/V3.3 to BRANCHES/V3.4: 24306: ALF-5987: AVM - AVMNodeDAOIbatis.getRootNodeByID does not seem to handle nulls properly (add logger) 24420: Merge from V3.3-BUG-FIX to V3.4 V3.3-BUG-FIX r.24419 V3.3 r.24418 Fix for ALF-6075. Running out of /tmp space on the server is causing uploads to fail. 24453: Fixed ALF-6116 "Incorrect behavior of sites filter" - Made rest calls sequential rather than parallell 24455: Merged BRANCHES/V3.3 to BRANCHES/V3.4: 24454: AVMStoreDAOIbatis auto-unboxing NPE (see also ALF-5987) 24456: Resolve ALF-5875 - RM Constraint cannot be used for custom models (via RecordsManagementAdminService) 24462: Merge V3.3 to V3.4 (RECORD ONLY) 24460 : Merge HEAD to V3.3 22680 : ALF-4015 Benchmark broken 24467: Remove unused labels as part of ALF-6092 24470: Merged V3.3 to V3.4 24469: Fix for ALF-6006 - reworking of Share site-index initialisation to use "lazy" dashboard filter. - ensures user dashboard is available without having to enter Share via the default index page. 24473: ALF-6105 - Upgrade from 2.2 to 3.4.0.R1.86 fails with Custom attributes found - will require custom migration patch: [.href] 24474: Possible fix for ALF-5969. JodConverter. I noticed that SuspendableThreadPoolExecutor.available (a non-volatile, non-synchonized accessed boolean) is being updated by multiple threads and there may be stale reads of this field by some threads. I apply this fix in hope more than expectation that it will fix the JodC problems we're seeing. 24489: Fix MT startup (Failed to init namespaceRegistry) - see also ALF-6029 24491: ALF-6058: Quickr module doesnot not work. Checkin comments: Doesn't broadcast ContextRefreshedEvent and ContextClosedEvents for subsystem context parent. Add corresponding unit test: SubsystemsTest.testALF6058(). 24494: Merged BRANCHES/V3.3 to BRANCHES/V3.4: 24298: ALF-6043: AVM orphan reaper - handle concurrent node delete (WCM cluster) 24499: ALF-5917 Added a property that allows switching off of email notifications for Nominated invitations. 24500: Merge 3.3 to 3.4: 24493: Fix for Mac OS X CIFS logon problem, change UID to start at one as zero has special meaning, plus other minor fixes. JLAN-112. 24501: Merged (and fixed) DEV/BELARUS/V3.4-2010_12_14 to V3.4 + fixed hard bean reference to injection + tested with index test running with continual back up 24502: Merged (and fixed) DEV/BELARUS/V3.4-2010_12_14 to V3.4 (missed merge info) + fixed hard bean reference to injection + tested with index test running with continual back up 24503: ALF-6113 - Don't include non-standard {music} namespace properties when extracting metadata from MP3s. (Don't merge to HEAD) To be fixed fully with ALF-6170 via defining an audio content model 24504: ALF-4373: It's impossible to upload record if any record was previously frozen 24506: Fixes ALF-6181: Add default site notification e-mail settings to global properties 24511: ALF-5769 - Failed to signal transition from workflow "Expired content in 'Test'" task when click "Task Done" 24512: Fix for ALF-6100 - Incorrect behaviour of preview content in Share - Websphere specific. 24522: Merged V3.3 to V3.4 24521: Fix for ALF-5065 - Share - Missing notify_user_email template 24523: Fix for ALF-6171: Access Denied error in Alfresco Exporer when in Read-only mode (Websphere) 24534: Merged V3.3 to V3.4 24447: Support for ALF-5533 and ALF-5023: Make ContentStore.delete behaviour consistent w.r.t. true/false return value 24472: Code for ALF-5023: Allow the retention schedule to be extended for XAM nodes 24515: Fixed ALF-5023: Allow the retention schedule to be extended for XAM nodes 24533: Minor XAM changes that mainly affect the QA tasks 24541: ALF-6029 - MT: cannot "Show Folders" in Afresco Share 24550: Fix for ALF-6088: Categories are unavailable at the Server B after deleting category at the Server A - category service handles invalid node refs correctly 24551: Merge V3.3 to V3.4 (RECORD ONLY) 24547: Fixed ALF-6188 "Object finder does not allow select users in the singleSelect mode" 24549: Fixed ALF-6188 "Object finder does not allow select users in the singleSelect mode" part 2 (typo) 24558: Merge V3.3 to V3.4 24557 : Merge DEV to V3.3 24527 : ALF-4724 ftp server and list. 24559: Removed svn:mergeinfo on root 24561: 24564: Fix for ALF-3727: Custom permissions aren't visible in Explorer UI - the default Alfresco permission model (or the one associated with the permission model dao is loaded first - all other models will be loaded in any order unless specific bean dependencies are added (if ordering is important you need to add it via Spring) - there is no collision detection :-) 24582: Merged V3.3 to V3.4 24578: Fix for ALF-4729 and ALF-6048 - Unable to access Share [or Explorer] through NTLM SSO on Safari 24583: Oracle build fix: ALF-4223: Oracle: testTaskInstanceGet in WorkflowRestAPiTest is only failing on Oracle build plan - work around for oracle null === "" 24588: Committing installer updates for DDraper, fixes: ALF-6096 & ALF-6019 24602: Build fix for RM permission model loading - collateral damage for R 24564 24606: Merged BRANCHES/DEV to BRANCHES/V3.4: 24563: ALF-6063: Alfresco 3.4.0.RC1.86 fails to connect to virtualization server 24607: Merged V3.3 to V3.4 24605: Fix for ALF-5552: Many REST API scripts are not resilient to stale Lucene indexes 24608: ALF-5555: It is impossible to edit review date from record's details page Implementation of changable "Edit Review Date" date for properties view. The structure of dod5015 properties was undefined. An asynchronous call to web script has been added for preservation of the entered date. 24615: Fixes: ALF-6254 - Typo in Dashlets properties file 24620: Removed RC1 from label 24623: Installer updates to use new binary versions for SWFTools (0.9.1) and Apache Tomcat (6.0.29) 24624: Add line break. 24627: Fix execute permissions for OOo 24630: Tweak AVM test 24634: Update root pseudo folder timestamps when new stores are added so NFS clients see the update. ALF-5197. 24637: RM Caveats - split service/component - related to rmEntryVoter (ALF-5875 & ALF-6231) 24661: ALF-6303: fix typo in upg script git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@26789 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2011-04-11 14:24:38 +00:00
Derek Hulley	835482d064	Merged V3.3-BUG-FIX to HEAD ... 24179: ALF-6017: During bootstrap rules are being triggered when ModuleServiceImpl.startModules() transaction is committed but there is no authentication at that point. Merge fixes ALF-6831: Module startup fails with AuthenticationCredentialsNotFoundException git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@25016 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2011-01-25 12:02:11 +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	a5f31cd37e	Merged V3.3 to HEAD ... 20167: Merged HEAD to BRANCHES/V3.3: (RECORD ONLY) 20166: Fix ALF-2765: Renditions created via 3.3 RenditionService are not exposed via OpenCMIS rendition API 20232: Fix problem opening AVM web project folders via FTP. ALF-2738. 20234: ALF-2352: Cannot create folders in Share doclib without admin user in authentication chain 20235: Fix for unable to create folders in web project via CIFS. ALF-2736. 20258: Reverse-merged rev 20254: 'When dropping the mysql database ...' 20262: Merged V3.3-BUG-FIX to V3.3 20251: Fix for ALF-2804 - Unable to browse into folders in Share Site in certain situations. - Browser history filter object in incorrect state after page refresh. 20264: Updated Oracle build support (to fix grants) 20282: Merged PATCHES/V3.2.0 to V3.3 20266: Test reproduction of ALF-2839 failure: Node pre-loading generates needless resultset rows 20280: Fixed ALF-2839: Node pre-loading generates needless resultset rows 20283: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3: 20194: AVMTestSuite - scale down unit tests (slightly) 20247: AVMServiceTest.testVersionByDate - build (add delay) 20290: Fixed ALF-2851 "Drag n Drop issues in IE6 & IE7" - Reordering rules-list with drag and drop didn't work at all because each rule was created using a template that had the "id"-attribute set, which made IE confused after using HTMLELement.clone() even though the id was resetted - Both customise-dashlets & rules-list got an error when "throwing" away the dashlet or rule instead of releasing it "carefully", reason was becuuase IE didnt capture the x:y-position which made the animation fail. Now no animation is done if x:y isn't found. 20296: Merged PATCHES/V3.1.0 to V3.3 (RECORD ONLY) 20249: Merged V3.1 to PATCHES/V3.1.0 14565: Updated version to include revision number (x.y.z) 20246: Merged V3.1 to PATCHES/V3.1.0 13841: Build fix 20245: Merged V3.1 to PATCHES/V3.1.0 16185: AbstractLuceneIndexerAndSearcherFactory.getTransactionId() must return null when there is no transaction 20241: Merged V3.1 to PATCHES/V3.1.0 14187: Fix for ETHREEOH-2023: LDAP import must lower case the local name of the association to person. 16167: ETHREEOH-2475: Fixed nested transaction handling in AbstractLuceneIndexerAndSearcherFactory to allow duplicate user processing in PersonServiceImpl to actually work 16168: ETHREEOH-2797: Force patch.db-V2.2-Person to apply one more time to fix up corrupt users created by LDAP Import - Problem due to ETHREEOH-2023, fixed in 3.1.1 - Also corrects ldap.synchronisation.defaultHomeFolderProvider to be userHomesHomeFolderProvider - Also requires fix to ETHREEOH-2475 to fix up duplicate users 20221:Merged PATCHES/V3.1.2 to PATCHES/V3.1.0 20217: Merged PATCHES/V3.2.0 to PATCHES/V3.1.2 19793: Merged HEAD to V3.2.0 19786: Refactor of previous test fix. I have pushed down the OOo-specific parts of the change from AbstractContentTransformerTest to OpenOfficeContentTransformerTest leaving an extension point in the base class should other transformations need to be excluded in the future. 19785: Fix for failing test OpenOfficeContentTransformerTest.testAllConversions. Various OOo-related transformations are returned as available but fail on our test server with OOo on it. Pending further work on these failings, I am disabling those transformations in test code whilst leaving them available in the product code. This is because in the wild a different OOo version may succeed with these transformations. I had previously explicitly disabled 3 transformations in the product and I am moving that restriction from product to test code for the same reason. 19707: Return value from isTransformationBlocked was inverted. Fixed now. 19705: Refinement of previous check-in re OOo transformations. I have pulled up the code that handles blocked transformations into a superclass so that the JodConverter-based transformer worker can inherit the same list of blocked transformations. To reiterate, blocked transformations are those that the OOo integration code believes should work but which are broken in practice. These are blocked by the transformers and will always be unavailable regardless of the OOo connection state. 19702: Fix for HEAD builds running on panda build server. OOo was recently installed on panda which has activated various OOo-related transformations/extractions in the test code. It appears that OOo does not support some transformations from Office 97 to Office 2007. Specifically doc to docx and xls to xlsx. These transformations have now been marked as unavailable. 20220: Created hotfix branch off TAGS/ENTERPRISE/V3.1.0 20297: Merged PATCHES/V3.1.2 to V3.3 (RECORD ONLY) 20268: Increment version number 20267: ALF-550: Merged V3.2 to PATCHES/V3.1.2 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 20217: Merged PATCHES/V3.2.0 to PATCHES/V3.1.2 19793: Merged HEAD to V3.2.0 19786: Refactor of previous test fix. I have pushed down the OOo-specific parts of the change from AbstractContentTransformerTest to OpenOfficeContentTransformerTest leaving an extension point in the base class should other transformations need to be excluded in the future. 19785: Fix for failing test OpenOfficeContentTransformerTest.testAllConversions. Various OOo-related transformations are returned as available but fail on our test server with OOo on it. Pending further work on these failings, I am disabling those transformations in test code whilst leaving them available in the product code. This is because in the wild a different OOo version may succeed with these transformations. I had previously explicitly disabled 3 transformations in the product and I am moving that restriction from product to test code for the same reason. 19707: Return value from isTransformationBlocked was inverted. Fixed now. 19705: Refinement of previous check-in re OOo transformations. I have pulled up the code that handles blocked transformations into a superclass so that the JodConverter-based transformer worker can inherit the same list of blocked transformations. To reiterate, blocked transformations are those that the OOo integration code believes should work but which are broken in practice. These are blocked by the transformers and will always be unavailable regardless of the OOo connection state. 19702: Fix for HEAD builds running on panda build server. OOo was recently installed on panda which has activated various OOo-related transformations/extractions in the test code. It appears that OOo does not support some transformations from Office 97 to Office 2007. Specifically doc to docx and xls to xlsx. These transformations have now been marked as unavailable. 20204: Moved version label to '.6' 20298: Merged PATCHES/V3.2.0 to V3.3 (RECORD ONLY) 20281: Incremented version number to '10' 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) 20299: Merged PATCHES/V3.2.1 to V3.3 (RECORD ONLY) 20279: Incremented version label 20211: Reinstated patch 'patch.convertContentUrls' (reversed rev 20205 ALF-2719) 20210: Incremented version label to '.3' 20206: Bumped version label to '.2' 20205: Workaround for ALF-2719 by disabling patch.convertContentUrls and ContentStoreCleaner 20149: Incremented version label 20101: Created hotfix branch off ENTERPRISE/V3.2.1 20300: Merged BRANCHES/DEV/BELARUS/HEAD-2010_04_28 to BRANCHES/V3.3: 20293: ALF-767: remove-AVM-issuer.sql upgrade does not account for column (mis-)order - fixed for MySQL, PostgreSQL and Oracle (DB2 & MS SQL Server already OK) 20301: Merged PATCHES/V3.2.1 to V3.3 20278: ALF-206: Make it possible to follow hyperlinks to document JSF client URLs from MS Office - A request parameter rather than a (potentially forgotten) session attribute is used to propagate the URL to redirect to after successful login 20303: Fixed ALF-2855: FixAuthorityCrcValuesPatch reports NPE during upgrade from 2.1.7 to 3.3E - Auto-unbox NPE on Long->long: Just used the Long directly for reporting 20319: Fixed ALF-2854: User Usage Queries use read-write methods on QNameDAO 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 20335: Merged DEV/V3.3-BUG-FIX to V3.3 20334: ALF-2473: Changes for clean startup and shutdown of subsystems on Spring 3 - Removed previous SafeEventPublisher workaround for startup errors and associated changes - Replaced with SafeApplicationEventMulticaster which queues up events while an application context isn't started - Now all subsystems shut down cleanly - Fixes problem with FileContentStore visibility in JMX too! 20341: ALF-2517 Quick fix which means rules which compare the creation/modification date of content should now correctly be applied when content is uploaded to a folder. 20346: ALF-2839: Node pre-loading generates needless resultset rows - Added missing Criteria.list() call 20347: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3: 20231: Fixed ALF-2784: Degradation of performance between 3.1.1 and 3.2x (observed in JSF) 20356: Merged DEV/BELARUS/HEAD-2010_03_30 to V3.3 (with corrections) 19735: ALF-686: Alfresco cannot start if read/write mode in Sysadmin subsystem is configured 1. org.alfresco.repo.module.ModuleComponentHelper was modified to allow “System” user run write operations in read-only system. 2. Startup of “Synchronization” subsystem failed with the same error as was occurred in issue during modules start. org.alfresco.repo.security.sync.ChainingUserRegistrySynchronizer was also modified to allow “System” user run write operations in read-only mode. 20361: Merged HEAD to BRANCHES/V3.3: (RECORD ONLY) 20345: Fix ALF-2319: CMIS 'current' version mapping is not compliant with spec 20354: Update test to reflect changes to CMIS version mapping. 20363: Merge from V3.2 to V3.2 (all record-only) c. 19448 OOoJodConverter worker bean correctly handles isAvailable() when subsystem is disabled. c. 19484 JodConverter-backed thumbnailing test now explicitly sets OOoDirect and OOoJodconverter enabled-ness back to default settings in tearDown c. 20175 Fix for ALF-2773 JMX configuration of enterprise logging broken 20376: Altered URL of online help to point at http://www.alfresco.com/help/33/enterprise/webeditor/ 20395: set google docs off 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() 20399: Remove googledocs aspect option 20400: PurgeTestP (AVM) - increase wait cycles 20422: Added ooo converter properties 20425: Merge V3.3-BUG-FIX to V3.3 20392 : ALF-2716 - imap mail metadata extraction fails when alfresco server locale is non English 20365 : Merge DEV to V3.3-BUG_FIX 18011 : ETHREEOH-3804 - IMAP message body doesn't appears in IMAP folder when message subject is equal to the attachment name 20332 : Build fix - rework to the ImapServiceUnit tests. 20325 : build fix 20318 : MERGE DEV TO V3.3-BUG-FIX 20287 : ALF-2754: Alfresco IMAP and Zimbra Desktop Client. 20317 : ALF-2716 - imap mail metadata extraction fails when alfresco server locale is non English This change reworks the received date metadata extraction. 20316 : ALF-1912 : Problem with IMAP Sites visibility Now only IMAP favouries are shown. Also major rework to the way that this service uses the FileFolderService. 20315 : ALF-1912 Updates to the FileFolderService to support the Imap Service - add listDeepFolders - remove "makeFolders" which moves to its own Utility class. - update to JavaDoc 20429: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3: 20171: 3.3SP1 bug fix branch 20174: Fix for ALF-960 and ALFCOM-1980: WCM - File Picker Restriction relative to folder not web project 20179: ALF-2629 Now when a workflow timer signals a transition it also ends the associated task. 20433: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3: 20184: ALF-2772: Added new test case to RepoTransferReceiverImplTest and fixed the fault in the primary manifest processor. 20196: Temporary fix to SandboxServiceImplTest, which reverses the fix to ALF-2529. 20434: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3: (RECORD ONLY) 20213: (RECORD ONLY) Merge from V3.3 to V3.3-BUG-FIX r20176 Merge from V3.2 to V3.3. r20175. JMX configuration of enterprise logging broken (fix). 20215: (RECORD ONLY) Merge from V3.3 to V3.3-BUG-FIX r20178 JodConverter loggers are now exposed in JMX. 20218: (RECORD ONLY) Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.3-BUG-FIX: 20195: Form fields for numbers are now rendered much smaller that ... 20248: (RECORD ONLY) Merging HEAD into V3.3 20284: (RECORD ONLY) Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.3-BUG-FIX: 20177: Add 'MaxPermSize' setting for DOD JUnit tests 20305: (RECORD ONLY) Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.3-BUG-FIX: 20236: Add Oracle support for creating/dropping "databases" (users) in continuous.xml 20264: Updated Oracle build support (to fix grants) 20435: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3: 20233: Part fix for ALF-2811: DOD5015 module breaks CMIS tck 20239: Final part of fix for ALF-2811: DOD5015 module breaks CMIS tck 20250: Merge from DEV/BELARUS/HEAD-2010_04_28 to V3.3-BUG-FIX 20230 ALF-2450: latin/utf-8 HTML file cannot be text-extracted. 20253: ALF-2629 Now tasks should correctly be ended when an associated timer is triggered. Should no longer cause WCM workflows to fail. 20254: ALF-2579 Changed teh status code on incorrect password to '401' to reflect that it is an authorisation error. 20263: Fix for ALF-2500: query with a ! in contains search make it strange 20265: Fix for ALF-1495. Reindexing of OOo-transformed content after OOo crash. 20436: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3: 20292: (RECORD ONLY) Latest SpringSurf libs: 20308: (RECORD ONLY) Latest SpringSurf libs: 20366: (RECORD ONLY) Latest SpringSurf libs: 20415: Latest SpringSurf libs: 20437: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3: 20270: Build times: SearchTestSuite 20273: Fix for ALF-2125 - Accessing a deleted page in Share does not return an error page, instead the document-details page breaks 20274: Fix for ALF-2518: It's impossible to find user by user name in Add User or Group window at Manage permissions page (also allows users to be found by username in the Share Admin Console). 20277: Fix for ALF-2417: Create Web Content Wizard if cancelling/aborting Step Two - Author Web Content, any asset being uploaded gets locked 20291: Reduce build time: Added security test suite to cover 17 security tests 20439: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3: 20302: Fixed ALF-727: Oracle iBatis fails on PropertyValueDAOTest Double.MAX_VALUE 20307: VersionStore - minor fixes if running deprecated V1 20310: Fixed a bug in UIContentSelector which was building lucene search queries incorrectly. 20314: Fix for ALF-2789 - DispatcherServlet not correctly retrieving Object ID from request parameters 20320: Merged DEV/TEMPORARY to V3.3-BUG-FIX 20313: ALF-2507: Not able to email space users even if the user owns the space 20324: Fixed ALF-2078 "Content doesn't make checked in after applying 'Check-in' rule in Share" 20327: Fix Quickr project to compile in Eclipse 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 20369: Part 1 of fix for ALF-2943: Update incorrect mimetypes (Excel and Powerpoint) 20370: Version Migrator (ALF-1000) - use common batch processor to enable multiple workers 20373: Version Migrator (ALF-1000) - resolve runtime conflict (w/ r20334) 20378: Merged BRANCHES/DEV/BELARUS/HEAD-2010_04_28 to BRANCHES/DEV/V3.3-BUG-FIX: 20312: ALF-2162: Error processing WCM form: XFormsBindingException: property 'constraint' already present at model item 20381: Fixed ALF-2943: Update incorrect mimetypes (Excel and Powerpoint) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20571 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2010-06-09 14:01:07 +00:00
Kevin Roast	1c897ae1fb	Latest SpringSurf libraries: ... - Cleanup and improvements to RequestContext related classes. - Removal of obsolete Alfresco util classes. Fixed up imports back to Alfresco versions of unused SpringSurf util classes git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19322 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2010-03-16 19:06:54 +00:00
Mark Rogers	03d130e99c	ALF-2031 - DR and VT can't start ... - undeleted and reinstated use of org.alfresco.util.Pair - undeleted org.alfresco.util.PropertyCheck which is used in the deployment code. - undeleted other org.alfresco.util.* classes which probably should never have been moved to spring surf. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19312 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2010-03-16 15:05:47 +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
Kevin Roast	b726c4d6db	Merged DEV/TEMPORARY to HEAD ... 17667: Branch for SpringSurf integration - from HEAD r17665 17668: Fix to ensure included scripts files are not loaded from a cached classpath loader. 17670: Part 1 of SpringSurf integration - changes relating to spring-surf-core-1.0.0.CI-SNAPSHOT.jar 17674: Part 2 of SpringSurf integration - changes relating to spring-surf-core-configservice-1.0.0.CI-SNAPSHOT.jar git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2009-12-14 13:41:05 +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	e1d365e545	ALFCOM-2816: Changes for JBoss v5.0.1.GA compatibility ... - All code that resolves classpath resources goes through JBossEnabledResourceLoader with VFS support - JBossEnabledResourcePatternResolver can handle recursion within VFS directory structures - Reflection used to avoid runtime dependency on JBoss classes - resource-ref declared in jboss-web.xml - Work around incorrect treatment of env-entry-value tag in web.xml git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14106 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2009-04-28 14:07:52 +00:00
Dave Ward	facbdaf5b7	MOB-412: Decouple thread local authentication methods from AuthenticationComponent into new AuthenticationContext super-interface. The AuthenticationContext is a delegate of AbstractAuthenticationComponent and can be accessed directly by low-level classes (e.g. schema bootstrap) before the authentication subsystem is available. ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13721 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2009-03-23 14:01:29 +00:00
Dave Ward	12f5f0f53b	Merged V3.1 to HEAD ... 12966: Fix failing build: make it possible for the repository to start in read-only mode again (in event of expired license, etc.) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13526 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2009-03-10 14:43:29 +00:00
Derek Hulley	adc940f961	Merged V3.1 to HEAD ... Merged DEV/LIVECYCLE-3.1 to V3.1 12665: Merged V2.1-A to DEV\LIVECYCLE-3.1 8615: Cluster startup and property setting enhancements 8657: Fixed shutdown procedure for JGroups 8676: Enable system property overriding of more JGroups TCP stack properties - ${alfresco.tcp.start_port:7800} - ${alfresco.tcp.port_range:3} 8678: More logging of cluster view changes and channel factory config during startup 12667: Merged V2.1-A to DEV/LIVECYCLE-3.1 9188: Index recovery job only calls through if property 'alfresco.cluster.name' has been set 9197: Fixed unit test after bean property name change 12793: Merged V2.1-A to DEV/LIVECYCLE-3.1 7765: Requested mimetypes 8526: Updated Mimetypes 8610: Mimetype changes Many branding and other non-core changes were omitted 12848: Fixed JAWS-223: Adobe LC Hibernate Dialect Loading - Hibernate dialect can be null or empty and will be autodetected from the database metadata - Property 'hibernate.dialect' is set on the System - iBatis loading (activities) checks for 'hibernate.dialect' - SchemaBootstrap checks for 'hibernate.dialect' 12854: Merged V2.1-A to DEV/LIVECYCLE-3.1 8681: Fixed mimetype 'application/photoshop' 12856: Merged V2.1-A to DEV/LIVECYCLE-3.1 9008: Fixed ADB-64: NPE when applying aspect cm:mlDocument 12857: Merged V2.1-A to DEV/LIVECYCLE-3.1 9032: ACT-2303: "Namespace is displayed in the Node browser is www.alfresco.org ... ___________________________________________________________________ Modified: svn:mergeinfo Merged /alfresco/BRANCHES/V2.1-A:r7765,8526,8610,8615,8657,8676,8678,9188,9197 Merged /alfresco/BRANCHES/V3.1:r12894 Merged /alfresco/BRANCHES/DEV/LIVECYCLE-3.1:r12665,12667,12793,12848,12854,12856-12857 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13518 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2009-03-10 13:29:24 +00:00
Jan Vonka	cd09266213	Merged V3.0 to HEAD ... 12145: Merged V2.2 to V3.0 (AuthenticationUtil) 12109: AuthenticationUtil and AuthenticationComponent refactor 12152: Removed Lucene usage from lookup of 'sites' root folder 12153: Fix InviteServiceTest by cleaning up leaking authentications 12159: Fix for broken usage pattern of the Threadlocal values in recent AuthenticationUtil refactor. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12508 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2008-12-19 12:15:59 +00:00
Derek Hulley	77eb167c2b	Multi-Tenant node interceptor ... - Actually less happening here than it would first appear - Some MT bean and interface consolidation - The unit test has no meat to it, yet... coming soon! git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10781 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2008-09-05 13:04:46 +00:00
Gavin Cornwell	af5fd511b7	Merged V2.2 to HEAD ... 7650: Merged V2.1 to V2.2 7542: ML contribution fixes 7545: Merged V2.0 to V2.1 7544: Merged V1.4 to V2.0 7338: Fix for potential time-based GUID issues 7554: Fixed imports after library package change 7582: WCM-967 7584: Fixed dependecy list for SDK for jug-lgpl-2.0.0.jar 7642: Fix for WCM-949 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8455 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2008-03-07 10:32:22 +00:00