53 Commits

Author	SHA1	Message	Date
Samuel Langlois	ab4ca7177f	Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders) ... 51903 to 54309 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2013-08-20 17:17:31 +00:00
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
Alan Davis	29f7f5d073	Merged BRANCHES/DEV/V3.4-BUG-FIX to HEAD ... 28236: ALF-8810: Removed trailing space from discussion.discussion_for Italian translation 28241: Incremented version revision for 3.4.4 28284: ALF-835 - WCM/AVM: copy (empty) folder into itself 28285: ALF-6863: More than one cifs device breaks the web UI (explorer) 28290: ALF-8840: user-*.atomentry.ftl 28291: ALF-6863: Continuation of fix by Arseny 28336: ALF-8768: Fixed typo in comment on wcm-bootstrap-context.xml 28363: Merged DEV to V3.4-BUG-FIX 28262: ALF-8847: WCM: OrphanReaper contention throws error after 39 retries. Checkin Comment: Use JobLockService to make sure that only one OrphanReaper job is working. Generate list of nodes that must be processed in OrphanReaper.doBatch() transaction. 28386: ALF-9100: Merged PATCHES/V3.4.1 to V3.4-BUG-FIX 28249: ALF-8946: Avoid one full table scan per batch in full reindex - Now each batch scans a single time sample, dynamically adjusted based on the number of transactions in the previous sample, always aiming for 1000 transactions per sample. 28394: Fixed ALF-9090: NPE during inter-cluster subsystem messaging - Bean ID is a List<String> and might not be recognized on receiving machine - Log warning when bean ID is not available (unsymmetrical configuration, perhaps?) 28396: Merged DEV to V3.4-BUG-FIX 28384: ALF-6150: Initial state lost when non-versionable document is saved for the first time Creation of new version of document before writing its content was added to - AbstractAlfrescoMethodHandler->putDocument (this method is used by Office 2003, 2007) - VtiIfHeaderAction->doPut (this method is used by Office 2007 and 2010 on Windows 7) Creation of new version was added twice to AbstractAlfrescoMethodHandler to avoid affecting initial version when transaction is committed. 28432: Merged DEV to V3.4-BUG-FIX 28431: ALF-8530: Pressing the info icon creates an unrecorded file in the ContentStore Use ContentService.getTempWriter() in BaseContentNode$TemplateContentData.getContentAsText() method. 28435: Merged DEV/TEMPORARY to V3.4-BUG-FIX 28428: ALF-9015: cm:modifier not updated when document is updated via CIFS In ContentDiskDriver.closeFile() added ContentModel.PROP_MODIFIER property update. 28436: ALF-8550: Number of http requests (currentThreadsBusy) increases when session times out during creation of webform - Corrected use of read and write locks 28465: Fix for ALF-8023 Share preview doesn't work if... fixed as outlined by Dmitry. 28478: Merged BRANCHES/DEV/ALAN/AUDIT to BRANCHES/DEV/V3.4-BUG-FIX: 28062-28477 (28062,28063,28080,28081,28302,28303,28334,28340,28464,28469,28477) ALF-8438 Need higher level audit of user actions git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28481 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2011-06-20 12:42:10 +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	10da961097	Merged V3.3-BUG-FIX to HEAD ... 21981: Fixed ALF-2390: ContentService needs to return total/available space values where possible - Added ContentService getStoreTotalSpace and getStoreFreeSpace - Supported by underlying ContentStore methods - getSpaceUsed: Actual binary storage size (was getTotalSize, which is not deprecated) - getSpaceTotal: Total storage space on partition - getSpaceAvailable: Remaining storage space on partition - Added JMX methods - Note: getSpaceUsed is NOT exposed as a service method as it is too easy to abuse 21982: Follow-up to Fixed ALF-2390: Patch uses new 'getSizeUsed' instead of deprecated 'getTotalSize' 21983: Fixed ALF-766: Allow cache peer URLs to be set in ehcache-custom.xml - Was investigating settings required for client, so just added this in - By default, the 'cacheManagerPeerListenerFactory' uses no system properties, but a comment has been added on how to define hostName, port and socketTimeoutMillis. - Variables associated with that have been added to repository.properties and are exported to the Java system properties environment for EHCache to pick up. 21984: More ALF-766: Allow cache peer URLs to be set in ehcache-custom.xml - Added alfresco.ehcache.rmi.remoteObjectPort (see ALF-765) 22011: Fix for ALF-3005 - Blog and Discussion components not correctly checking length of modified HTML content 22074: Fix for ALF-4447 - Failure when publishing a Post - some reverse proxies changing the response header to lower case 22075: (RECORD ONLY) Merged HEAD to BRANCHES/DEV/V3.3-BUG-FIX: 22073: Resolve ALF-4522: Accessing document via /alfresco/service/api/path doesn't work - "Company Home" token is duplicated 22091: Merged PATCHES/V2.2.7 to V3.3-BUG-FIX (RECORD ONLY) 19832: Merged BRANCHES/V3.1 to PATCHES/V2.2.7: 17255: Fixed ETHREEOH-3180: Error appears when trying to search resources on Manage Task page 19778: Incremented version label 19769: ALF-2011: Backported dependencies ALF-2360: Merged V3.1 to PATCHES/V2.2.7 17314: ETHREEOH-3158: Fix RepoServerMgmt to work with external authentication methods - AuthenticationService.getCurrentTicket / getNewTicket now call pre authentication check before issuing a new ticket, thus still allowing ticket enforcement when external authentication is in use. ALF-2361: Merged V3.2 to PATCHES/V2.2.7 17456: Fix for: ETHREEOH-1465: It's impossible to get the login history for a given user (Audit) - all authentication routes (SSO and password) can now audit getting a new ticket for a session. SSO does not authenticate via the alfresco AuthenticationService API - you can now use auditing to track new sessions for users. 19558: Created hotfix branch off TAGS/ENTERPRISE/V2.2.7 19557: Tagged V2.2 build 533 Revision 19303 as TAGS/ENTERPRISE/V2.2.7 22092: Merged PATCHES/V3.1.0 to V3.3-BUG-FIX (RECORD ONLY) 21274: Merged PATCHES/V3.1.2 to PATCHES/V3.1.0 21264: ALF-3889: JBPMDeployProcessServlet not accessible by default - Should only be enabled in development environment 20242: ALF-2733: Recreate corrupt authorities produced by LDAP import 20240: ALF-2733: Recreate corrupt authorities produced by LDAP import 19032: Moved V3.1.0-ENTERPRISE-FINAL into ENTERPRISE/V3.1.0 13776: Tagged V3.1 rev 13700 (build 142) as V3.1.0-ENTERPRISE-FINAL 22093: Merged PATCHES/V3.1.1 to V3.3-BUG-FIX (RECORD ONLY) 21570: ALF-3687: Build classpath fix 21549: Merged PATCHES/V3.1.0 to PATCHES/V3.1.1 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. 21548: Incremented version label 21547: ALF-4121: Merged V3.2 to PATCHES/V3.1.1 16827: ETHREEOH-2678 - Unfriendly system error occurs when trying to view Workflows information on content Details page if workflow was canceled 21275: Merged PATCHES/V3.1.2 to PATCHES/V3.1.1 21264: ALF-3889: JBPMDeployProcessServlet not accessible by default - Should only be enabled in development environment 21235: Removed old source zip 21233: Merged PATCHES/V3.1.2 to PATCHES/V3.1.1 20890: ALF-3687: Apply LUCENE-1383 patch to Lucene 2.1.0 to reduce memory leaks from ThreadLocals 20891: ALF-3687: Build classpath fix 21227: Merged PATCHES/V3.2.1 to PATCHES/V3.1.1 21207: Extra debug logging to track index triggering activity 21225: Merged V3.2 to PATCHES/V3.1.1 19598: Backported (merge not possible) HEAD rev 18790 for IndexInfo fixes - Hit problem where re-index threads were all waiting for merging, which had nothing to do 21223: Merged V3.2 to PATCHES/V3.1.1 16923: Lucene performance: avoid too many index deltas getting created by throttling transactions when the number of index entries gets above a configurable size - Stops performance degradation over time and out of memory errors under load 21222: Merged V3.2 to PATCHES/V3.1.1 16799: Fix for ETHREEOH-2843: lucene.indexer.minMergeDocs , lucene.indexer.mergeFactor and lucene.indexer.maxMergeDocs are never read / used - removed unused properties and parameterised the remaining unexposed properties 21220: Created hotfix branch off TAGS/ENTERPRISE/V3.1.1 19033: Moved V3.1.1-ENTERPRISE-FINAL into ENTERPRISE/V3.1.1 14897: Tagged V3.1 rev 14748 (build 229) as TAGS/V3.1.1-ENTERPRISE-FINAL 22096: Merged PATCHES/V3.1.2 to V3.3-BUG-FIX (RECORD ONLY) 22033: ALF-4504: Fix unit test classpath 22031: ALF-4503: Removed spurious mergeinfo 22030: ALF-4503: Merged V3.2 to PATCHES/V3.1.2 19518: ALF-757: Corrected audit config resource URL so that it resolves inside Tomcat as well as JUnit! 22028: Incremented version label 22026: ALF-4504: Merged HEAD to PATCHES/V3.1.2 19958: Updating pdfbox and fontbox libraries. The 3rd party libraries apache pdfbox and apache fontbox have been updated from version 0.8.0-incubating to version 1.1.0. Apache states that: [...] notable changes in this release include basic support for tagged PDF, various font handling improvements and better handling of CJK character sets. Source is available as before for pdfbox, but is no longer included for fontbox. 22025: ALF-4503: Merged V3.2 to PATCHES/V3.1.2 18000: Merged DEV/BELARUS/V3.2-2009_11_24 to V3.2 17719: ETHREEOH-3393: AuditConfig file is read every time the audit method is called in HibernateAuditDAO 19501: Merged DEV/BELARUS/V3.2-2010_02_24 to HEAD (with corrections) 19243: ALF-757: Cannot start up on JBoss 5.1 due to audit configuration error - Removed getPath() method because it is incompatible with JBoss and other app servers where resources can't be resolved to a file - Now use Spring ResourceLoader instead of creating FileInputStream - getLastModified() still returned where the resource resolves to a file; otherwise the server startup time 21699: Incremented version label 21697: ALF-4275: Merged PATCHES/V3.2.0 to PATCHES/V3.1.2 20349: Merged V3.3 to PATCHES/V3.2.0 20346: ALF-2839: Node pre-loading generates needless resultset rows - Added missing Criteria.list() call 20280: Fixed ALF-2839: Node pre-loading generates needless resultset rows - Split Criteria query to retrieve properties and aspects separately 21696: ALF-4275: Merged V3.3-BUG-FIX to PATCHES/V3.1.2 20231: Fixed ALF-2784: Degradation of performance between 3.1.1 and 3.2x (observed in JSF) - Handles warm caches more efficiently - Doesn't regress on ETWOTWO-949 - Can be backported safely 21694: ALF-4275: Merged PATCHES/V3.2.0 to PATCHES/V3.1.2 20266: Test reproduction of ALF-2839 failure: Node pre-loading generates needless resultset rows 17041: Merged V3.2 to V3.1 17023: Fixed parentAssocCache bug when adding assocs against an empty cache 16987: Merge 2.2 to 3.1: 13089: (record-only) Fix "Read-Write transaction" exception, when the user does not exist. ETWOTWO-1055. 13091: (record-only) Fix for NFS server "Read-Write transaction started within read-only transaction" exception. ETWOTWO-1054. 14190: (record-only) Fix for cut/paste a folder from Alfresco CIFS to local drive loses folder contents. ETWOTWO-1159. 14191: (record-only) Additional fix for CIFS 'No more connections' error. ETWOTWO-556 14199: (record-only) Fix for NFS problem with Solaris doing an Access check on the share level handle. ETWOTWO-1225. 14210: (record-only) Added support for FTP EPRT and EPSV commands, on IPv4 only. ETWOTWO-325. 14216: (record-only) Fixed FTP character encoding, ported UTF8 normalizer code from v3.x. ETWOTWO-1151. 14229: (record-only) Remove unused import. 14655: (record-only) Convert content I/O exceptions to file server exceptions during write and truncate. ETWOTWO-1241. 14825: (record-only) Add support for the extended response to the CIFS NTCreateAndX call, back port of ETWOTWO-1232. 15869: (record-only) Port of desktop action client side EXE fixes from v3.x. ETWOTWO-1374. 16727: Fix for unable to connect via FTP via Firefox (when anonymous logons are not enabled). ETHREEOH-2012. 16718: Fix for Alfresco and AVM spaces are empty when viewed by FTP and Alfresco is run as non-root. ETHREEOH-2652. Triggered when CIFS server uses default ports on Linux/Unix/Mac platforms and fails to start. 16717: Fixed setAllowConsoleShutdown setting in standalone server can cause infinite loop. JLAN-38. 16710: Added CIFS NT status code/text for the 'account locked' status, 0xC0000234. ETHREEOH-2897. 16709: Fixed the FTP not logged on status return code, now uses reply code 530. JLAN-90. 16666: Fix for CIFS cannot handle requests over 64K in JNI code, causes session disconnect, standalone server. JLAN-91. 16559: Fix for ACL parsing in the standalone JLAN Server build. JLAN-89. 16556: Fix for CIFS session leak and 100% CPU when connect/disconnecting quickly. ETHREEOH-2881. 16555: Fix for processing of NetBIOS packets over 64K in the older JNI code. Part of ETHREEOH-2882. 16309: Merged V2.2 to V3.1 (for rev 16305) 16304: Fix ETWOONE-335: Parallel Review does not store Priority and Due Date set at task creation 16305: ETWOONE-335: Parallel Review does not store Priority and Due Date set at task creation 16163: Added timstamp tracking via the file state cache, blend cached timestamps into file info/folder search results. Added support for . and .. pseudo entries in a wildcard folder search. 16162: Add support for the . and .. pseudo entries in a folder search. Return EA size as zero in CIFS file information levels. Added more debug output to notify change handler. 16160: Minor change to debug output 15827: Fixed bug in delete node event processing. 15780: Fix for MS Office document locking issue. ETHREEOH-2579. 15628: Update svn:mergeinfo 15627: Merge 3.2 to 3.1: 15626: Fixed NetBIOS reports an invalid packet during session connection, and connection stalls for a while. JLAN-86. 15572: Update svn:mergeinfo 15571: Merge 3.2 to 3.1: 15549: Check for null ClientInfo in the setCurrentUser() method and clear the auth context. Part of ETHREEOH-2538. 15550: Fixed performance issue in the continue search code, add warn level output of folder search timing. 15570: Merge 3.2 to 3.1: 15548: CIFS server memory leak fixes (clear auth context, session close). ETHREEOH-2538 15231: Fix for cut/paste file between folders on CIFS. ETHREEOH-2323. Added debug flags to the Alfresco filesystems, implemented in the ContentDiskDriver. Changed debug output to be single line. ENH-515. 14930: Updated svn:mergeinfo 14921: Merge HEAD to V3.1: 14599: Fixes to file server ACL parsing, part of ETHREEOH-2177 14916: Fixes for local domain lookup when WINS is configured. ETHREEOH-2263. 14523: Add trailing 'A' to CIFS server name, removed by recent checkin. 14484: Merged HEAD to v3.1: 13943 Added FTP IPv6 configuration, via the <IPv6 state="enabled|disabled"/> tag. Added the ftp.ipv6 property. MOB-714. 14483: Merged HEAD to v3.1: 13942 Added FTP IPv6 support. MOB-714. 22097: Merged PATCHES/V3.2.0 to V3.3-BUG-FIX (RECORD ONLY) 21556: Incremented version label 21555: ALF-4208: Merged PATCHES/V3.1.1 to PATCHES/V3.2.0 21225: Merged V3.2 to PATCHES/V3.1.1 19598: Backported (merge not possible) HEAD rev 18790 for IndexInfo fixes - Hit problem where re-index threads were all waiting for merging, which had nothing to do 17875: “Tagged V3.2 build 304 Revision 17823 as TAGS/V3.2.0-ENTERPRISE-FINAL” 22098: Merged PATCHES/V3.2.1 to V3.3-BUG-FIX (RECORD ONLY) 17876: Fix CMIS repo and folder browser web scripts. This can now be used as sample stand-alone JSR-168 portlet. 18309: ETHREEOH-4003: Impossibility to declare email as record 18378: ETHREEOH-4034: Permission exception when creating non-electronic records ... 18468: ETHREEOH-4105: Frozen Records Can Be Destroyed 18470: Part of ETHREEOH-4089: StoreModelObjectPersister fails to load model object - Added toString() methods to aid with diagnostics 18471: Fixed ETHREEOH-4089: StoreModelObjectPersister fails to load model object - If the XML fails to parse, then it is treated the same as a missing document. - Rather than having the system fail, the XML failures are reported (turn DEBUG on for full XML dump) and the document is treated the same as "store.hasDocument() = false" - Merges to HEAD will need merging to SpringFramework 18494: ETHREEOH-4089: StoreModelObjectPersister fails to load model object - Handle document parsing exceptions as well 19170: Fixed ALF-730: MLText is not fully carried during cut-paste or copy-paste - Fetching of properties for copy now uses 'mlAwareNodeService' 19286: Fix for https://issues.alfresco.com/jira/browse/ALF-626 "Using 'null' as an authority argument in clearPermissions() cause a java.lang.NullPointerException" 19406: Fix for ALF-649 - Web Service query() no longer returns metadata in 3.2 19597: Gave PropertyBackedBeanExporter a shorter name for it's cluster region name 19599: Fix ETHREEOH-2583: Make the index tracking "hole" retention period more configurable - Added property 'index.tracking.maxVoidRetentionTimeMinutes', which defaults to the 'maxTxnDurationMinutes' - Even more usefully, added 'index.tracking.minVoidCheckPeriodSeconds' that allows void checking to be less frequent defaulting to only doing it every 60s - Added explicit logging for voids: log4j.logger.org.alfresco.repo.node.index.IndexTransactionTracker.voids=DEBUG 19654: Fix blog test 19718: Merged HEAD to BRANCHES/V3.2: 19678: Fix PostgreSQL handling for null Serializable values (ALF-1614) - Provides generic way of targeting BLOB behaviour for different dialects - Fixes ALF-2301 by the way 19759: Fix for CIFS/CheckInOut.exe save of working copy breaks lock on original file. ALF-2028. 19760: Fix for working copy checked out via CIFS is not accessible until FileStateReaper expires file state. ALF-962. 20048: "Tagged V3.2 build 499 Revision 19935 as TAGS/ENTERPRISE.V3.2.1" 21166: Merged V3.3-BUG-FIX to PATCHES/V3.2.1 21165: Fixed ALF-3867: SQL format error when re-instating orphaned content URL - Parameter was not bounded with # - Added unit test to ensure SQL generated is correct 22101: Resolve ALF-4522: Accessing document via /alfresco/service/api/path doesn't work - "Company Home" token is duplicated - /cmis... urls accept paths relative to CMIS root path (which is /Company Home) - /api/path... urls accept paths relative to root of store 22103: Merge from HEAD to V3.3-BUG-FIX 22099: Fix for ALF-3733. Note that this should also fix ALF-4465. 22104: Merged V3.3 to V3.3-BUG-FIX 21690: ALF-3991: Disable audit behaviour when applying the RenditionModel.ASPECT_RENDITIONED aspect 21722: Merged PATCHES/V3.3.1 to V3.3 21721: ALF-4039: Extend store name encoding to all non-ASCII characters, as otherwise these are incorrectly mangled by the Tomcat 5 virtualization server when they appear in a web app path - Also use -x instead of _x so that the full encoded user name can be included in a DNS name - WCM preview now working with variety of user sandboxes with exotic characters in the user name! 21767: ALF-4234: CMIS Relationships (fix issue with source and target relationship type checking) 21789: ALF-4333: Fix - Updated RepoPrimaryManifestProcessorImpl so it can handle deletions that are reported by either pre-delete noderef or archived noderef (previously only handled the latter). - Updated TransferManifestNodeFactory so that it handles the case where the status of the node to transfer is "deleted". - Updated UnitTestTransferManifestNodeFactory so that it handles the change to TransferManifestNodeFactory above. - Added new tests for deletion cases. 21808: Fix for ALF-1908 - encoding for all arguments to all templates associated with WebScripts that can be exposed and executed via a URL. - this includes any freemarker templates in /components and /modules that can be executed via url and do not touch context objects that would cause them to be invalid when executed via that url, for example any component or template that touches page.* cannot be executed via a url in the browser, but those that do not *could* be exposed via a clever scripted URL and be manipulated to potentially contain XSS code. 21837: ALF-4039: In WebProjectServiceImpl.getWebUserRef() do not trust results of Lucene search alone. Certain special characters are ignored or treated as equivalent. Do string comparison to ensure exact match. 21843: Merged V3.3-BUG-FIX to V3.3 21137: ALF-3841: Alfresco Explorer SSO Authentication Filters now accept ticket parameters too - Can be turned back off with ntlm.authentication.browser.ticketLogons=false or kerberos.authentication.browser.ticketLogons=false - Wiki updated 21856: ALF-4391: Fix Share URL rewrite configuration - The URL rewrite configuration was not including the query string in the source URL meaning that it got lost in the rewritten URL (for some reason only on Websphere) - Solved this by using the urlrewrite.xml from ALF-260 and adding use-query-string="true" - Need to retest on Tomcat and WAS 21873: Fix ALF-2974: Locate file action is absent for documents in I'm editing tab in Repository 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 21911: ALF-4399: Broken Repository Document library in Share on Websphere. (Fixing fallout from argument encoding in r21808) 21924: Further fixes for ALF-1908 - XSS argument encoding fixes in Forms runtime 21987: ALF-4187: Fix bitrock installer config so that the RMI communication ports are randomly selected and do not clash with the RMI registry port 21998: ALF-4323: Fix ability to use ECMA-357 ECMAScript for XML (E4X) expressions in Share on Weblogic (and Rules Management) - Use child first loading of org.apache.xmlbeans.* packages - Makes sense because it was originally donated by BEA 22105: Merged PATCHES/V3.2.r to V3.3-BUG-FIX (RECORD ONLY) 21082: Fixes for ALF-3777 and ALF-3778 - improvements to XSS attack mitigation. 21375: Fix ALF-3951 - XSS attack mitigation for IE6 browser. Also minor wiki code formatting fixes & HTML entities appearing in wiki dashlet. 21400: Merged BRANCHES/V3.2 to PATCHES/V3.2.r 19144: Added PRE tag to whitelist of safe tags for HTML stripping in Share. 19363: Fix for ALF-1952 - multi-pass HTML stripping 19814: Fix for ALF-2322 - discussion topic containing non-ascii characters cannot be saved 21759: Fix for IE6 XSS issue ALF-4307 22106: Merged PATCHES/V3.3.1 to V3.3-BUG-FIX (RECORD ONLY) 21838: Merged V3.3 to PATCHES/V3.3.1 21837: ALF-4039: In WebProjectServiceImpl.getWebUserRef() do not trust results of Lucene search alone. Certain special characters are ignored or treated as equivalent. Do string comparison to ensure exact match. 21941: ALF-4424: Merged V3.3-BUG-FIX to PATCHES/V3.3.1 21659: Workaround for ALF-4230: use of flash technology to upload documents into a share site makes the use of (some) external authentication methods difficult (or impossible) - The Flash uploader can be disabled via share-config: DocumentLibary / file-upload / adobe-flash-enabled 21944: Incremented version label 22079: ALF-4458: Merged PATCHES/V3.2.1 to PATCHES/V3.3.1 21606 ALF-4044: Introduced new policy.content.update.ignoreEmpty setting, that when true causes the repository to behave as it did before the fix to ALF-254. I.e. writing empty content will not trigger onContentPropertyUpdate policies or inbound content rules. This enables better compatibility with mac clients using CIFS or WebDAV; they actually create and close a file before appending its data. ALF-4458: Merged V3.3 to PATCHES/V3.3.1 20855: Fix for ALF-3690. Unable to FTP files into Share site documentLibrary folder. This fix corrects what it essentially a typo. The dictionaryService was injected twice into the CreateNodeRuleTrigger bean, rather than the dictionaryService and the ruleService. 22082: Incremented version label 22107: Merged PATCHES/V3.3.1 to V3.3-BUG-FIX 21943: ALF-4402: Use normalized repository user ID when doing filesystem quota tracking 22080: ALF-4458: Fixed broken logic in CreateNodeRuleTrigger.onAddAspect() - hasAspect() check was inverted because onAddAspect() is called before aspect is actually added git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22108 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2010-08-31 19:35:11 +00:00
Dave Ward	420caeac25	Merged V3.3-BUG-FIX to HEAD ... 21634: Fix ALF-3822: Storing of datetime does not work 21646: ALF-3752: Getting Parent on a specific version throws exception 21655: Fix ALF-4006: Incorrect search result after renaming a folder 21659: Workaround for ALF-4230: use of flash technology to upload documents into a share site makes the use of (some) external authentication methods difficult (or impossible) - The Flash uploader can be disabled via share-config: DocumentLibary / file-upload / adobe-flash-enabled 21675: AVM - build/test fix (testSubmitUpdatedItemWithLF) 21687: Merged V3.3 to V3.3-BUG-FIX 21650: Fix for ALF-4239: Cannot open any folder that contains a node that is neither folder nor content in Share repo browser 21658: Merged HEAD to BRANCHES/V3.3: 21557: Fix ALF-4141: Cannot create relationship via OpenCMIS 21673: ALF-1905: Corrected LDAP connection validation to allow synchronization connection to use anonymous bind 21686: Merged PATCHES/V3.3.1 to V3.3 21684: ALF-4039: Use ISO 9705-style encoding to ensure that compound WCM store names do not collide when user names contain illegal characters - Previously, characters that were illegal were just replaced with _ so there could be collisions in store names - Also, the sequence -- in a user name or user names "preview" and "workflow" would have been problematic. 21535: (RECORD ONLY) Merged V3.3 to PATCHES/V3.3.1 20778: Added revision to version label. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@21689 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2010-08-09 15:28:11 +00:00
Derek Hulley	4872eb9909	Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-5 to HEAD: ... 20678: DAO5 branch: Preparation for merge back to HEAD 20689: Merged DAO4 to DAO5 - Removed all 'dbscripts/create/3.x/SomeDialect' and replaced with 'dbscripts/create/SomeDialect' DB create scripts are taken from latest DAO4 - TODO: FixAuthoritiesCrcValuesPatch needs query implementation in PatchDAO Merged DAO3 to DAO4 - Reapplied fixes for ALF-713 (race condition on Usages) 19350: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-2 to BRANCHES/DEV/V3.3-DAO-REFACTOR-3: 18939: SAIL-4 :2nd stage branch for DAO refactor off HEAD rev 18898 18948: Merged V3.3-DAO-REFACTOR to V3.3-DAO-REFACTOR-2 18202: Dev branch for DAO refactor 18252: SAIL-233: QName.hbm.xml 18295: Added missing CREATE TABLE statements for QName-related code 18324: SAIL-234: Node.hbm.xml: Node aspects initial integration 18355: Added 'setValue' method to manually update the cached value 18356: MV property stressing lowered to speed test up 18357: SAIL-234: Node.hbm.xml 18376: Pulled all Alfresco-related create SQL into script 18389: SAIL-234: Permissions DAO refactor - initial checkpoint 18390: Formatting only (line-endings) 18400: SAIL-234: Node.hbm.xml 18418: SAIL-234: Node.hbm.xml: 'alf_node_assoc' CRUD 18429: SAIL-234: Node.hbm.xml: Cleaned out all Hibernate references to NodeAssocImpl 18457: SAIL-234: Permissions DAO refactor 18959: Merged DEV/V3.3-DAO-REFACTOR to DEV/V3.3-DAO-REFACTOR-2 18479: SAIL-234: Node.hbm.xml - fix updateNode (missing id when saving oldDummyNode) 18482: SAIL-235: remove Permissions.hbm.xml 18517: SAIL-235: Permissions DAO refactor 18523: SAIL-234: Node.hbm.xml 18524: SAIL-235: Permissions DAO refactor 18960: Merged DEV/V3.3-DAO-REFACTOR to DEV/V3.3-DAO-REFACTOR-2 18533: Flipped back to Windows line endings 18535: Formatting-only (eol) 18540: Formatting-only (eol) 18541: SAIL-235: Permissions DAO refactor 18543: SAIL-234: Node.hbm.xml: Start alf_store changes 18567: SAIL-235: Permissions DAO refactor 18596: SAIL-305: Alfresco DDL - formatted/rationalized and added missing indexes & fk constraints 18603: SAIL-311: Minor cleanup for schema upgrade scripts (V3.3) 18604: SAIL-311: Remove empty dirs 18619: SAIL-274: Locale.hbm.xml 18621: Added method to create default ACL 18622: SAIL-234: Node.hbm.xml: Store, Transaction, Server and some node 18624: Formatting only (eol) 18631: SAIL-235: Permissions DAO refactor 18633: SAIL-235: Permissions DAO refactor - do not expose CRUD for AceContext (or AuthorityAlias) since currently unused 18639: getLocale(Locale) should return null if it doesn't exist 18640: SAIL-234 NodeDAO: More replacement of node queries and updates 18648: SAIL-310: Create SQL script for core repo tables (All DB ports) 18651: SAIL-234 NodeDAO: Moves across stores handle presence of target deleted nodes 18961: Merged DEV/V3.3-DAO-REFACTOR to DEV/V3.3-DAO-REFACTOR-2 18658: SAIL-274 Locale DAO: Missing getValueKey() method 18662: SAIL-235: Permissions DAO refactor - further cleanup (of DbAccessControlList usage, including copyACLs) 18664: DB scripts porting for PostgreSQL finished. 18668: SAIL-234 Node DAO: Note in case Transaction Change ID is dropped from indexes 18669: SAIL-234 Node DAO: deleteNode and archive (store move) fixes 18672: DB scripts porting for Oracle finished. 18675: SAIL-235: Permissions DAO refactor 18677: DB scripts porting for DB2 finished. 18964: Merged DEV/V3.3-DAO-REFACTOR to DEV/V3.3-DAO-REFACTOR-2 18687: Execute a callback with retries 18688: SAIL-234 Node DAO: Child association creation 18690: SAIL-234 Node DAO: Comment out raw creation of stores as it breaks subsequent bootstrap checks 18691: SAIL-234 Node DAO: More replacement of alf_child_assoc handling 18713: Commented about needing a more efficient removeChildAssociation method 18714: SAIL-234 Node DAO: Replaced queries on alf_child_assoc 18715: SAIL-234 Node DAO: More alf_child_assoc query replacement 18727: SAIL-234 Node DAO: alf_child_assoc queries complete 18737: SAIL-234 Node DAO: Tweaks to newNode and implemented prependPaths 18741: SAIL-234 and SAIL-334: Moved UsageDelta Hibernate code and queries over to UsageDeltaDAO 18748: SAIL-234 Node DAO: fix NPE (EditionServiceImplTest) 18769: SAIL-234 Node DAO: alf_node_properties ground work 18786: SAIL-234 Node DAO: alf_node_properties and cm:auditable properties 18810: Added EqualsHelper.getMapComparison 18813: TransactionalCache propagates cache clears and removals during rollback 18826: SAIL-234 Node DAO: Moved over sundry references to NodeDaoService to NodeDAO 18849: SAIL-237: UsageDelta.hbm.xml - eol formatting only (including removal of unwanted svn:eol-style=native property) 18869: SAIL-234 NodeDAO: Fixed more references to 'nodeDaoService' 18895: SAIL-234 NodeDAO: Queries for alf_transaction 18899: SAIL-234 Node DAO: Fixed bean fetching for 'nodeDAO' 18909: SAIL-234 NodeDAO: Fixes to getNodeRefStatus and various txn queries 18916: SAIL-234 NodeDAO: Fixed moveNode alf_child_assoc updates 18922: SAIL-235: DAO refactoring: Permission.hbm.xml 18930: SAIL-235: DAO refactoring: Permission.hbm.xml 18932: SAIL-234 NodeDAO: Fixing up gotchas, javadocs and some naming 18933: SAIL-234 NodeDAO: Minor neatening 18935: SAIL-234 Node DAO: Caches for ID to NodeRef and StoreRef 18936: EHCache config files line endings 18938: SAIL-237: Usage DAO refactor - initial checkpoint 18945: SAIL-235: DAO refactoring: Permission.hbm.xml. Move Node. 18975: Fix for move-node ACL jiggery-pokery 19067: SAIL-4: fix VersionHistoryImpl.getSuccessors (causing VersionServiceImplTest.testGetVersionHistorySameWorkspace failure) 19068: SAIL-234: fix VersionMigratorTest.testMigrateOneVersion 19074: SAIL-237: Usage DAO - update to common iBatis mapping pattern(s) to ease DB porting 19076: SAIL-231: Activities DAO - update to common iBatis mapping pattern(s) 19077: SAIL-232: AppliedPatch DAO - minor cleanup (comments & formatting only) 19092: Merging HEAD to DEV/V3.3-DAO-REFACTOR-2 18973: Temporarily comment out AVMTestSuite and run AVM tests individually 19056: AVM unit test improvements 19097: SAIL-235: DAO refactoring: Permission.hbm.xml: Additional index to support queries to find the id and acl id for the primary children of a node. 19185: SAIL-238: Permissions DAO - (minor) update to common iBatis mapping pattern 19289: SAIL-234 NodeDAO: Node cache replaces NodeRef cache 19302: SAIL-234 Node DAO: Added cache for node properties 19318: SAIL-4: AVM DAO - (minor) update to common iBatis mapping pattern 20690: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-4 to BRANCHES/DEV/V3.3-DAO-REFACTOR-5: 20063: (RECORD ONLY) DAO refactor branch V4 20146: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-3 to BRANCHES/DEV/V3.3-DAO-REFACTOR-4: 19401: SAIL-234 Node DAO: Fix permission service tests (setPrimaryChildrenSharedAclId needs to invalidate nodesCache) 19428: Fixed TransactionalCache issue with null and NullValueMarker 19429: Took empty cm:content creation out of FileFolderService#createImpl 19430: SAIL-234 Node DAO: Tweaks around caching and cm:auditable 19431: SAIL-4 DAO Refactor: Exception thrown when attempting writes in read-only txn have changed 19436: SAIL-234 Node DAO: Fix NPE during cm:auditable update 19475: Allow debugging of code without stepping into trivial stuff 19476: Follow-up on 19429 by ensuring CIFS/FTP set a mimetype on the ContentWriter 19477: SAIL-234 Node DAO: Leverage DAO better for NodeService.addProperties 19478: SAIL-234 NodeDAO: Added toString() for ParentAssocsInfo (cache value for parent assocs) 19479: SAIL-234 Node DAO: Fixed for parent association and property caches 19480: Made TransactionAwareSingleton bind-key a GUID 19481: SAIL-234 Node DAO: Reinstated 100K collection property tests 19482: SAIL-234 Node DAO: Node and property cache fixes highlighted by unit tests 19483: SAIL-234 Node DAO: Start on NodeBulkLoader implementation 19595: SAIL-234 Node DAO: Fix moveNode to detect cyclic relationship prior to updating ACLs for moved tree FileFolderServiceImplTest.testETHREEOH_3088_MoveIntoSelf) 20147: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-3 to BRANCHES/DEV/V3.3-DAO-REFACTOR-4: 19602: (RECORD ONLY) Reintegrated with HEAD up to rev 19433 19621: (RECORD ONLY) SAIL-347 19683: (RECORD ONLY) Reverse-merged 19621 for SAIL-347 19722: (RECORD ONLY) Merged /alfresco/HEAD:r19434-19721 20150: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-3 to BRANCHES/DEV/V3.3-DAO-REFACTOR-4: 19741: Merged DEV\V3.3-DAO-REFACTOR-2 to DEV\V3.3-DAO-REFACTOR-3 19739: Extended "move" tests 19743: Fix AuditableAspectTest.testAddAspect (to allow for node modified date tolerance) 19748: Remaining part of merge from HEAD to V3.3-DAO-REFACTOR-3 19367: Merged BRANCHES/V3.2 to HEAD: 19286: Fix for ALF-626 "Using 'null' as an authority argument in clearPermissions() cause a java.lang.NullPointerException" 19755: SAIL-234 Node DAO: Fix RepoAdminServiceImplTest.testConcurrentDynamicModelDelete (handle InvalidNodeRefException after getChildAssocs) 20692: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-4 to BRANCHES/DEV/V3.3-DAO-REFACTOR-5: - Retired all 1.3 and 1.4 upgrade scripts ... R.I.P. - Fixed CRC patch for Authorities (only tested on MySQL) - Fixed SQL patch revision numbers and bumped version schema number up 20158: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-3 to BRANCHES/DEV/V3.3-DAO-REFACTOR-4: 19773: SQL mappings and scripts: SAIL-310, SAIL-304, SAIL-303 and SAIL-347 19774: Futher fix for SAIL-310: Sequence patch must take into account sequences created for 3.3 19851: SAIL-371 (SAIL-294) NodeDAO fallout: Fix QName and Namespace read/write handling and bean name in unit test 20183: Merged DAO3 to DAO4 19852: SAIL-370: Remove LinkValidation 19853: SAIL-239 (SAIL-294) Attributes.hbm.xml: Added ability to attach arbitrary property to unique context 19857: SAIL-373 Fallout from Permissions DAO refactor (SAIL-235) 19864: SAIL-239 (SAIL-294): Removed AttributeService RMI API 19865: More SAIL-239 (SAIL-294): Removed AttributeService RMI API 20208: DAO-refactor implementation of ALF-2712 query improvements 20209: Merged BRANCHES/DEV/V3.3-DAO-REFACTOR-3 to BRANCHES/DEV/V3.3-DAO-REFACTOR-4: 20060: Removal of AttributeService for SAIL-239 (SAIL-294) 20348: SAIL-371 (SAIL-294): Protect collection properties during map insert and retrieval 20547: SAIL-371 (SAIL-294) Attributes.hbm.xml: implement getAttributes + fixes 20573: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests and other fallout 20597: SAIL-239 Attributes.hbm.xml: WCM/AVM locking test fixes (wip) 20598: SAIL-239 Attributes.hbm.xml: WCM/AVM locking test fixes (wip) - fix AssetServiceImplTest.testSimpleLockFile NPE 20600: Fix PropertyValueDAOTest.testPropertyValue_Enum (follow-on to r20060 for SAIL-239 - which introduces ENUM prop vals) 20601: Fix UsageDAOTest.testCreateAndDeleteUsageDeltas NPE (would also affect ContentStoreCleanerScalabilityRunner) 20603: Fix CMISPropertyServiceTest.* (fallout from r20146 <- r19429 <- Took empty cm:content creation out of FileFolderService#createImpl) 20604: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests - TransferServiceImplTest.* 20618: SAIL-371 (SAIL-294): NodeDAO: AuditableAspectTest (fix testCreateNodeWithAuditableProperties_ALF_2565 + add remove aspect test) 20624: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests - UserUsageTest.* 20626: Fixed random keys for RuleTrigger NodeRef tracking 20635: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests - PersonTest.testSplitDuplicates 20642: SAIL-371 (SAIL-294) DAO: Fixed CacheTest 20643: Removed must of the 'distribute' target's dependencies. Not for HEAD 20645: Follow-on to r20643 (Removed most of the 'distribute' target's dependencies. Not for HEAD) 20654: SAIL-371 (SAIL-294): NodeDAO: DMDeploymentTargetTest.* (do not try to remove mandatory aspects) 20655: SAIL-371 (SAIL-294): NodeDAO: Initial fix for TaggingServiceImplTest.testTagScopeUpdateViaNodePolicies (+ minor test cleanup) 20657: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests - VersionMigratorTest.testMigrateOneVersion (cm:accessed not returned if null) 20658: Merged (back merge only - no merge info) BRANCHES/V3.3 to BRANCHES/DEV/V3.3-DAO-REFACTOR-4: 20090: Dynamic models: minor improvements to DictionaryModelType 20554: Improvement to model delete validation (investigating intermittent failure of RepoAdminServiceImplTest.testSimpleDynamicModelViaNodeService) 20662: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests - RecordsManagementAuditServiceImplTest.* (we now ignore attempt to update 'cm:modifier' prop so update 'cm:title' prop instead) 20666: SAIL-371 (SAIL-294): NodeDAO: Fix unit tests - ADMLuceneTest.* 20668: SAIL-239 (SAIL-294) - delete WCM locks + tests (follow-on to r20060) 20674: SAIL-371 (SAIL-294) NodeDAO fallout: Cleaner and additional checks for ContentStoreCleaner 20675: SAIL-371 (SAIL-294) NodeDAO fallout: Fixed handling of ContentData git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20693 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2010-06-17 19:35:49 +00:00
Mark Rogers	53e420e2a0	ALF-3157 - Conflict between IMAP and Audit ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20636 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2010-06-14 15:26:30 +00:00
Steven Glover	b609117c78	Fix for ALF-3081: Failed to signal transition from workflow "Expired content in 'Test'" task when click "Task Done"s ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20592 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2010-06-10 15:22:56 +00:00
Dave Ward	890d3795ce	Merged V3.3 to HEAD ... 20440: RM: CapabilitiesTest.testDestroyRecordsCapability (MS SQL Server build) - use non-public nodeService 20441: Include virtual tomcat in installers 20442: Change bitrock builder version to use. 20443: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3: (Fixed tabs and removed 'svn:executable' and 'svn:eol-style') 20384: Merged BRANCHES/DEV/BELARUS/HEAD-2010_04_28 to BRANCHES/DEV/V3.3-BUG-FIX: 20271: ALF-803: Asset Service Improvements 20386: Merged V2.2 to V3.3-BUG-FIX 20385: Merged DEV/BELARUS/V2.2-2010_04_06 to V2.2 20379: V2.2-ALF-1888 AssociationQuery was corrected to filter ... 20387: Version Migrator (ALF-1000) - approx x3 boost (policies ignore version2 store) 20388: Merged BRANCHES/DEV/BELARUS/HEAD-2010_04_28 to BRANCHES/DEV/V3.3-BUG-FIX: 20372: ALF-897: It is impossible to create content when default value selected in ContentHeadlineBackground field for intranet_rssi_landing_template web-form (also fixes ALF-2798 & ALF-791) 20389: Merged BRANCHES/DEV/BELARUS/HEAD-2010_04_28 to BRANCHES/DEV/V3.3-BUG-FIX: 20374: ALF-2723: WCM - Http 500 creating content via webform 20394: Fix for ALF-2257 - It's impossible to find and add group at Records Manage Permissions page 20396: Fixed ALF-2956 "XSS attack is made when a rule is being deleted" 20397: Fix for ALF-922: Mysql does not support unique keys that contain nulls as one would expect 20402: ALF-2186 : Rules not being fired on datalist items - because it's a zero byte file? 20404: Fixed ALF-2109 "Rule doesn't apply to the files in sub-folders when 'Run rule for this folder and its subfolders' action was performed" 20406: Fix for ALF-2985 - Share document library throws error if document modifier or creator is deleted from Alfresco 20409: Improved FormServiceImplTest, added more content related tests and some edge case tests using the FDK model (this test needs to be manually enabled though as the FDK model is not available by default) 20414: Merged DEV/BELARUS/HEAD-2010_04_28 to DEV/V3.3-BUG-FIX 20401: ALF-2616: Serious Web Form layout performance issues on IE8. This fix contains: 20427: Merged DEV/BELARUS/HEAD-2010_04_28 to DEV/V3.3-BUG-FIX 20042: ALF-1523: Failed Kerberos SSO auth doesn't fail through, simply returns a blank page 20323: ALF-1523: Failed Kerberos SSO auth doesn't fail through, simply returns a blank page 20428: Merged DEV/BELARUS/HEAD-2010_04_28 to DEV/V3.3-BUG-FIX 20417: ALF-736: WebDAV Folder Renaming fails on Mac but works on Windows. 20430: Fix for ALF-2313 - Accessing a Doclib folder in Share which has a link to a deleted node fails 20431: Version Migrator (ALF-1000) - migrate 1st batch independently 20432: Fix for ALF-2327 - Can not have more than one Transfer Step in a disposal schedule 20438: ALF-479: Merged DEV/BELARUS/V3.2-2010_01_11 to DEV/V3.3-BUG-FIX 18448: ETHREEOH-4044: External Authentication Subsystem does not perform user mapping for WebDAV requests 20444: Fix for ConcurrentModificationException in file server quota manager. ALF-2970. 20445: Merged HEAD to BRANCHES/V3.3: (RECORD ONLY) 20413: Added clean of quickr project 20446: Changed version to 3.3.1dev 20447: Merged V3.3-BUG-FIX to V3.3 20294: Fixes: ALF-1020 & ALF-1013 for all views except agenda. 20451: Merged V2.2 to V3.3 20450: Merged DEV/BELARUS/V2.2-2010_04_06 to V2.2 20412: ALF-1887: too easy to break alfresco - one can remove the guest user and recreate it but then access to RSS is broken - PersonServiceImpl.beforeDeleteNode prohibits attempts to delete a guest user. 20452: Fix for transaction error from NFS server file expiry thread. ALF-3016. 20458: ALF-2729 - rationalise (and deprecate) VersionLabelComparator 20460: Fix for ALF-2430 - AVM nodes are not checked for exclusion - the default ACLEntryVoter will always vote for AVM - avoids embedded AVM permission checks for getType/getAspect and anything else that may be added - seems AVM read is not checked upon "lookup" for the last node in the PATH (getType should have failed too) 20466: Merged V2.2 to V3.3 20243: (RECORD ONLY) ALF-2814: Merged V3.2 to V2.2 17891: Merged DEV_TEMPORARY to V3.2 17873: ETHREEOH-3810: WCM - Recursion detector erroring 20467: Merged V3.1 to V3.3 (RECORD ONLY) 20276: Incremented version label 20275: ALF-2845: Merged V3.2 to V3.1 17768: Merged DEV/BELARUS/V3.2-2009_11_24 to V3.2 17758: ETHREEOH-3757: Oracle upgrade issue: failed "inviteEmailTemplate" patch - also causes subsequent patches to not be applied 19573: Merged V3.2 to V3.1 19539: Merged HEAD to V3.2 19538: Build fix - fix build speed 20468: Merged PATCHES/V3.2.r to V3.3 (RECORD ONLY) 20357: Merged PATCHES/V3.2.0 to PATCHES/V3.2.r 20349: Merged V3.3 to PATCHES/V3.2.0 20346: ALF-2839: Node pre-loading generates needless resultset rows - Added missing Criteria.list() call 20339: Incremented version label 20338: Merged PATCHES/V3.2.0 to PATCHES/V3.2.r 20280: Fixed ALF-2839: Node pre-loading generates needless resultset rows - Split Criteria query to retrieve properties and aspects separately 20272: Backports to help fix ALF-2839: Node pre-loading generates needless resultset rows Merged BRANCHES/V3.2 to PATCHES/V3.2.0: 18490: Added cache for alf_content_data Merged BRANCHES/DEV/V3.3-BUG-FIX to PATCHES/V3.2.0: 20231: Fixed ALF-2784: Degradation of performance between 3.1.1 and 3.2x (observed in JSF) 20266: Test reproduction of ALF-2839 failure: Node pre-loading generates needless resultset rows 20469: Merged PATCHES/V3.1.2 to V3.3 (RECORD ONLY) 20393: Eclipse classpath fix to avoid problems in JBoss 20309: ALF-2777: PrimaryChildAssocCopyBehaviour from MOB-388 corrupts cm:name attributes of copied child nodes - Folded example behaviours from previous AMP into repository - Fixed PrimaryChildAssocCopyBehaviour to back-up and set the cm:name property on copied children 20470: Merged PATCHES/V3.2.0 to V3.3 (RECORD ONLY) 20465: Incremented version label 20464: ALF-3060: Merged V3.2 to PATCHES/V3.2.0 19920: Merged HEAD to BRANCHES/V3.2: 19918: Fix ALF-2499 (Deleting a web project also deletes similarly named web projects - Potential Data Loss) 20448: Merged DEV/V3.3-BUG-FIX to PATCHES/V3.2.0 20414: Merged DEV/BELARUS/HEAD-2010_04_28 to DEV/V3.3-BUG-FIX 20401: ALF-2616: Serious Web Form layout performance issues on IE8. This fix contains: a) X-UA-Compatible head tag with IE=EmulateIE7 value b) alfresco.ieVersion and alfresco.ieEngine in common.js c) recurseOnChildren in _updateDisplay d) Some performance modifications in xforms.js 20350: Increment version label 20349: Merged V3.3 to PATCHES/V3.2.0 20346: ALF-2839: Node pre-loading generates needless resultset rows - Added missing Criteria.list() call 20471: Fix for offline sync losing metadata properties, due to rename/delete of original file. ALF-575. 20478: Merged HEAD to BRANCHES/V3.3: (RECORD ONLY) 20477: Fix ALF-3086: CMIS checkin of a non-versionable document should make it versionable 20479: ALF-2110: Make it possible to determine which person properties are synced via LDAP and hence immutable - Added Set<QName> UserRegistrySynchronizer.getPersonMappedProperties(String username) - UI/Services Fix to follow 20481: Latest SpringSurf libs: - Fix for ALF-1518 - Added support for HTTP and HTTPS proxies for Surf application remote api calls - via the standard JVM cmd line properties such as -Dhttp.proxyHost=... 20484: ALF-2886: LDAP sync defaults display names incorrectly and can't cope with DNs containing escaped trailing whitespace. - Had to work around a JDK bug in LDAP RDN parsing 20486: Added case sensitive flag to the file state cache. Part of ALF-570. 20487: Fix for copy/rename of folders causing file exists errors in some cases. ALF-570. 20488: Fix ALF-680: Previously valid content models now fail with CMISAbstractDictionaryService$DictionaryRegistry exception 20489: Uploaded correct version of spring source jars and reunited them with 3rd-party/.classpath 20490: Fix for cannot delete folders via CIFS from Mac OSX, due to desktop actions. ALF-2553. 20491: Merged DEV/TEMPORARY to V3.3 (With corrections) 20485: ALF-2290: a HTTP GET request of a document redirects to the Home Location when using NTLM SSO The logic related to ADB-61 in NTLMAuthenticationFilter clears previous location and redirects request to default home location. NTLMAuthenticationFilter was changed to process GET requests to documents correctly. Now, fix to ADB-61 processes only “/faces” requests and GET requests to documents are processed correctly. The same fix was made to KerberosAuthenticationFilter 20492: Fix ALF-680: Previously valid content models now fail with CMISAbstractDictionaryService$DictionaryRegistry exception - missing remove directory 20493: Fix ALF-2837: ClassCastException in getProperties() 20498: Fix for ALF-2818: Failure to close index writer under certain conditions. - fix for index writer to close indexes when stopped by exceptions during FTS - fix FTS job to handle exceptions better - debug for FTS background operations 20499: ALF-3094: In ticket authenticate method in AuthenticationHelper, invalidate the current session if its cached ticket doesn't match 20500: Fix for ALF-2858 "Zero KB sized bin files will be created in the contentstore when new sites are created" (RECORD ONLY) 20503: AVMTestSuite: minor fixes to cleanup ctx usage (avoid re-loading) 20505: Merged BRANCHES/V2.2 to BRANCHES/V3.3 (record-only) 13859: (record-only) Removed dev from version label 14003: (record-only) Updated version to 2.2.5dev 14566: (record-only) ETWOTWO-1239 - remove workflow interpreter/console bootstrap 14572: (record-only) ETWOTWO-1239 - fix PersonTest to fix JBPMEngineTest (part-sourced from r13247) 14776: (record-only) Merged V3.1 to V2.2 14748: ETHREEOH-2225 - WCM upgrade (performance improvements for MySQL) 20506: NFS ReadDir/ReadDirPlus skips some folder entries. JLAN-98. 20507: Fixed issue with folder search resume id being reset to the wrong value during NFS folder search. Part of JLAN-98. 20508: Merged BRANCHES/V3.2 to BRANCHES/V3.3: 18319: Merged BRANCHES/DEV/BELARUS/V3.2-2010_01_11 to V3.2 18273: ETHREEOH-3834: WCM: An extral .xml.html file is created when editing newly created content 19182: Merged V3.1 to V3.2 18423: ETHREEOH-3850 - Content Manager unable to edit content items if there is a lock on a generated rendition 18432: (RECORD ONLY) Added FTP data port range configuration via <dataPorts>n:n</dataPorts> config value. ETHREEOH-4103. 18451: (RECORD ONLY) Fixed incorrect FTP debug level name. 18577: (RECORD ONLY) Fix for ETHREEOH-4117, based on CHK-11154 18792: Fix ETHREEOH-2729: Import of property with @ symbol in name fails with "start tag unexpected character @ " 19570: ALF-192 / ALF-1750: System Error if user trying submit web content based on web form which was deleted 19583: Merged DEV/BELARUS/V3.2-2010_03_17 to V3.2 19545: ALF-1954: Regression: same item can be submitted multiple times to workflow 19725: AVMStoreDescriptor - fix minor typo (for debugging) 19917: (RECORD ONLY) Merged HEAD to BRANCHES/V3.2: 19880: Fix ALF-898 - WCM: Deleting a file leads to error (only if RM/DOD installed) 19920: (RECORD ONLY) Merged HEAD to BRANCHES/V3.2: 19918: Fix ALF-2499 (Deleting a web project also deletes similarly named web projects - Potential Data Loss) 20509: Merged BRANCHES/V3.2 to BRANCHES/V3.3 (RECORD ONLY): 19825: (RECORD ONLY) Merged PATCHES/V3.2.r to BRANCHES/V3.2: 19804: Merged PATCHES/V3.2.0 to PATCHES/V3.2.r Merged HEAD to V3.2.0 ... 20510: Merged BRANCHES/V3.1 to BRANCHES/V3.3 (RECORD ONLY) 17482: (RECORD ONLY) Merged V3.2 to V3.1 17478: Fix ETHREEOH-3340 - WCM - Revert to snapshot failure (fix AVM getListing -> AVMSync compare -> WCM revertSnapshot) 18783: (RECORD ONLY) MT: ensure group (EMAIL_CONTRIBUTORS) bootstraps tenant admin user (when creating tenant) 20513: Added port change example for remote Alfresco server to share-config-custom.xml.sample 20518: ALF-657 Created tests to check that the 'runas' functionality works in the AlfrescoJavaScript action handler. Also modified the handler to run as the System user if no Authentication is currently set, as may occur if the action handler is being executed asynchronously. 20519: ALF-657 Created tests to check that the 'runas' functionality works in the AlfrescoJavaScript action handler. Also modified the handler to run as the System user if no Authentication is currently set, as may occur if the action handler is being executed asynchronously. 20520: Removed dev version.label 20522: ALF-3129: Map cm:organization property in LDAP as well as cm:organizationId, since cm:organization is what shows up in JSF and Share. Needed by ALF-2110. 20523: First part of fix for ALF-2110: - Appropriate Person and webframework metadata APIs now return information on immutability of Person properties (as some properties are immutable when synced to LDAP etc.) - Share client now correctly disables profile fields in User Profile and Admin User Console as appropriate based on individual user property mutability - Change Password button now correctly enabled/disabled based on account mutability 20524: VersionMigrator - option to run as scheduled job (ALF-1000) 20525: Fix for various IE6 CSS issues: ALF-3047 - It's impossible to destinate any action with data list item (IE6 specific) ALF-3049 - Incorrect layout of Manage aspects page ALF-3050 - Incorrect layout of Assign Workflow form 20526: Fix for ALF-2915 - Select > None feature for Data Lists not working across multiple pages in IE Closed ALF-2846 - DataList UI not fully I18Ned [Old prototype code] 20527: Fix for ALF-3082 - There is no Edit Offline action at Details page in Share site 20528: Fix various script errors due to typo: ALF-3088 - Script error occurs on creating duplicated record seria ALF-3012 - Incorrect behaviour on creating duplicating folders ALF-3004 - Script error when submitting an item with long data in Prioprity field 20529: Fix for ALF-3006 - Selected Items > Copy to... and Move to actions not working in Document Library 20530: Dynamic Models - fix test(s) - fix concurrency test for Oracle build (retry if txn lock cannot be acquired) - when getting deployed models, skip if invalid (eg. cannot be parsed) 20536: Remove @Override (ALF-657) 20537: Activities - (minor) fix NPE for Oracle build/test 20543: Final part of ALF-2110 - Appropriate person properties disabled for editing in Explorer Client if external mapped sync such as LDAP is used. Fixed issue with Change Password option being disabled incorrectly. 20544: Follow-up fix to r20528 20546: Fix for ALF-3151 - Freemarker causes NPE while deploying 3.3 enterprise onto WebSphere 7.0.0.7 - NOTE: will need to submit patch to freemarker.org 20552: Merged BRANCHES/V3.2 to BRANCHES/V3.3 (RECORD ONLY) 20551: (RECORD ONLY) Merged BRANCHES/V3.3 to BRANCHES/V3.2: 20090: Dynamic models: minor improvements to DictionaryModelType 20553: Fix for escalated issue ALF-2856: Space returns to browse view after completing Add Content dialog; need a way to return to custom view (applied patch provided by customer). 20554: Improvement to model delete validation (investigating intermittent failure of RepoAdminServiceImplTest.testSimpleDynamicModelViaNodeService) 20558: Merged DEV/BELARUS/V3.3-2010_06_08 to V3.3 20550: ALF-922: Mysql does not support unique keys that contain nulls as one would expect ...... duplicates in the alf_access_control_entry table 20562: ALF-3177 - security fix. 20563: Merged BRANCHES/V3.2 to BRANCHES/V3.3: 19412: Fix for ALF-865 "WCM / Cluster: unexpected error when concurrently submitting content" ALF-862 "WCM submit execution will require locking in a clustered WCM authoring env" 20564: Merged BRANCHES/V3.1 to BRANCHES/V3.3: 20542: Fixed ALF-3152: ImporterComponent transaction retry settings can cause IllegalArgumentException 20568: Follow-up on fix ALF-3152. Fix jobLockService's retryWaitIncrementMs git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20572 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2010-06-09 14:53:24 +00:00
Jan Vonka	d74f934789	Fix ALF-2499 (Deleting a web project also deletes similarly named web projects - Potential Data Loss) ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19918 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2010-04-20 15:36:45 +00:00
Jan Vonka	49856600ae	WCM: consolidate getWebProject & deleteSandbox (also precursor for SAIL-359) ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19378 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2010-03-18 17:33:21 +00:00
Mark Rogers	695d8d06eb	Annotating some of the newer Public Services with the PublicService annotation. ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19348 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2010-03-17 15:32:44 +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
Derek Hulley	5e86299377	Merged V3.2 to HEAD ... 17620: Merged DEV_TEMPORARY to V3.2 17599: Fix for ETHREEOH-3308: xf:switch cannot be used in repeating field type 17634: Put back AVM concurrency checks (reverse r17405) 17644: Fixed up some comments and added return value to in-txn recording of deleted nodes 17647: Fixed read-only detection of ContentStoreCleaner 17648: Merged DEV fixes for ETHREEOH-3473 and ETHREEOH-3454 - DB script and iBatis-related changes 17649: Fixed problem after merge-in: ETHREEOH-3641: build 270: cannot install on PostgreSQL 17652: Fix ETHREEOH-3376 - Reindexer failure: requires rollback (Cluster) 17658: Removed failing concurrency test for split person cleanup 17659: Merged V3.1 to V3.2 17308: Fixed ETHREEOH-2310: Upgrade from 2.1 E Sp7 to 3.1.1 E build 225 - Duplicate alf_node_status entries detected Fixes ETHREEOH-3606 (same as CHK-10454) 17661: Fixed DB2 iBatis problems related to http://issues.apache.org/jira/browse/IBATIS-536 17666: ETHREEOH-3376 / ETHREEOH-3637 - reindexer failure in a cluster (dictionary repo bootstrap) 17678: Follow-on to r17666 (for RM custom model) 17685: Merged DEV_TEMPORARY to V3.2 17676: ETHREEOH-3187: Creating Web Content based on Web Form with most elements-read-only/default failed 17695: Temporarily comment-out testSubmitChangedAssets1 ___________________________________________________________________ Modified: svn:mergeinfo Merged /alfresco/BRANCHES/DEV/BELARUS/V3.2-2009_11_24:r17632,17636,17676 Merged /alfresco/BRANCHES/DEV/BELARUS/V3.2-2009_11_09:r17599 Merged /alfresco/BRANCHES/V3.1:r17308 Merged /alfresco/BRANCHES/V3.2:r17620,17634,17644,17647-17649,17652,17658-17659,17661,17666,17678,17685,17695 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18165 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2010-01-20 11:30:46 +00:00
Jan Vonka	8db9d90a72	Merged V3.2 to HEAD ... 17307: Merged DEV/BELARUS/V3.2-2009_10_19 to V3.2 17121: ETHREEOH-2999: Accessing Recent snapshots fails in a web project that is created from an already existing project 17223: ETHREEEOH-2999: (post-review changes) 17346: ETHREEOH-2824 - further perf improvement for multiple single submits (to active workflow sandboxes) from large modified list 17375: Fix ETHREEOH-1643 - WCM revert file & version history, including a few unreported WCM / UI revert file issues 17380: ETHREEOH-1643 - fix build/test fallout git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18110 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2010-01-19 10:26:45 +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
Jan Vonka	e6cd7ddbcd	Update WCM submit tests - fix couple of typos (follow-on from 16993) ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16994 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2009-10-16 16:52:45 +00:00
Jan Vonka	e197ee5805	Update WCM submit tests - to poll (rather than sleep) and also add test for bulk import with single submits ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16993 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2009-10-16 16:30:24 +00:00
Jan Vonka	3db59a0960	Merged V3.2 to HEAD ... 16714: WCM/AVM fixes - ETHREEOH-2697 & ETHREEOH-1847 16802: Merged V3.1 to V3.2 16801: AVMTestSuite - add couple of missing unit tests 16810: WCM locking - minor improvement to include lock owner (when trying to "grabLock") git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16925 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2009-10-14 14:37:18 +00:00
Jan Vonka	e096d59076	Merged V3.2 to HEAD ... 16030: Merged V3.1 to V3.2 16001: Merged V2.2 to V3.1 15999: Temp build/test (AVM permissions - testSimpleInternalLayer) 16223: WCM UI - simple perf improvement when displaying modified list (lock icon) 16472: Merged V3.1 to V3.2 16180: ETHREEOH-2821 - fix deployment of WCM layered (ie. across web project) file 16188: WCM - minor: display (localisable) "File" text (follow-on fix for r15970) 16255: WCM - ETHREEOH-2836 16257: AVM - minor updates to unit tests 16275: WCM - ETHREEOH-2844 16277: WCM - ETHREEOH-2829 - added simple unit test 16341: AVM - minor update to reuse core (path) utils 16344: Merged V2.2 to V3.1 16323: Fix ETWOTWO-1266 (unexpected AVM conflict) 16457: Fix ETHREEOH-2836 (WCM layered files) - follow-on fix, with additional unit test 16649: Fix ETHREEOH-1878 - configure WCM locking for CIFS/FTP 16654: Merged V3.1 to V3.2 16507: Fix ETHREEOH-2604 - update unsecured-public-services-security-context.xml.sample (to allow server to start) 16527: Fix ETHREEOH-2868 - can't submit removal of WCM layered file (Older version prevents update) 16607: AVM - additional tests when deleting LD + fix to avoid cycle 16612: AVM - console improvement (lsver, rmvers) to enable admin/support to list & purge snapshots between dates 16638: Fix ETHREEOH-2893 - stale WCM/AVM layered dir 16643: AVM - console improvement (setopacity) -> eg. to set stale/modifed WCM layered folder as opaque git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16895 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2009-10-14 09:20:15 +00:00
Derek Hulley	2dd348a281	Merged V3.2 to HEAD ... 15897: Merged V3.1 to V3.2 14485: (RECORD ONLY) ETHREEOH-1937 14915: (RECORD ONLY) Fix for ETHREEOH-2011: chaining-authentication-context.xml.sample 14954: (RECORD ONLY) Fix merge error 14966: (RECORD ONLY) Merged V2.2 to V3.1 14131: *RECORD ONLY* 14605: Merged HEAD to V2.2 (workaround for ETWOTWO-1137) 14368: Fix for ETHREEOH-1936 14607: Fixed NPE in TextMiningContentTransformer: Lead-up to fix for ETWOTWO-1174 14992: (RECORD ONLY) Updated svn:mergeinfo for V2.1-A 15080: Applied suggested fix for ETHREEOH-2252: Emailed content created in wrong space 15131: Merged V2.1-A to V3.1 (ETHREEOH-2270) 13465: Fix for ADB-161 ACT 7870 - added 'xsd' to mimetype map. 15134: Merged V2.2 to V3.1 14332: (RECORD-ONLY) 14717: (RECORD-ONLY) 14745: (RECORD-ONLY) 14746: Fixed error relating to detection and clean-up of duplicate child associations 14759: Missed check-in: Set transactionService for post-transaction duplicate child assoc cleanup 14761: (RECORD-ONLY) 14885: (RECORD-ONLY) 14893: (RECORD-ONLY) 14903: (RECORD-ONLY) 15204: Fixed ETHREEOH-2303: FixNameCrcValuesPatch throws ConstraintViolationException during upgrade ... 15214: Fixed ETHREEOH-1861: Offline synchronization updates file content without any changes 15271: Applied patch fix: Imported users don't conform to case-sensitivity switch 15352: ETHREEOH-2322 15361: ETHREEOH-1112 15369: ETHREEOH-2448 15419: ETHREEOH-2479 15431: ETHREEOH-2520 and ETHREEOH-2521 15587: (RECORD ONLY) Moved Enterprise-only scripts to correct location 15616: Fix ETHREEOH-2581 - WCM layered folder - can't submit deleted file 15675: WCM fixes (ETHREEOH-2110 & ETHREEOH-2645) 15836: Check for null username in ContentUsage service getUserUsage() method 15840: (RECORD ONLY) Merged V3.2 to V3.1 14760: Fix for ALFCOM-586 - trims and ignores leading/trailing whitespace before validation in JSF client forms. 15841: Fixes for ETHREEOH-2702 and ETHREEOH-2687 15860: (RECORD ONLY) Added Oracle and MS SQL Server config 15891: Removed unused compiler directive ___________________________________________________________________ Modified: svn:mergeinfo Merged /alfresco/BRANCHES/DEV/BELARUS/ETHREEOH-2221:r14753 Merged /alfresco/BRANCHES/V2.1-A: lots Merged /alfresco/BRANCHES/V2.2:r14131,14332,14605,14607,14717,14745-14746,14759,14761,14885,14893,14903 Merged /alfresco/BRANCHES/V3.1:r14485,14915,14954,14966,14992,15080,15131,15134,15204,15214,15271,15352,15361,15369,15419,15431,15587,15616,15675,15818,15836,15840-15841,15860,15891 Merged /alfresco/BRANCHES/V3.2:r15897 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16886 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2009-10-13 20:08:41 +00:00
Jan Vonka	2eeefe0a72	Merged V3.2 to HEAD ... 15596: Merged V3.1 to V3.2 14017: Fix ETHREEOH-1880 - remove (double-)reverse of WCM staging snapshot order 14112: Fix ETHREEOH-1758 - apply contributed patch 14447: Merged V2.2 to V3.1 14276: ETWOTWO-1224 / WCM-948 - browsing staging area during (commit of) large submit can cause AVMNotFoundException: Path /www/avm_webapps not found. 14452: Add WCM services-based unit test for ETWOTWO-1224 / WCM-948 14589: ETHREEOH-1646 - User Sandboxes aren't visible for Content Publisher 15604: Merged V3.1 to V3.2 14734: Merged V2.2 to V3.1 14718: ETWOTWO-1244 - unable to revert some snapshots ("Does not exist: xxx") 14852: Merged V2.2 to V3.1 14720: ETWOTWO-1183 - "Show All Sandboxes" checkbox should only be visible for "Content Publisher" or "Content Manager" 15032: Fix ETHREEOH-2240 - delete WCM web project (does not clean-up workflow sandboxes and also appears in archive store) 15037: Fix ETHREEOH-2240 - follow-on for Alfresco Explorer's Manage (Review) Task Dialog 15056: Fix ETHREEOH-2297 - WCM layered folder - problem deleting file 15072: Minor - fix remote AVM test 15605: Merged V3.1 to V3.2 15082: Merged V2.2 to V3.1 15081: AVM - add tests only 15083: Fix ETHREEOH-2296 - user conflict when updating an AVM layered file 15118: Merged V2.2 to V3.1 15115: Fix ETWOTWO-1265 - WCM locking not working as expected (+ add WCM services test) 15137: Fix ETHREEOH-2309 and ETHREEOH-227 - including refactor (& clean-up) of WCM-related actions 15156: Fix ETHREEOH-2078 & ETHREEOH-2040 - WCM - deploy to localhost causes "Must have at least one store" errors 15175: Fix ETHREEOH-2309 and ETHREEOH-227 - further clean-up of WCM submit/undo actions (for consistency) 15190: Minor: message updates for WCM submit/undo actions git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16858 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2009-10-13 11:34:23 +00:00
Jan Vonka	d78e0152e2	Merged V3.2 to HEAD ... 15171: Merged V3.1 to V3.2 14215: Fixed ETHREEOH-1314 - WCM - content publisher cannot submit existing folder that has modified properties git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16852 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2009-10-13 10:46:28 +00:00
Andrew Hind	9c630f07f3	Merged V3.1 to HEAD ... 14919: Merged V2.2 to V3.1 14785: Fix for ETWOTWO-1164: Newly created access groups for web projects are not deleted when the project is removed git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14950 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2009-06-26 09:39:30 +00:00
Andrew Hind	e3df62325d	Extended zone support for multiple zones and added Authorities (including people) to zones. (MOB-762: Part 1) ... WCM and Share groups are not in the default zones so they can be hidden in the UI. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14762 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2009-06-17 11:57:21 +00:00
Jan Vonka	2051b0709a	MOB-690 - WCM PreviewURIService - checkpoint ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14642 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2009-06-10 17:04:09 +00:00
Dave Ward	d5e0432589	Merged BRANCHES/DEV/DAVEW/LDAP to HEAD ... 14587: Added new node service method getNodesWithoutParentAssocsOfType to public-services-security-context.xml (or at least my best guess at it!) 14586: Use US spelling of synchronization in filenames for consistency 14585: Lower the default user registry sync frequency to daily instead of hourly. Now users and groups are pulled over incrementally on login of missing users. 14583: Unit test for ChainingUserRegistrySynchronizer 14571: Migration patch for existing authorities previously held in users store - Uses AuthorityService to recreate authorities in spaces store with new structure 14555: Authority service changes for LDAP sync improvements - Moved sys:authorities container to spaces store - All authorities now stored directly under sys:authorities - Authorities can now be looked up directly by node service - Secondary child associations used to model group relationships - 'Root' groups for UI navigation determined dynamically by node service query - cm:member association used to relate both authority containers and persons to other authorities - New cm:inZone association relates persons and authority containers to synchronization 'zones' stored under sys:zones - Look up of authority zone and all authorities in a zone to enable multi-zone LDAP sync 14524: Dev branch for finishing LDAP zones and upgrade impact git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14588 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2009-06-08 16:16:32 +00:00
Jan Vonka	3ad91710fa	WCM services - update test since code has now been merged from V3.1 (r13605) ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13661 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2009-03-17 18:04:15 +00:00
Derek Hulley	198ebe371e	Merged V3.1 to HEAD ... 13256: Fix ETHREEOH-1221 Hard-coded use of "admin" username ___________________________________________________________________ Modified: svn:mergeinfo Merged /alfresco/BRANCHES/V3.1:r13256 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13613 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2009-03-12 21:48:15 +00:00
Derek Hulley	07114a1ed2	Merged V3.1 to HEAD ... 13175: Basic implementation of timestamp propagation 13176: Fixed ETHREEOH-1172: NodeService.getProperties sometimes returning instance of "Collections.SingletonList" 13184: Merged V3.0 to V3.1 13179: Merged V2.2 to V3.0 13141: Fix for ETWOTWO-1109: WCM - content publisher cannot submit modified assets (2.2.3-dev regress) 13144: Fix for repopened ETWOTWO-1082: AVM has concurrency limitations via CIFS/NFS/FTP ... 13180: Merged V2.2 to V3.0 13144: Fix for repopened ETWOTWO-1082: AVM has concurrency limitations via CIFS/NFS/FTP ... 13185: Logging enhancements to FileFolderService to aid debugging of ETHREEOH-1247 13187: Changed NPE to IllegalArgumentException 13191: Fix for ETHREEOH-1267 malformed JSON. 13203: Fix ETHREEOH-1309 regress 13205: Fixed typo of UNKNOWN 13206: DM index check - allow index transaction tracker to be reset, etc 13213: Fixed ETHREEOH-1313: System Property Overrides not working when using the installer 13214: WCM services - add/update unit tests - CRUD using different roles ___________________________________________________________________ Modified: svn:mergeinfo Merged /alfresco/BRANCHES/V3.0:r13179-13180 Merged /alfresco/BRANCHES/V2.2:r13141,13144 Merged /alfresco/BRANCHES/V3.1:r13172,13175-13176,13179-13181,13184-13189,13191,13203,13205-13206,13210-13215 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13610 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2009-03-12 20:15:34 +00:00
Derek Hulley	9450cbb94e	Merged V3.1 to HEAD ... 13170: WCM services - improve reliability of unit test teardown (possible conflict w/ OrphanReaper) ___________________________________________________________________ Modified: svn:mergeinfo Merged /alfresco/BRANCHES/V3.1:r13170 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13605 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2009-03-12 15:40:23 +00:00
Derek Hulley	cf86bf466c	Merged V3.1 to HEAD ... 13077: Abstracted ContentStore MBean operations 13099: Merge V3.0 to V3.1 13096 Merged V2.2 to V3.0 13071: Fix ETWOTWO-1058: Hibernate exception while concurrently submitting from and updating same user sandbox. 13079: Fix ETWOTWO-1117: Misleading exceptions reported during AVM flatten and update 13102: [no comment] 13112: Merged V3.0 to V3.1 13111: Merged V2.2 to V3.0 13110: Fix 2.1 -> 2.2 upgrade on Postgres 13114: Build/test fix (Enterprise Remote API project does not yet have any Java files to generate Javadoc) 13117: DM Index Check - unit test improvements 13123: *RECORD ONLY* Removed svn:mergeinfo fluff 13124: Used newer, more efficient NodeService.addProperties method instead of many NodeService.setProperty calls 13125: Added M2Binding for 'child-association': propagateTimestamps' 13126: WCM unit tests - reduce build/test time to check (async) submits 13127: Minor test fix - to allow it to run locally (on Mac OS X) 13130: Support for 'maxRetries' of zero or less 13131: Merged V3.0 to V3.1 13025 *RECORD-ONLY*: Removed unnecessary svn:mergeinfo 13026: Merged V2.2 to V3.0 12964: Fixed ETWOTWO-968: Space rules are not run when saving from MS Word 12993 *RECORD-ONLY*: added openoffice bootstrap context to sample-extensions 13009 *RECORD-ONLY*: Avoid default OOo config from causing problems on zip/gz installs 13132: Updated svn:mergeinfo 13134: ETHREEOH-1202 - initial fix and unit tests ___________________________________________________________________ Modified: svn:mergeinfo Merged /alfresco/BRANCHES/V3.0:r13005,13025-13026,13030,13039,13042,13050,13053,13096,13098,13111 Merged /alfresco/BRANCHES/V2.2:r12964,12993,13009,13071,13079,13110 Merged /alfresco/BRANCHES/V3.1:r13077,13099,13102,13112,13114,13117,13123-13127,13130-13132,13134 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13564 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2009-03-11 13:19:59 +00:00
Derek Hulley	2c563871d8	Merged V3.1 to HEAD ... 13033: Back end support for ETHREEOH-1179 13038: JAWS-436 - refactor WCM submit dialog to use WCM sandbox service + update unit tests 13046: Merged V3.0 to V3.1 13043: Merged V2.2 to V3.0 13016: Fix for ETWOTWO-1088 (reset layer using flatten rather than delete & add, users can flatten in stores they own but not delete) 13049: Build/test fix (WCM AssetTest) 13057: Merged V2.1-A to V3.1 8770: Added Flex SDK module 8771: Added Flex SDK binary (swc) DH: I'm not sure about the svn:eol-style property appearing here. SVN Clients? 13059: Added 'AIX' as a platform type, from Adobe V2.1A, missed checkin. 13060: [no comments] 13061: [no comments] 13063: [no comments] 13064: [no comments] 13066: [no comments] 13067: Add NodeService.getChildrenByName 13072: Added new NodeService.getChildrenByName() method to public-services-security-context. ___________________________________________________________________ Modified: svn:mergeinfo Merged /alfresco/BRANCHES/V3.0:r13043 Merged /alfresco/BRANCHES/V2.2:r13016 Merged /alfresco/BRANCHES/V3.1:r13033,13038,13046,13049,13057,13059-13061,13063-13064,13066-13067,13072 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13552 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2009-03-11 04:21:44 +00:00
Derek Hulley	6eb1963971	Merged V3.1 to HEAD ... 12994: Merged V3.0 to V3.1 12931: Merged V2.2 to V3.0 12635: Fix for ETWOTWO-995: Diff performance degrades on large data sets 12742: Fix for ETWOTWO-981: WCM - regression - revert fails (eg. for content publisher) 12743: AVM - add missing tests to test suite & fix existing tests (including base setup) 12759: AVM - build/test fix - follow-on to r12742 12781: Fix PersonDAO - fixes AuthorityServiceTest which failed after adding AVMServicePermissionsTest 12932: Merged V2.2 to V3.0 12763: Support for ETWOTWO-975: AVMDifference now implements Comparable<AVMDifference> 12782: Fix for ETWOTWO-939: Content Contributor cannot edit their own items 12809: Test fixes after r 12782 12818: ETWOTWO-977 (Orphan Reaper) - removal of comment questioning cache interaction. 12933: Merged V2.2 to V3.0 12306: (record-only) Final set of XSS and HTML encoding fixes for ETWOONE-90 - already merged (see r12310) 12934: Merged V2.2 to V3.0 12311: (record-only) Fix for ETWOONE-389 - Current page number not always visible on the browse screen - already merged (see r12312) 12935: Merged V2.2 to V3.0 12320: (record-only) Fix for ETWOONE-87: Behavior of delete cascade - already merged (see r12324) 12322: (record-only) Fix merge issue (marked as Do Not Merge - see CHK-5607) 12936: Merged V2.2 to V3.0 12775: (record-only) ETHREEOH-872: Editing Email-notify-rules fails w/ ClassCastException (back-port of r11966) 12937: Merged V2.2 to V3.0 12780: Fixed ETWOTWO-1003: DuplicateChildNameException not generated correctly (on Oracle) 12820: Update to ETWOTWO-926 (WCM Form Inline callouts to Web Scripts) 12825: Further ETWOTWO-926 update: provide compatibility with old token scheme as the original patch has already made its way into 3.0.1 12850: ETWOTWO-975 - Show Conflicts in Modified Items List 12938: Fix merge typo (follow on from r12931) 12941: Fix merge typo (follow on from r12931) 12998: Cleaned up svn:mergeinfo entries ___________________________________________________________________ Modified: svn:mergeinfo Merged /alfresco/BRANCHES/V3.0:r12931-12938,12941 Merged /alfresco/BRANCHES/V2.2:r12306,12311,12320,12322,12635,12742-12743,12759,12763,12775,12780-12782,12809,12818,12820,12825,12850 Merged /alfresco/BRANCHES/V3.1:r12994,12998 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13549 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2009-03-11 02:50:32 +00:00
Derek Hulley	b9bcb907bc	Merged V3.1 to HEAD ... 12991: Merged V3.0 to V3.1 12929: Merged V2.2 to V3.0 12579: Fix ETWOTWO-925: Adding users to a web project is slow due to permission setting 12583: Fix ETWOTWO-925: Added post fix snapshot (follow on from 12579) ___________________________________________________________________ Modified: svn:mergeinfo Merged /alfresco/BRANCHES/V3.0:r12929 Merged /alfresco/BRANCHES/V2.2:r12579,12583 Merged /alfresco/BRANCHES/V3.1:r12991 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13547 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2009-03-11 02:20:29 +00:00
Derek Hulley	e3503a6a88	Merged V3.1 to HEAD ... 12983: Merged V2.1-A to V3.1 8668: Added authorityDisplayName 12985: Merged V2.1-A to V3.1 8706: (record-only) Build fixes after removing the guest user - DO NOT MERGE 12990: Merged V3.0 to V3.1 12922: Merged V2.2 to V3.0 12555: Fix ETWOTWO-972 (Remove Lookup Cache) 12558: Fix ETWOTWO-978 (L2 Cache removal for No Row Issues) 12928: Merged V2.2 to V3.0 11319: Fix for ETWOTWO-73 (missed merge ?) ___________________________________________________________________ Modified: svn:mergeinfo Merged /alfresco/BRANCHES/V2.1-A:r8668,8706 Merged /alfresco/BRANCHES/V3.0:r12922,12928 Merged /alfresco/BRANCHES/V2.2:r12555,12558 Merged /alfresco/BRANCHES/V3.1:r12983,12985,12990 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13546 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2009-03-11 01:48:45 +00:00
Derek Hulley	9ad1644441	Merged V3.1 to HEAD ... 12982: Merged V3.0 to V3.1 12921: Merged V2.2 to V3.0 12524: Fix ETWOTWO-974: Submit Action Queue (...) 12687: Add missing workflow to bootstrap (follow on from 12524) ___________________________________________________________________ Modified: svn:mergeinfo Merged /alfresco/BRANCHES/V3.0:r12921 Merged /alfresco/BRANCHES/V2.2:r12524,12687 Merged /alfresco/BRANCHES/V3.1:r12982 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13545 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2009-03-11 01:17:39 +00:00
Jan Vonka	9efa446c68	Temporary build/test fix (will be removed when V3.1 is merged to HEAD upto and including r13170) ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13488 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2009-03-06 10:52:49 +00:00
Jan Vonka	2c3c766028	WCM SandboxService - minor/consistency updates ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12641 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2009-01-08 18:12:36 +00:00
Jan Vonka	f2d23ec0c1	WCM SandboxService - add SandboxVersion (wraps AVM VersionDescriptor) ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12640 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2009-01-08 17:38:45 +00:00
Mark Rogers	d09673969d	Merge DEV\WCM_SERVICES2 to HEAD ... 12513 Implementation of Asset.getProperties 12469 Implement paths relative to web app. And unit tests. Asset Test is now clean of TODOs. 12413 Implementation of WCM Asset. Still work remaining but this is 80% of the implementation. 12404 WCM Services - asset service - fix rename/move folder issue (folders are not locked) - sandbox service - fix delete sandbox test 12374 WCM Services - optimise get/is web project 12347 WCM Services - "asset service" - add/remove/has aspect, get aspects 12341 WCM Services - "asset service" checkpoint (locking fixes, bulk import, more tests added) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12547 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2008-12-23 22:54:46 +00:00
Jan Vonka	eb906a0d52	Merged DEV/WCM_SERVICES2 to HEAD ... 12236: Implementation of Sandbox Revert REST API 12305: WCM Services - "asset service" initial checkpoint (more tests to be added) 12334: placeholder for WCM Asset implementation 12338: Check in to get server working ... 12341: WCM Services - "asset service" checkpoint (locking fixes, bulk import, more tests added) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12544 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2008-12-23 14:48:34 +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
Jan Vonka	b387b9b85a	Merge/build fix - fallout from ETWOTWO-604 ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12489 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2008-12-18 13:47:58 +00:00
Mark Rogers	d24b54b4e6	Merge WCM_SERVICES2 to HEAD 12236 Implementation of REST WCM Revert ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12308 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2008-12-08 15:45:34 +00:00
Mark Rogers	d1ea5ad551	Merge WCM_SERVICES TO HEAD Changes 12213, 12214 ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12215 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2008-12-02 14:59:58 +00:00
Jan Vonka	3bd69a1734	WCM Services - "sandbox service" - cleanup (for consistency) ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12174 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2008-11-28 12:32:27 +00:00