66 Commits

Author	SHA1	Message	Date
Dave Ward	9bc5a1a7e1	Merged V4.0-BUG-FIX to HEAD ... 34321: Make CIFS virtual circuit per session limit configurable, return correct status code when virtual circuit limit is reached. Required by Terminal Server clients as they can use a single session for all connections. ALF-13156 34322: Services part of fix for ALF-13057 Nodes marked with rma:ghosted aspect (or other configurable aspects/types) should not be renditioned. 34323: Added configuration property for CIFS virtual circuits per session, required by Terminal Server clients. ALF-13156. 34332: Fix for ALF-8405 34336: Merged BRANCHES/V4.0 to BRANCHES/DEV/V4.0-BUG-FIX: 34335: Fixing a failing test as part of ALF-13057 34338: NodeDAO: re-parent "lost & found" orphan child nodes (see ALF-12358 & ALF-13066 / SYS-301) - test fix (follow-on to r34279) 34341: NodeDAO: re-parent "lost & found" orphan child nodes (see ALF-12358 & ALF-13066 / SYS-301) - ano test fix (once more with feeling) 34351: Merged V4.0 to V4.0-BUG-FIX 34335: (RECORD ONLY) Fixing a failing test as part of ALF-13057 34350: Merged V3.4 to V4.0 34327: ALF-13030 ALF-13041 Transformer Server needs filename and to make its transformer preferred over OpenOffice and JOD Relates to ALF-10976 and ALF-10412 set of changes - TransformerOptions.sourceNodeRef now populated - Set average transformer time via global properties - TransformerDebug of active transformers added 34331: ALF-13030 ALF-13041 Transformer Server needs filename and to make its transformer preferred over OpenOffice and JOD Relates to ALF-10976 and ALF-10412 set of changes - Fix test failures 34346: ALF-13030 ALF-13041 Transformer Server needs filename and to make its transformer preferred over OpenOffice and JOD Relates to ALF-10976 and ALF-10412 set of changes - sourceNodeRef was not available to the first child transformer of a ComplexContentTransformer 34358: Merged V4.0 to V4.0-BUG-FIX (RECORD ONLY) 34324: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/V4.0: 34322: Services part of fix for ALF-13057 Nodes marked with rma:ghosted aspect (or other configurable aspects/types) should not be renditioned. 34360: Merged V3.4-BUG-FIX to V4.0-BUG-FIX (RECORD ONLY) 34349: Merged V3.4 to V3.4-BUG-FIX 34327: ALF-13030 ALF-13041 Transformer Server needs filename and to make its transformer preferred over OpenOffice and JOD Relates to ALF-10976 and ALF-10412 set of changes - TransformerOptions.sourceNodeRef now populated - Set average transformer time via global properties - TransformerDebug of active transformers added 34331: ALF-13030 ALF-13041 Transformer Server needs filename and to make its transformer preferred over OpenOffice and JOD Relates to ALF-10976 and ALF-10412 set of changes - Fix test failures 34346: ALF-13030 ALF-13041 Transformer Server needs filename and to make its transformer preferred over OpenOffice and JOD Relates to ALF-10976 and ALF-10412 set of changes - sourceNodeRef was not available to the first child transformer of a ComplexContentTransformer 34348: Merged PATCHES/V3.4.7 to V3.4 34347: ALF-12949: Merged V4.0-BUG-FIX to PATCHES/V3.4.7 33959: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX 33950: Fix for ALF-12787: - Surf Memory usage optimizations and improvements to ModelObject and derived classes. - Reduced avg memory usage for a ModelObject in the Surf persister cache from 4.0K to 1.5K. - Related refactoring to support removal of in-memory XML DOM previously used to maintain ModelObject state. Now XML DOM only created as needed for set() operations and thrown away. - Improvements to Surf Persister cache strategy to support MRU style concurrent cache, now uses a LinkedConcurrentHashMap to provide a concurrent cache that also has a configurable maximum capacity - Added various improved spring config for persister caches and default sizes. Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX 33956: Latest SpringSurf libs: Fixed issue with overly aggressive caching of missing page View objects. 34108: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX 34107: Added missing jar lib to wcmquickstart and webeditor dependencies 34363: Merged V4.0 to V4.0-BUG-FIX 34362: Merged V3.4 to V4.0 (RECORD ONLY) 34282: ALF-13059: Windows 7 specific: It's impossible to add documents to DWS - Fix by Alex Malinovsky 34348: Merged PATCHES/V3.4.7 to V3.4 34347: ALF-12949: Merged V4.0-BUG-FIX to PATCHES/V3.4.7 33959: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX 33950: Fix for ALF-12787: - Surf Memory usage optimizations and improvements to ModelObject and derived classes. - Reduced avg memory usage for a ModelObject in the Surf persister cache from 4.0K to 1.5K. - Related refactoring to support removal of in-memory XML DOM previously used to maintain ModelObject state. Now XML DOM only created as needed for set() operations and thrown away. - Improvements to Surf Persister cache strategy to support MRU style concurrent cache, now uses a LinkedConcurrentHashMap to provide a concurrent cache that also has a configurable maximum capacity - Added various improved spring config for persister caches and default sizes. Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX 33956: Latest SpringSurf libs: Fixed issue with overly aggressive caching of missing page View objects. 34108: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX 34107: Added missing jar lib to wcmquickstart and webeditor dependencies git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34364 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2012-03-02 15:00:35 +00:00
Dave Ward	9389d310ae	Merged V4.0-BUG-FIX to HEAD ... 33116: Allow multiple deferred requests per oplock break, next level of fix for ALF-11935. 33136: Fix for ALF-12200: "Content type is not recognized on creating document from source" 33137: Activities feed generator: change info log messages to debug log messages 33139: ALF-12262 View in Source Repository works incorrect if the folder was created on target side at first 33141: Fix for ALF-12178 "Bulk import - status page shows broken link (Initiate another in-place import)" 33144: Fixes ALF-11119: The 2 tranformations didn't work - Segmentation fault in ffmpeg - it looks like a bug with ffmpeg and it was decided that compile/bug fixing ffmpeg is not a priority at the moment. The 2 entries have been commented out. If they are required, the user should consult the ffmpeg documentation for the correct version & o/s at the time. 33146: ALF-11345 Patch from Pavel Yurkevich to fix another VTI/SPP problem with site names that start with Alfresco 33147: FTP implemented set modification date/time command (MFMT). ALF-12105. 33148: ALF-12063 Pull some of the VTI list type definitions out to a common base class 33150: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX: 33076: ALF-12285: Allow dumping of schema to XML via JMX 33151: Fix problems with FTP and UTF-8. JLAN-81. When using the Java6 Normalizer use the NFC form. 33158: Fix NFS server swallows exceptions. ALF-11667. Startup exception details are now saved. 33160: Improve the Vti/SPP exception message for the case of the Vti port being already in use 33161: ALF-12063 Additional SPP/Vti list info required for Mac Office 2011 support 33162: Fixes: ALF-10322: Edit Dialogue gets out of sync if event moved using FullCalendar (extends FullCalendar to provide a callback after an event changes, which enables us to keep our event object up to date). 33163: Fixes: ALF-10248: Grey Placeholder image for unauthorised channels has now been replaced with yellow one. 33164: Fixes: ALF-11562; Refactors My Calendar dashlet to use timezone aware ISO8601 dates from updated Calendar API & removes obsolete properties from userevents calendar API 33165: Fixes: ALF-10645; i18n label doesn't appear in property bundle. 33167: Fix for ALF-11970 33168: Fix for ALF-10565 "Category manager in admin console needs query not search" - i18n'd the strings 33178: Publishing: Fixes: ALF-11552; Inline edit icon alignment issue fixed 33183: Minor fix to exception string in extendBuffer(). 33194: ALF-10545: NodeServicePolicies#onUpdateNodePolicy not adequate for NodeService#setType * Added beforeSetNodeType and onSetNodeType policies * Both callbacks have old and new types as parameters 33204: Fixes: ALF-11230, publishing tracking link opens in repository, not Doc Lib. Also fixes a couple of other minor bugs: - balloon pop up didn't appear when published from Doc Details page - tracking link appears black (on black) when hovered over. - adds defensive code to prevent an error if the expected element for the notification balloon isn't there. 33212: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX: 33211: ALF-12384: Failed schema dump can cause failure of repository start up 33217: Merged V3.4-BUG-FIX to V4.0-BUG-FIX 31840: Fix for ALF-10282 - Web Browser freezes with large xml files Web form transformation 31987: Proper fix for ALF-11489: 'patch.sitesSpacePermissions' failed on upgrade 2.2.8 -> 3.4.6 - Just handle missing defined ACLs 32341: Fix for ALF-9883 - WCM Forms: Changing 'abstract' type carries previously-added elements 32911: Add a (currently disabled) unit test for ALF-10466 - The HTML to Text transformer (not Tika based) should take account of the content encoding 32912: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2011_10_13 to BRANCHES/DEV/V3.4-BUG-FIX with changes + unit testing: 31742: ALF-10466 - The HTML to Text converter needs to take account of the Encoding set on the Content Property, to be able to correctly index MBCS text in wiki pages (and others) 32946: ALF-12161: Merged PATCHES/V3.4.5 to V3.4-BUG-FIX 32921: Merged DEV/TEMPORARY to PATCHES/V3.4.5 32913: ALF-11440: Content Manager unable to edit content from another user sandbox In order to allow a Content Manager to edit a locked document in other user's sandbox, it is needed to modify the AVMLockingAwareService.grabLock(). The 'lockState' variable could be set to 'LOCK_OWNER', if a user is ContentManager to bypass the check. 32964: Fixes ALF-11054: Sharepoint - Wrong sorting by date - incorporated patch from investigation team 32967: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2011_10_13 to BRANCHES/DEV/V3.4-BUG-FIX: 31828: Fixes ALF-10720: Webform performance improvement Minimize database usage by adding new variable to FormWrapper that holds a form's name. 32969: Fixes ALF-10471: Cannot correctly remove users from email notification rule list 32980: Merged DEV/TEMPORARY to V3.4-BUG-FIX 32961: ALF-12132: Set "common-placeholder-configurer" as parent for "lotusWSPlaceholderConfigurer" bean. 32996: ALF-12184: SchemaBootstrap must use same assumptions as PatchServiceImpl when deciding whether an alternative patch succeeded - Fixes regression introduced by r31972 / ALF-11489 33068: Added suggested fix to commit any current transactions in the NFS file expiry thread. ALF-11827. 33077: ALF-10142: Allow TinyMCE to accept <meta> element when editing HTML files inline in Share. 33094: Fix for ACT #15024-37148 (no JIRA yet) - issue where in a load balanced Share environment (multiple web-tiers behind a reverse proxy) the modification to the template layout selection for a site or user dashboard would not be reflected in all servers. 33118: ALF-12278: Prevent the copying over of headers specific to a POST request on to the touch GET request 33138: Upgraded SpringSurf to 1.0.0 rev 968 33140: Added missing json-simple jar to 3rd party eclipse classpath, which bizarrely is used to generate the JUnit cmd line unit test classpath, no really. 33145: Fix for native FTP timestamps returned in GMT timezone format. ALF-11986. 33175: ALF-12366: Cope with read committed DB behaviour in AbstractReindexComponent.reindexTransaction() 33179: ALF-12344 CLONE - Copyright notice shows Alfresco Software, Inc. © 2005-2011 All rights reserved.... should now be to 2012 as that is when we will release 3.4.7 - Being done in 3.4.8 not 3.4.7 33190: Latest SpringSurf libs: - much improved handling of multiple connections and connection reuse in RemoteClient - improves connection reuse generally, but also much more stable under load balancing condition with multiple Share web-tiers behind a reverse proxy 33193: ALF-12344 CLONE - Copyright notice shows Alfresco Software, Inc. © 2005-2011 All rights reserved.... should now be to 2012 as that is when we will release 3.4.7 - Found a few more having followed previous date changes and searches 33203: Fix for HttpClient issue: Error status 500 Unbuffered entity enclosing request can not be repeated. 33206: Fix to FormUIGet - no need to manually patch up the JSON request since rev 33138 (SpringSurf 1.0.0) 33218: Fix for ALF-11868 "CMIS: removeAcl() function doesn't work via atompub." 33220: Merged PATCHES/V3.4.6 to V4.0-BUG-FIX 32405: Merged V3.4.6 (3.4.6.1) to V3.4.1 (3.4.1.24) 32404: ALF-11727 CLONE - Pending Invite Search doesn't return anything if there's more than 1000 pending invites across all sites. Removed read only transaction from invites.get.desc.xml as it broke InviteServiceTest testRejectInvite 32397: ALF-11727 CLONE - Pending Invite Search doesn't return anything if there's more than 1000 pending invites across all sites. Return first 200 invitations (similar to 4.0 paging) Transaction used by the invites.get is now read only so does not force a flush of caches. 32503: Merged PATCHES/V3.4.6 to PATCHES/V3.4.1 32501: ALF-11727: Reinstated read-only transaction around invites.get and prevented it from trying to lazily create persons from rejected invites that had previously been deleted by InviteHelper.cleanUpStaleInviteeResources! 32650: ALF-11872: When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete Put back in cut off at 200 invites (removed in last merge) for UI, unless we know that we need all of them internally 32775: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete Even more changes: - reduce number of queries required to list pending invites to a site (uses moderated and nominated caches and only looks up IDs if possible) - change hibernate cache and flush modes (to avoid cache and the related slow flush), for queries and cancel of workflows - modified js which was making a query for each person in order to work out if they were already in a pending invites list 32838: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete - JBPMEngine now supports batch cancelWorkflows() method for canceling multiple workflows at the same time (e.g. on deleting a site) - Manual flushes only used at two points in the batch to minimize dirty checking overhead and yet avoid FK errors - Performance implications still to be checked but at least functionally correct - Corrected JPDL source jar 32857: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete - Search for Pending invites was slow on sites with > 0 pending invites (it was getting invites for all sites) 32861: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete - JBPMEngine uses an abstract list to 'lazily' convert hibernate objects on demand and avoid batch loading too many objects 32868: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete - Rationalization of batch fetching at hibernate layer 32881: ALF-11872: The saga goes on! Corrected empty list handling in InvitationServiceImpl.searchInvitation(). 32927: ALF-11872: Fix parameter validation in InvitationServiceImpl.getInvitationTasks() 32936: ALF-11872: A site with 1200 pending invites can now be deleted without the UI timing out - Pending invitation workflows are cancelled in an asynchronous action - The asynchronous action completes about 3 minutes later, due to the massive number of individual delete statements being run by Hibernate - Creating the rows in the first place took 20 minutes! 32956: ALF-11872: Corrected filtering in InvitationServiceImpl.getInvitationTasks() to only include start tasks - plus recautionary sleep() in InviteServiceTest.tearDown() to ensure asynchronous invite deletions complete 33169: ALF-12312 'org.hibernate.LazyInitializationException: could not initialize proxy - no Session' when clicking on a Pending Invite workflow task in JSF - Follow on from ALF-11872: Only use lazyloaded WorkflowTasks from JBPMEngine.getWorkflowTasks() when we are using the same session (currently only done from InvitationService). The fallback is to assume it is not the same session and return a normal list of Workflows. 33221: Merged V3.4-BUG-FIX to V4.0-BUG-FIX (RECORD ONLY) 30463: L10N Updates from Gloria (based on r30332): Fixes ALF-8211 and new string updates 30473: Merged HEAD to V3.4-BUG-FIX 30468: Fixed ALF-10280: Slow to report ® Duplicate entry ¯ in database. - DuplicateChildNodeNameException implements DoNotRetryException 30685: Merged HEAD to V3.4-BUG-FIX 30679: Unit test for ALF-1017 - Non site content in the Sites Space 30683: ALF-1017 Remove EVERYONE Contributor permissions from /Company Home/Sites/, to avoid misc nodes being created in there by mistake by users, and update the SiteService to runAsSystem when creating the Site node 30693: Merged HEAD to V3.4-BUG-FIX 30692: Fix ALF-1017 specific test following ALF-1017 changes to permissions 30808: Fixes: ALF-10485 (minor text update) 30873: Latest L10N update from Gloria (based on r30698): - Adds Web Quick Start translations (back port from 4.0) - Adds/updates new or previously missing strings 31019: Merged HEAD to V3.4-BUG-FIX 28974: added double-checks for associations when a potential failure is detected 31018: Fixed ALF-9591: Integrity check: Association source multiplicity checking is incorrect - Drop checks for source multiplicity when no associations are pointing to a type/aspect instance 31045: Merged HEAD to V3.4-BUG-FIX 31044: Performance improvements for PATH queries relating to Share dashboard dashlets and document library. - tweaks to generation of PATH queries - hugely improves performance when dealing with 1000's site memberships 31160: Merged HEAD to V3.4-BUG-FIX 31156: Various Share search related fixes as spotted by Andy: - increased resultset size that is used to retrieve raw results from query before Share specific results are filtered - this means sensible results are now shown from large repository wide and sorted queries, previously results would be "missing" if they dropped out of the resultset prefiltering - fix to Share Search component to correctly display if more than N results were found in the repository - fix to add default TYPE clause to generated Share search if no other TYPE is specified - this reduces masses of potentially matches results from repository wide searches that would otherwise need to be post-filtered 31345: Merged HEAD to BRANCHES/DEV/V3.4-BUG-FIX: 31330: Fixed WCM bulkImport's importDirectory 31442: Merged HEAD to V3.4-BUG-FIX 31441: Fixed ALF-11014: Content output stream close errors are absorbed silently - Found while testing XAMcontentStore - Pulled stream copy code into AbstractContentWriter - OutputStream closure (write-side) exception is rethrown to allow full rollback, etc 31444: Merged HEAD to BRANCHES/DEV/V3.4-BUG-FIX: 31383: MLPropertyInterceptor performance improvements: 31758: Merged V3.3 to V3.4-BUG-FIX 31757: ALF-11279: Fixed RetryingTransactionInterceptor so that it actually behaves like an interceptor and doesn't throw away the rest of the interceptor chain! 31798: Merged V3.3 to V3.4-BUG-FIX 31773: ALF-11279: Further RetryingTransactionInterceptor fixes - must do mark for rollback on propagating transactions 32051: ALF-7195: Merge HEAD (4.0) to V3.4-BUG-FIX (3.4.7) Merge was simply to take HEAD version to pick up changes made by Derek to DisableAuditableBehaviourInterceptor 32047: ALF-8882 Edit Online: Modifier and Modified date are changed even no changes were applied - needed to turn off ASPECT_AUDITABLE on removeProperty which is called on unlock - added code to not enable this aspect early if nested calls were made (this is not done, but is safer this way) 32088: Merging HEAD to 3.4-BUG-FIX: r32063: ALF-10947 Fixed issue where repeating JBPM timer was causing an infinite loop if an exception was thrown within the timer event. 32475: ALF-11727 Improved performance of pending invites search. 32512: Incremented version revision for 3.4.8 32917: ALF-12133: Merged HEAD to V3.4-BUG-FIX 32906: ALF-12068 - Zimbra desktop - corrected InternalDateAsString. 32923: ALF-12133: Merged HEAD to V3.4-BUG-FIX 32918: ALF-12133 - Attempt 2 to get Imap internal date correct. 33021: ALF-9878: Merge V3.4.1 (3.4.1.25) to V3.4-BUG-FIX (3.4.8) 32956: ALF-11872: Corrected filtering in InvitationServiceImpl.getInvitationTasks() to only include start tasks - plus recautionary sleep() in InviteServiceTest.tearDown() to ensure asynchronous invite deletions complete 32936: ALF-11872: A site with 1200 pending invites can now be deleted without the UI timing out - Pending invitation workflows are cancelled in an asynchronous action - The asynchronous action completes about 3 minutes later, due to the massive number of individual delete statements being run by Hibernate - Creating the rows in the first place took 20 minutes! 32927: ALF-11872: Fix parameter validation in InvitationServiceImpl.getInvitationTasks() 32881: ALF-11872: The saga goes on! Corrected empty list handling in InvitationServiceImpl.searchInvitation(). 32868: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete - Rationalization of batch fetching at hibernate layer 32861: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete - JBPMEngine uses an abstract list to 'lazily' convert hibernate objects on demand and avoid batch loading too many objects 32857: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete - Search for Pending invites was slow on sites with > 0 pending invites (it was getting invites for all sites) 32838: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete - JBPMEngine now supports batch cancelWorkflows() method for canceling multiple workflows at the same time (e.g. on deleting a site) - Manual flushes only used at two points in the batch to minimize dirty checking overhead and yet avoid FK errors - Performance implications still to be checked but at least functionally correct - Corrected JPDL source jar 32775: ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete Even more changes: - reduce number of queries required to list pending invites to a site (uses moderated and nominated caches and only looks up IDs if possible) - change hibernate cache and flush modes (to avoid cache and the related slow flush), for queries and cancel of workflows - modified js which was making a query for each person in order to work out if they were already in a pending invites list 32650: ALF-11872: When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete Put back in cut off at 200 invites (removed in last merge) for UI, unless we know that we need all of them internally 33143: Merged BRANCHES/V3.4-TEAM to BRANCHES/DEV/V3.4-BUG-FIX 25103: ALF-6613 - SpringSurf improvements to allow easier refactoring of Document Details page - removed manual request level caching of remote calls responses in web-tier components - now completely automatic 25138: Flattening of user preferences remote calls - ensures /preferences hits the RequestCachingConnector - reduces no. of remote calls by 3 for the doclib and by 4 for a site dashboard. 33216: Merged PATCHES/V3.4.1 to V3.4-BUG-FIX (3.4.8) 32405: Merged V3.4.6 (3.4.6.1) to V3.4.1 (3.4.1.24) 32404: ALF-9878 / ALF-11727 CLONE - Pending Invite Search doesn't return anything if there's more than 1000 pending invites across all sites. Removed read only transaction from invites.get.desc.xml as it broke InviteServiceTest testRejectInvite 32397: ALF-9878 / ALF-11727 CLONE - Pending Invite Search doesn't return anything if there's more than 1000 pending invites across all sites. Return first 200 invitations (similar to 4.0 paging) Transaction used by the invites.get is now read only so does not force a flush of caches. 32503: Merged PATCHES/V3.4.6 to PATCHES/V3.4.1 32501: ALF-9878 / ALF-11727: Reinstated read-only transaction around invites.get and prevented it from trying to lazily create persons from rejected invites that had previously been deleted by InviteHelper.cleanUpStaleInviteeResources! 32641: ALF-12387 / ALF-11872: Merged V3.4-BUG-FIX (3.4.8) to V3.4.1 (3.4.1.25) 32475: ALF-11727 Improved performance of pending invites search. (N Smith changes to do with only using ONE search value - faster as multiple are taken as ORs rather than ANDs) 32650: ALF-12387 / ALF-11872: When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete Put back in cut off at 200 invites (removed in last merge) for UI, unless we know that we need all of them internally 32775: ALF-12387 / ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete Even more changes: - reduce number of queries required to list pending invites to a site (uses moderated and nominated caches and only looks up IDs if possible) - change hibernate cache and flush modes (to avoid cache and the related slow flush), for queries and cancel of workflows - modified js which was making a query for each person in order to work out if they were already in a pending invites list 32838: ALF-12387 / ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete - JBPMEngine now supports batch cancelWorkflows() method for canceling multiple workflows at the same time (e.g. on deleting a site) - Manual flushes only used at two points in the batch to minimize dirty checking overhead and yet avoid FK errors - Performance implications still to be checked but at least functionally correct - Corrected JPDL source jar 32857: ALF-12387 / ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete - Search for Pending invites was slow on sites with > 0 pending invites (it was getting invites for all sites) 32861: ALF-12387 / ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete - JBPMEngine uses an abstract list to 'lazily' convert hibernate objects on demand and avoid batch loading too many objects 32868: ALF-12387 / ALF-11872 When there are a lot of pending invites, deletion of a site causes high and prolonged CPU activity and can take a long time to complete - Rationalization of batch fetching at hibernate layer 32881: ALF-12387 / ALF-11872: The saga goes on! Corrected empty list handling in InvitationServiceImpl.searchInvitation(). 32927: ALF-12387 / ALF-11872: Fix parameter validation in InvitationServiceImpl.getInvitationTasks() 32936: ALF-12387 / ALF-11872: A site with 1200 pending invites can now be deleted without the UI timing out - Pending invitation workflows are cancelled in an asynchronous action - The asynchronous action completes about 3 minutes later, due to the massive number of individual delete statements being run by Hibernate - Creating the rows in the first place took 20 minutes! 32956: ALF-12387 / ALF-11872: Corrected filtering in InvitationServiceImpl.getInvitationTasks() to only include start tasks - plus recautionary sleep() in InviteServiceTest.tearDown() to ensure asynchronous invite deletions complete 33169: ALF-12382 / ALF-12312 'org.hibernate.LazyInitializationException: could not initialize proxy - no Session' when clicking on a Pending Invite workflow task in JSF - Follow on from ALF-11872: Only use lazyloaded WorkflowTasks from JBPMEngine.getWorkflowTasks() when we are using the same session (currently only done from InvitationService). The fallback is to assume it is not the same session and return a normal list of Workflows. 33224: Fix for ALF-12230 "Bootstrap re-encryption failed" 33225: Fix for ALF-12349 Transformations need to handle failures due to server being busy. Change to system behaviour: We want to support transient failures of thumbnail creations. Primary example now is the Polymorph Transformation Server which can fail transformations because it is under load and wishes to decline transform requests. Prior to this check-in, such failures would be interpreted by Alfresco as 'real' failures and the content node would be marked as FailedToTransform. The transformers' state data would also be affected by the failure. We need to allow transformers to fail and NOT trigger any negative consequences such as above. Changes in code: New exception type ActionServiceTransientException when thrown from an ActionExecuter will NOT trigger any compensating action that has been configured. This allows actions to fail 'normally' or due to some transient condition with the implication that if rerun later the action may succeed. Additional end-state for Actions in the ActionTrackingService: ActionStatus.Declined. The ActionExecuter has declined to execute the action at this time. New exception type ContentServiceTransientException which means that a content operation (currently only a transformation) has failed due to a transient condition. CreateThumbnailActionExecuter catches this exception type and throws the ActionServiceTransientException. Tests at the ActionServiceImpl, ActionTrackingServiceImpl and ThumbnailServiceImpl APIs & various test config & other changes. 33231: ALF-10581 - MySQLIntegrityConstraintViolationException: Cannot add or update a child row: a foreign key constraint fails ... fk_alf_cass_cnode - unexpected non-null child node id when creating a new node (see also THOR-906) - for now genericise ALF-10153 (to include at least MySQL in addition to MS SQL Server) 33237: Fixing JUnit jar's src attachment. 33238: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX: 33222: ALF-12351: Separate schema descriptor files for table prefixes: alf_, avm_, JBPM_, act_ 33235: ALF-12351: Separate schema descriptor files for table prefixes: alf_, avm_, JBPM_, act_ 33239: partial fix for: ALF-10446 - Upgraded FullCalendar to support ISO8601 Zulu timezone & told it not to ignore the timezone information. 33240: Implementation of improvement ALF-12404. This fix has been OK'd by Andy Hind. 33246: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX: 33244: ALF-12352: Add JMX support to trigger a schema check manually 33252: Merged V3.4-BUG-FIX to V4.0-BUG-FIX (RECORD ONLY) 33245: ALF-12366: Delete a node by deleting its row and inserting a new one with the deleted flag set - Forces a new ID to be generated for the deleted node - Makes it impossible to simultaneously delete a node and add new children in two concurrent transactions - Can't be merged to 4.0 due to SOLR - needs something more clever! 33250: ALF-12366: Derek code review 33254: Merge V3.4-BUG-FIX to V4.0 BUG-FIX 33249 - ALF-12342 Excel 2003 Patterns. 33256: ALF-12386 Change the simpler projects to use explicit dependencies, rather than blindly importing all of 3rd-party, to make generating downstream Maven POMs easier 33266: ALF-12163 - mail.parameters.from does not use the from address provided 33283: ALF-12185 SPP/Vti Mac Office checkin correction for Collaborators (Patch from Pavel Yurkevich) 33295: Fix to SMTP authentication implementation. 33296: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX 33285: Fix for ALF-12336 - Share loses performance if noncachableObjectTypes are defined (page & component) - New and improved mechanism for dealing with cache invalidation in Share load balancing and clustering based on the Hazelcast messaging system - See http://www.hazelcast.com/docs.jsp - and specifically http://www.hazelcast.com/docs/1.9.4/manual/single_html/#SpringIntegration - Sample per node cluster config provided in custom-slingshot-application-context.xml.sample - Tested with an Alfresco cluster plus a Share cluster both balanced via Apache server instances - Significantly improved Share stability with latest SpringSurf libs and individual node performance back up to non-clustered node speed Modified Alfresco JLan build to use newer hazelcast JAR and also modified existing build file references to use new jar location. 33297: Merge V3.4-BUG-FIX (3.4.8) to V4.0-BUG-FIX (4.0.1) (RECORD ONLY) 33292: ALF-12457: Merge V3.4.4 (3.4.4.8) to V3.4-BUG-FIX (3.4.8) 33287: ALF-12400: Merged DEV/BELARUS/V3.4-BUG-FIX-2012_01_10 to V3.4.4 (3.4.4.8) 33284: ALF-12400 CLONE - Security risk in Web View dashlet The check for user role was added to Web View and Site Links dashlets to disallow to configure Web View for Consumer, Contributor, and Collaborator roles and disallow to add Site Links for Consumer role. 33286: ALF-9514 I18N: Model constraint values need localized display names - Applied diff file attached to JIRA issue (with a minor compiler error correction). It appeared to be a merge of: DEV/SWIFT r27643, r27645, r27692, r27846 and HEAD r28405, r29364 33298: ALF-12461 If the OOXML file contains a thumbnail image, use this for the document thumbnail, plus improve the iWorks analoguous transformer 33305: Fix for ALF-12463 Error querying database was detected during upgrade process from 3.1 to 4.0.0. 33306: Experiment - adding an sdk-extras target for the enterprise specific bits of the SDK. 33308: Merged V3.4-BUG-FIX (3.4.8) to V4.0-BUG-FIX (4.0.1) 33242: ALF-5830 show_audit.ftl template doesn't work anymore - ISO9075 encode the node path 33271: ALF-9659 In auditing, nodeNameValue extractor never works on a deletion event. - As pre call audit is not discarded on transaction rollback, we need to be able to have access to pre call values in the post call audit application. One such value is the nodeName for the post call of NodeService.deleteNode() 33274: Merged DEV to V3.4-BUG-FIX 33273: ALF-12314: Failed to create content due to error: lockOwner is a mandatory parameter It is necessary to pass the correct 'lockOwner' of a rendition, for example, to use 'rr.getLockOwner()' instead of 'lockOwner' 33277: ALF-12436: Merged PATCHES/V3.4.6 to V3.4-BUG-FIX 33275: ALF-12426: Correction to joins in select_ContentDataByNodeIds - inner join to alf_node_properties first 33279: ALF-12366: Merged PATCHES/V3.4.6 to V3.4-BUG-FIX 33278: ALF-12393: Another indexing race condition when MySQL read committed is enabled, this time in the debug diagnostics! 33282: Merged V3.4 to V3.4-BUG-FIX 32979: ALF-12114: Reverse merged ALF-10282 and related changes from V3.4-BUG-FIX, which have caused serious regressions 31840: Fix for ALF-10282 - Web Browser freezes with large xml files Web form transformation 32341: Fix for ALF-9883 - WCM Forms: Changing 'abstract' type carries previously-added elements 32998: (RECORD ONLY) Merged V3.4-BUG-FIX to V3.4 32996: ALF-12184: SchemaBootstrap must use same assumptions as PatchServiceImpl when deciding whether an alternative patch succeeded - Fixes regression introduced by r31972 / ALF-11489 33084: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2011_12_06 to V3.4 (3.4.7) 33069: ALF-12266 NPE creating content using the web form Locale language can be passed not only as lang_country but as only country code as well. 33257: ALF-10340: patch.db-V2.2-CleanNodeStatuses must now have patch.db-V2.2-Upgrade-From-2.2SP1 as an alternative to allow upgrade from 2.2.8 - That's because patch.db-V2.2-Upgrade-From-2.2SP1 exists in 2.2.8 and once run it's too late to run patch.db-V2.2-CleanNodeStatuses 33260: Set failonany=true on distribute-installers parallel task so that the build actually fails if an installer fails to build 33301: ALF-12464: Merged PATCHES/V3.4.5 to V3.4-BUG-FIX 33299: ALF-12281: Memory leak in ReferenceCountingReadOnlyIndexReaderFactory - The diagnostic code I added to track memory leaks was actually causing some! - For some reason I was recording a new reference when the index reader was dereferenced rather than clearing it - Would affect scenarios where the main index is long-lived and there are no writes to it and lots of searches - Spotted by Pavel - Too much late night coding! 33303: ALF-12464: Merged PATCHES/V3.4.5 to V3.4-BUG-FIX 33302: ALF-12281: Correction to previous checkin - deal with the initial reference created by the constructor and cleared by closeIfRequired() 33315: ALF-11214 - IMAP subsystem is not successfully restarted after incorrect modification of IMAP properties via Admin Console 33321: Remove /hazelcast lib dir include which is no longer required as libs are now at lib root folder 33322: ALF-2550 - Enterprise SDK files do not contain enterprise repository project. 33323: SDK - Added Enterprise third party libs. 33327: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/V4.0-BUG-FIX: 33324: Fix for THOR-941. Some MIME types appear as Unknown in metadata form. The inconsistencies in the edit mimetype form were slightly different on V4.0.1 so I tidied them up. 33330: ALF-12487 In Mimetype Detection, if Tika detects a generic type of text/plain or XML, defer to the Alfresco filename based type (as we already do for octet stream) 33335: Quick build fix - comment out SDK enterprise docs while I work out what's wrong. 33353: Added more projects to Enterprise Generate Docs. 33357: When installing a module the tool reads the war's version.properties file and will not install if the war version is outside the repoVersionMin or repoVersionMax 33361: Merged DEV/GETHIN/FINDBUGS to V4.0-BUG-FIX 32962: Findbugs fix: Suspicious comparison of Integer references 32963: Findbugs fix: Call to equals() compares different types 32968: hashcode should be hashCode 32970: Findbugs fix: Suspicious comparison of Integer references 32972: Findbugs fix: Suspicious comparison of Integer or Long references 32976: Findbugs fix: .remove() incompatible with expected argument type String 32977: Findbugs fix: String is incompatible with expected argument type 32978: Findbugs fix: Call to equals() compares different types I prefer this fix to the previous one I did 32982: Findbugs fix: Call to equals() compares different types classDefinition.getName().equals instead of classDefinition.equals 32983: Findbugs fix: String is incompatible with expected argument type java.util.Locale 32984: Findbugs fix: An apparent infinite loop 32985: Findbugs fix: bad month value of 12 passed to new java.util.GregorianCalendar This code passes a constant month value outside the expected range of 0..11 to a method. 32986: Findbugs fix: authenticationComponent masks field from superclass 32987: Findbugs fix: Invocation of toString on Array Now uses Arrays.toString() 32988: Findbugs fix: Incorrect lazy initialization of static field Now uses static initialization block 32989: Findbugs fix: Dead code: A null pointer would have been thrown before these lines 32990: Findbugs fix: possible null pointer dereference Just made the code a little clearer 32991: Findbugs fix: class defines a clone() method but the class doesn't implement Cloneable. 32992: Findbugs fix: All equals() methods should return false if passed a null value. 32993: Findbugs fix: Invocation of toString on Array Now uses Arrays.toString() 32994: Findbugs fix: If the multiplication is done using long arithmetic, you can avoid the possibility that the result will overflow. 33006: Findbugs fix: possible null Just made the code a little clearer 33007: Findbugs fix: Invocation of toString on Array Now uses Arrays.toString() 33008: Findbugs fix: Call to String.equals(Character) Explicitly using String 33009: Findbugs fix: int converted to long and passed as absolute time to new java.util.Date(long) Now works after the year 2037! 33014: Findbugs fix: Invocation of toString on Array Now uses Arrays.toString() 33023: Findbugs fix: There is an apparent infinite recursive loop No longer 33025: Findbugs fix: possible null Just made the code a little clearer 33026: Findbugs fix: impossible null check Changed && to || 33029: Findbugs fix: Minor change to Integer.valueOf 33126: Findbugs fix: Comparison of String objects using == now used .equals 33127: Findbugs fix: Unwritten field. All reads of it will return the default value. Now sets values in the constructor 33128: Findbugs fix: Removed try/catch 33129: Findbugs fix: Added an assertTrue to the unit test 33130: Findbugs fix: Passes null for nonnull parameter Mocked the serviceReg and now the tests work! 33131: Findbugs fix: Call to a collection method contains an argument with an incompatible class from that of the collection's parameter 33133: Findbugs fix: Deadly embrace between inner class and thread local - not eligible for garbage collection. Made inner class static 33182: Findbugs fix: possible null Now intialises documentPaths correctly 33184: Findbugs fix: possible null pointer (no more) 33185: Findbugs fix: Comparison of itself Changed variable name to fixedValue 33186: Findbugs fix: Possible null pointer dereference of nodePair Now continues 33187: Findbugs fix: This code seems to be using non-short-circuit logic 33188: Findbugs fix: Possible null pointer dereference of entry Discussed with Andy. If there's no entry then throw the exception, we can't continue 33189: Findbugs fix: Call to a collection method contains an argument with an incompatible class from that of the collection's parameter It must want to remove the user 33199: Modified the end of line character 33209: Changed tabs for spaces 33210: I removed the "if" because it was never called, however Brian suggested moving it to a place where it would be called! 33363: Fix for ALF-12374 - Share sample 'share-config-custom.xml' is missing an endpoint 'activiti-admin' 33364: Merge V3.4-BUG-FIX to V4.0-BUG-FIX 33362 : ALF-12448 - Missing jars in enterprise SDK 33376: Merged (RECORD ONLY) V3.4-BUG-FIX (3.4.8) to V4.0-BUG-FIX (4.0.1) 33375: ALF-12154: Merged HEAD to V3.4-BUG-FIX (3.4.8) Requested to RECORD ONLY this change when merging back to HEAD/V4.0-BUG-FIX etc. - Removed duplicate 'List constraint display labels' values from bpm-messages*.properties and dictionarydaotest_model.properties. May have been introduced by ALF-9514 changes in the same area, which was also RECORD ONLY - Manual merge of JSON propertyLabels that exist in HEAD back into 3.4.8 32724: OPEN : ALF-11176: Untranslated strings in Group Review and Approve Task form Activiti has one default transition "Next". If there is no transition then the model builder was not finding a translation for the task outcome (and just using the english word, e.g. "Approve"). Now it looks up the translation workflowtask.outcome.[wf:outcome property] 32943: FIXED : ALF-11176: Untranslated stings in Group Review and Approve Task form I've changed the way task descriptions are retrieved. You can now enter translations for them. 33377: ALF-12509: ibooks Format Added quick.ibooks file 33378: ALF-12207 IMAP: Empty file is not opened/downloaded (using IMAP Content Links) if it was uploaded to Share via fileserver 33379: Add the TIFF mimetype 33380: Improve the stream to Tika conversion code, following review for THOR-952 33385: Upgrade to the latest Tika and POI, for recent bug fixes 33387: ALF-12492 - Email with empty subject sent to Alfresco by SMTP cause Null pointer Exception 33396: ALF-12497 - Opening and closing (not save) MS Exel 2003 file via CIFS adds new version 33397: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX: 33259: ALF-12354: DB2 reference files. 33261: ALF-12354: MySQL reference files. 33268: ALF-12354: Oracle reference files 33310: ALF-12354: Create schema reference files for MySQL, PostgreSQL, Oracle, DB2 33349: ALF-12354: Create schema reference files for MySQL, PostgreSQL, Oracle, DB2 33366: ALF-12412: Schema reference files should contain schema version number 33367: ALF-12412: Schema reference files should contain schema version number 33373: ALF-12354: Added comment to DB2 file regarding intermittent comparison failures. 33389: ALF-12516: Produce XML schema definition file (XSD) for schemacomp reference files. 33390: ALF-12516: added missing file (the actual XSD!) 33392: ALF-7260 RINF 03: Automate DB schema validation 33401: FindFindbugs fix: Maybe Derek expected null after all 33406: Latest SpringSurf libs - fixed use of java.util.UUID which blocks 33407: Merged BRANCHES\DEV\V3.4-BUG-FIX to BRANCHES\DEV\V4.0-BUG-FIX 33399: Fix for ALF-11962 Lucene queries searching on metadata (not on cm:content) with stopwords returns wrong results 33414: ALF-11746 Webscript to expose the repository mimetypes, along with their user facing display names and their extensions 33415: ALF-11746 Mimetype information can be available to all 33442: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX 33441: Latest SpringSurf libs - performance and thread safety improvements. 33447: Fix to email test - query error exposed by recent change. 33451: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX: 33446: ALF-12354: fixed DB2 intermittent unique index creation problems. 33448: ALF-7260: removed redundant code. 33454: Merged (RECORD ONLY) V3.4-BUG-FIX (3.4.8) to V4.0-BUG-FIX (4.0.1) 33388: Removed L10N that no longer have a default. 33437: ALF-9514 I18N: Model constraint values need localized display names - Undo changes to webclient_ja.properties that were made by r33286 for this issue. There were no changes in webclient.properties that did not already exist in webclient_ja.properties This should simplify translations. 33453: ALF-9514 I18N: Model constraint values need localized display names - Tidy up mess to do with the initial r33286 revision for this issue. Lots of L10N property changes. I think some of my trial merges from 4.0 did not get reverted before I applied the diff file. Reverse merged r33437 and r33286. Note r33388 and r33375 (for ALF-12154) already included changes to try and fix the initial revision. 33456: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX: 33455: ALF-12410: JMX Dumps taking very long to finish 33457: SDK build fix 33463: Add in Enterprise Docs to SDK (again) 33464: Merged V3.4-BUG-FIX to V4.0-BUG-FIX 33312: ALF-12448: Merged HEAD to V3.4-BUG-FIX (3.4.8) 33304: ALF-7542 SDK is missing spring-test.jar - ant script modified to copy org.springframework.test*.jar files into root\build\assemble\sdk\lib\server\dependencies 33382: ALF-10239 Form validation bug when content becomes invalid after XSD change - override isValidForSubmit function in alfresco.xforms.TextField as alfresco.xforms.Widget version does not check the max length 33383: Fix for ALF-11791 - Multiple search on category in Share Advanced Search return no result Merged HEAD to BRANCHES/DEV/V3.4-BUG-FIX 29710: SVC15: Contribution: Alfresco Share Adv Search Enhancement: Allow advanced search on category to include sub-categories in query by checking a checkbox as in Alfresco Explorer (ALF-7157) A new "showSubCategoriesOption" has been added to the "category.ftl" form control, that when set to true (as shown in the example config snippet below) will display a checkbox allowing the user to request all sub categories be searched as well as the selected ones. <field id="cm:categories"> <control> <control-param name="compactMode">true</control-param> <control-param name="showSubCategoriesOption">true</control-param> </control> </field> 30572: Fix for ALF-7008 - Double category in Share Advanced Search return no result 33384: Fix for ALF-12469 - Change method BaseAssociationEditor.generateFormSubmit to protected 33400: ALF-12366: Merged PATCHES/V3.4.6 to V3.4-BUG-FIX 33354: ALF-12393: Parent assocs must be cached with a txn ID, even when a node has no parents - Use left outer join in parent assocs query 33355: ALF-12393: Fixed typo in SQL + allowed assocIndex to be null 33413: ALF-12219: Fix CommandServlet to not mess up Document List and My Spaces List dashlets on Websphere 33416: ALF-12411: Merged DEV to V3.4-BUG-FIX (with corrections) 33404: Fix that introduces full Unicode character support into jBPM 3.3.1: - new patch that alters columns of the jBPM 3.3.1 tables to change 'TEXT' datatype to 'NVARCHAR(MAX)' (SQL Server and Generic dialects); - 'jbpm-upgrade.sql' patch modified to alter as in the new patch; - 'AlfrescoSQLServerDialect' fixed to allow create tables with 'CLOB' columns as 'NVARCHAR(MAX)' columns - devious chain of alternatives (suggested by Derek) introduced to make sure the right patch executes under the right circumstances 33418: ALF-9507: Fixed possible LDAP security hole Now we force RFC 2254 escaping of the user DN resolution query using argument substitution, as described here http://docs.oracle.com/javase/jndi/tutorial/ldap/search/search.html 33419: ALF-9658: Corrected AFTER_INACTIVITY cache update behaviour in InMemoryTicketComponentImpl - Now the key is preserved on entry update and not accidentally regenerated 33421: Merged DEV to V3.4-BUG-FIX 32042: ALF-11448: ArrayIndexOutOfBoundsException caused by unsynchronized call in org.alfresco.repo.webdav.WebDAV.formatModifiedDate Creation of SimpleDateFormatter was moved to a method. 33422: ALF-12302: /api/tags API returns badly-formed JSON - Resolved as suggested by MH 33423: ALF-10312: Parameter Based Redirection - Now we validate that the Explorer login page redirect URL is within the context path of the application (/alfresco) 33424: Merged DEV to V3.4-BUG-FIX 33358: ALF-11719: Webscript fails due to colon in password Split basic authentication header by first colon. Remaining part is user's password. 33425: Merged DEV to V3.4-BUG-FIX 33359: ALF-12071: Windows 7 cannot open files stored on Alfresco mounted as a webdav network drive if the filename contains + (plus) character For Windows 7 we SHOULD decode the file name gotten from GET request taking into account that "+" is not encoded as "%2B" for GET request. 33426: Merged DEV to V3.4-BUG-FIX (with corrections) 33374: ALF-10713: Remaining dependencies repo.remote.url from outboundSMTP-context.xml and activities-feed-context.xml was removed and SysAdminParams bean was injected instead. - MailActionExecuter.URLHelper returns url to alfresco using SysAdminParams. 33427: ALF-10713: repo.remote.url no longer used in 3.4.8 so removed altogether 33429: Merged HEAD to BRANCHES\DEV\V3.4-BUG-FIX 31191: First fix for ALF-10741 TAG field does not support wildcard, prefix, fuzzy queries etc -> wildcard searches entered by users will fail (for ALF-12162) 33433: ALF-12411: Fixed postUpdateScriptPatches declaration 33435: ALF-11719: Fix Authorization and AuthorizationTest 33436: ALF-12411: Fixed patch script paths 33445: Fixes: ALF-12389; internationalises the tool tip strings for changing the data list sort order. 33449: ALF-12411: Fixes from Dmitry - Corrected ID of patch.db-V3.4-Upgrade-JBPM - dependsOn property has no effect on a SchemaUpgradeScriptPatch - order controlled by schemaBootstrap.postUpdateScriptPatches 33459: ALF-9811: SSOAuthenticationFilter now supports basic auth as well. 33471: ALF-12297 Emailing to document via inbound SMTP causes integrity violation 33473: Reference schema files moved on from 5025 to 5026 33478: Fix for ALF-12515 33479: Fix for ALF-11116 33481: Fix for ALF-12099 33487: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX: 33485: ALF-12598: Incorrect column order on indexes and primary keys must be reported to user 33496: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX: 33494: ALF-12412: Schema reference files should contain schema version number 33508: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX: 33507: ALF-12412: Added missing files 33515: Merge (Record Only) V3.4-BUG-FIX to V4.0-BUG-FIX 33495 : SDK Build fix - do not merge to V4.0 33517: V4.0 version of the fix for ALF-12393 - The node caching structure in 4.0 is version-based and there was already a check to ensure that in-memory vs database versions matched for all calls to get parent associations. - Added an additional version check for cases where the node returns no parent associations - Removed right outer joins associated with the 3.4 fixes (minor complexity that is no longer required) 33555: Merged (RECORD ONLY) V3.4-BUG-FIX (3.4.8) to V4.0-BUG-FIX (4.0.1) 33554: Merged V3.4 (3.4.8) to V3.4-BUG-FIX (3.4.9) 33512: GERMAN: L10N Updates, fixes: ALF-12154, ALF-9514, ALF-12389 33513: SPANISH: L10N Updates, fixes: ALF-12154, ALF-9514, ALF-12389 33514: FRENCH: L10N Updates, fixes: ALF-12154, ALF-9514, ALF-12389 33516: ITALIAN: L10N Updates, fixes: ALF-12154, ALF-9514, ALF-12389 33526: JAPANESE: L10N Updates, fixes: ALF-12154, ALF-9514, ALF-12389 33544: SPANISH: Fixes additional Spanish translation bugs 33552: JAPANESE: Adds previously missing workflow related translations 33560: Fix the line endings to be consistent 33561: DOC-335 Provide a commented out example of SPP/Vti SSL Configuration in the Module 33563: Merge (Record Only) V3.4-Bug-FIX to V4.0-BUG-FIX 33328 : ALF-12098 Issue ALF-4010 not fully resolved. ftp transfer of a previously moved file copies it to the destination folder of the previous move 33566: fixed a comment. 33567: Small change to debug logging 33568: Removed deleteConfirm flag. Not neccessary as events are fired postCommit. 33570: Merged V3.4-BUG-FIX to V4.0-BUG-FIX 33550: Fixed ALF-10895 "Links, documents and folders: Unable to delete comments" - Made sure no "content" is sent when using HTTP DELETE to avoid proxy issues 33574: Merged (RECORD ONLY) V3.4-BUG-FIX (3.4.8) to V4.0-BUG-FIX (4.0.1) 33573: Merged V3.4 (3.4.8) to V3.4-BUG-FIX (3.4.9) 33557: JAPANESE: Removes redundant string 33576: ALF-12634 When building the edit online link to SPP/Vti, don't assume that the protocol (http/https) is the same as Share, but instead make that a module property (similar to how the port and hostname are set) 33577: Remove un-used imports 33584: ALF-12363: Protect against attempt to reference undefined rawPerms variable in folder-permissions WebScript controller 33586: ALF-12405: Always show delete site icon on My Sites dashlet when viewed on IE7 33605: Fixes: ALF-12408: Script Error when hovering on a row. 33616: Merged BRANCHES\DEV\V3.4-BUG-FIX to BRANCHES\DEV\V4.0-BUG-FIX 33500: Fix for ALF-12162 Searching for words with german umlaut does not show expected results 33624: ALF-12488 - CIFS error occurs if Hazelcast Config is enabled. 33637: ALF-11594: Disable comment field on upload dialog after version update 33643: ALF-12243: Fixed create HTML content via HTML editor 33649: Minor: tabs 33650: ALF-12657: We need to set maxSavePostSize for tomcat connectors to support SSL (e.g. ModelsGet from SOLR will truncate JSON to 4096 characters) 33662: Fix for ALF-12460 33663: Fix for ALF-12460 (part 2) 33664: Fix for ALF-12460 (part 2) 33665: Fix for ALF-12443 33672: Merged V3.4-BUG-FIX to V4.0-BUG-FIX 33468: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX 33467: Enterprise overlay update for MessagesWebScript 33470: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX 33469: Revert rev 33467 - not required 33482: Fixed ALF-12373 "IE7 Specific: incorrect displaying of "Link to Rule Set" window in Alfresco Share" - also fixed for ie6 removed javascript error thrown on click 33580: Minor formatting for easier debug stepping 33581: Fixed ALF-12638: No username in an audit context after an error 33589: ALF-12650: Merged V3.4.1 to V3.4-BUG-FIX (3.4.9) 33588: ALF-12620 Regression. Since 3.4.1.25 / 3.4.6.7 a user can be invited to a site multiple times - correction to js contains function. Bug introduced in r32775 33597: Merge DEV to V3.4-BUG-FIX 33465 : ALF-11193 - Consumer role cannot Unscribe/subscribe the IMAP folders. 33602: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2011_12_06 to BRANCHES/DEV/V3.4-BUG-FIX: 32551: ALF-10133: "Doc folder" for calendar events does not clear/reset itself 33630: Merge Dev to V3.4-BUG-FIX 33626 : ALF-4896 - Lock icon displayed for documents with expired lock 33633: Merge V3.4.7 (3.4.7.1) to V3.4-BUG-FIX (3.4.9) 33609: ALF-12589 CLONE - Content Manager unable to edit content from another user sandbox - Hot Fix for 3.4.7 needed Changed the permissions on the user's 'preview' store so that the group of ContentManagers was granted the ContentManager permission. It had been granting the permission to all current users in the group individually. As a result new ContentManagers could not FLATTEN or WRITE to the preview store. This had already been done for the main user store a few years back. As the managers parameter was no longer needed the was removed. 33647: Merged DEV to V3.4-BUG-FIX 33629: ALF-12585: Manage System Users shows "Change Password" icon for LDAP users in search results Sets "isMutable" property using addPropertyResolver in UsersDialog. 33648: Merged DEV to V3.4-BUG-FIX 33623: ALF-10586: CMIS: Trying to delete a multilingual document w/o translations via webscript There is no need to delete associations in CMISServicesImpl.deleteObject(). 33659: Merged V3.4 to V3.4-BUG-FIX 33594: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2011_12_06 to BRANCHES/V3.4: 32551: ALF-10133: "Doc folder" for calendar events does not clear/reset itself 33595: Reverse merge of the following. Should have been committed to V3.4-BUG-FIX 33594: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2011_12_06 to BRANCHES/V3.4: 32551: ALF-10133: "Doc folder" for calendar events does not clear/reset itself 33604: ALF-12597: WCMQS doesn't work out of the box 33654: Merged DEV to V3.4 33622: ALF-12655: Configure link isn't presented in Web View dashlet(My Dashboard page) User userIsSiteManager is true by default in webview.get.js. This allows to configure Web View dashlet on user's dashbord. 33651: ALF-12655: Configure link isn't presented in Web View dashlet(My Dashboard page) Sets userIsSiteManager=false before remote call, so if remote call fails it won't give site manager role to the user. 33655: ALF-12366: Merged PATCHES/V3.4.6 to V3.4 33548: ALF-12393: More changes to cope with read committed DB behaviour in AbstractReindexComponent - Reverted r33278, 33354, 33355 and introduced more generic solution - NodeRefs resolving to deleted nodes in the cache cause cache cleaning and transaction retry if they resolve OK in the database - Cached parent assocs are thrown away for non-deleted nodes if they are empty - Removes the need for the outer join and special case exception handling all over the place 33562: ALF-12393: Further improvments - Lookup of NodeRef to a deleted node must always result in cache clearing and transaction retrying (due to possible read committed behaviour half way through transaction) - Detection and correction of stale cached negative results (VALUE_NOT_FOUND) in node cache 33583: ALF-12393: Rework to getNodePair(NodeRef) to have less impact on existing code but still cope with read committed - Look ups of deleted nodes still cause InvalidNodeRefExceptions but these have a retryable cause so that both handlers can handle and retrying transactions can recover - Corrections to cached negative results (because the nodesCache remembers negative results) are written straight through and the transaction does not need to be retried 33660: Merged V3.4 to V3.4-BUG-FIX (RECORD ONLY) 33634: ALF-12161: Merge V3.4-BUG-FIX (3.4.9) to V3.4 (3.4.8) 33633: Merge V3.4.7 (3.4.7.1) to V3.4-BUG-FIX (3.4.9) 33609: ALF-12589 CLONE - Content Manager unable to edit content from another user sandbox - Hot Fix for 3.4.7 needed Changed the permissions on the user's 'preview' store so that the group of ContentManagers was granted the ContentManager permission. It had been granting the permission to all current users in the group individually. As a result new ContentManagers could not FLATTEN or WRITE to the preview store. This had already been done for the main user store a few years back. As the managers parameter was no longer needed the was removed. 33657: ALF-12650: Merged PATCHES/V3.4.6 to V3.4 33590: ALF-12620: Merged V3.4-BUG-FIX (3.4.9) to V3.4.6 (3.4.6.10) 33589: ALF-12650: Merged V3.4.1 to V3.4-BUG-FIX (3.4.9) 33588: ALF-12620 Regression. Since 3.4.1.25 / 3.4.6.7 a user can be invited to a site multiple times - correction to js contains function. Bug introduced in r32775 33673: Fixed compilation error 33678: Merged V3.4-BUG-FIX to V4.0-BUG-FIX 33677: Merged V3.4 to V3.4-BUG-FIX 33676: ALF-12436: Increase content data cache sizes to match node properties cache sizes to allow bulk loading without overflowing 33679: Merged V3.4-BUG-FIX to V4.0-BUG-FIX (RECORD ONLY) 33486: Merge V4.0-BUG-FIX to V3.4-BUG-FIX 33306 - experiment to add sdk-extras 33489: Merged V4.0-BUG-FIX to V3.4-BUG-FIX 33322 : Enterprise SDK 33323 33335 33353 33457 33463 33495: SDK Build fix - do not merge to V4.0. 33680: Merged DEV to V4.0-BUG-FIX 33675: ALF-12379: WebLogic: alfresco fails to start: java.lang.NoSuchMethodError: org.apache.commons.lang.mutable.MutableInt.increment()V org.apache.commons.* package should be used as application's preferrable for WebLogic. 33683: Merged V3.4-BUG-FIX to V4.0-BUG-FIX 33682: Merged V3.4 to V3.4-BUG-FIX 33681: ALF-12132: Fix Bitrock's copy of the custom lotus context. Yuck! 33689: Fix for ALF-12437 Switching from Lucene to Solr caused subsystems to be in inconsistent state and repository to hang - filter out changes to read only properties when set in bulk - ie they are ignored 33691: Fix for ALF-12667 33693: Fix for ALF-12695 SOLR should not appear to work with AVM - it should not silently fail. - AVM search and indexing will raise exceptions when used with SOLR - removed the AVM site bootstrap associated with Share in older versions of the product. 33701: Merged DEV to V4.0-BUG-FIX 33697: ALF-12691: Alfresco Explorer doesn't work: java.lang.NoClassDefFoundError: org/apache/commons/lang/builder/HashCodeBuilder Shared library for WAS was fixed. commons-lang-2.6.jar is used. 33704: ALF-12299 - NFS subsystem enable/disable needs a different attribute name 33714: ALF-10229: DOS Voodoo to set ALF_HOME to the parent parent directory of the apply_amps script - for /D %%D IN (%~dp0..\) do set ALF_HOME=%%~dpD - Yuck! 33721: Merged BRANCHES/DEV/mward/schemacomp to BRANCHES/DEV/V4.0-BUG-FIX: 33720: Merged BRANCHES/DEV/BELARUS/V4.0-BUG-FIX-2012_01_20 to BRANCHES/DEV/mward/schemacomp: 33631: LF-12355 : Create schema reference files for SQL Server 33727: Test fix - fallout from removing the bootstrap for the "sitestore" AVM store 33729: Fixes: ALF-12575 - missing i18n strings. (translations pending) 33738: SPANISH: Translation updates based on EN r33523 33739: Merged DEV to V4.0-BUG-FIX 33723: ALF-10229: apply_amps.bat doesn't work properly from alfresco-enterprise-4.0.0a.zip Fix for apply_amps.sh to set ALF_HOME to the parent parent directory of the apply_amps script 33746: ALF-10656 SOLR: Patches execute search during bootstrap causing deadlock - Part 1: - SOLR query use during bootstrap will throw an exception - tidy up some patch beans - ignore unused AVM "sitestore" in WCMPostPermissionSnapshotPatch 33753: Remove upgrade installers from build targets git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@33758 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2012-02-08 11:06:09 +00:00
Dave Ward	bc53dae6ba	Merged V3.3-BUG-FIX to HEAD ... 20954: Calendar Dashlet updates. Fixes: ALF-2907 (meeting workspace issue) 20968: Minor VersionableAspect fix to onDeleteNode policy firing (follow-on for r19507) 20981: Removed Install Jammer installers from V3.3.3 20982: AVMTestSuite - run PurgeTestP after AVMServiceTest (investigating ALF-3611) 20997: Fix for ALF-2605 - updated share-config-custom.xml.sample and removed obsolete extension files 21030: Pulled XAMConnector AMP into main 3.3SP3 codeline. Apart from build changes (incl. EOL), there are no repo changes. 21032: StoreSelector passes through NodeContentContext allowing stores access to node information 21036: Fix ALF-245: Can't delete space that contains "translation without content" - Delete triggers 'unmakeTranslation' - Empty translations are marked with sys:temporary before being deleted 21051: More on fix ALF-245. Reduced complexity by not deleting empty translations twice 21064: Merged V3.3 to V3.3-BUG_FIX 20898: Merged HEAD to V3.3 20724: AVMTestSuite - temporarily comment out PurgeTestP - TODO: investigate intermittent test failure 20903: Incremented version revision 20921: AVM - fix purge store so that vr nodes are actually orphaned (ALF-3627) 20952: Fix for ALF-3704: Module conflict - Alfresco web client config property page missing metadata. This is application of a fix made to the config service in a hotfix. The change provides a deterministic load order for config files loaded via the ConfigBootstrap spring bean. More importantly it means that config files loaded by modules on different machines in a cluster load in the same order. The forms client and AWE config files have been updated to take advantage of the new loading order. 21061: Merged PATCHES/V3.1.2 to V3.3 (RECORD ONLY) 20890: ALF-3687: Apply LUCENE-1383 patch to Lucene 2.1.0 to reduce memory leaks from ThreadLocals 20891: ALF-3687: Build classpath fix 20892: Incremented version label 21062: Merged PATCHES/V3.2.1 to V3.3 20897: (RECORD ONLY) Incremented version label 20901: (RECORD ONLY) ALF-3740: Merged V3.3 to PATCHES/V3.2.1 20524: VersionMigrator - option to run as scheduled job (ALF-1000) 20904: (RECORD ONLY) ALF-3732: Merged PATCHES/V3.2.r to PATCHES/V3.2.1 19803: ALF-558: File servers (CIFS / FTP / NFS) can now handle concurrent write operations on Alfresco repository - ContentDiskDriver / AVMDiskDriver now use retrying transactions for write operations - Disable EagerContentStoreCleaner on ContentDiskDriver / AVMDiskDriver closeFile() operations so that they may be retried after rollback (Sony zero byte problem) - Allow manual association of AVM ContentData with nodes so that closeFile() may be retried - Propagation of new argument through AVM interfaces 20905: (RECORD ONLY) ALF-3732: Rolled back the now unnecessary reference()/dereference() stuff from ALF-558 20906: (RECORD ONLY) ALF-3732: Merged DEV/V3.3-BUG-FIX to PATCHES/V3.2.1 20623: Fix for ALF-3188 : Access Denied when updating doc via CIFS 20907: (RECORD ONLY) ALF-3732: Merged V3.3 to PATCHES/V3.2.1 20173: Propagate IOExceptions from retryable write transactions in AlfrescoDiskDriver 20950: ALF-3779: Upgrades on large repositories from v2.1 and v2.2 were failing on MySQL due to "The total number of locks exceeds the lock table size" errors - Solution was to add support for new --BEGIN TXN and --END TXN comments and execute LOCK TABLES statements in the same transaction as large INSERT - SELECT statements. 20990: ALF-3789: Concurrency issues with InMemoryTicketComponentImpl - Previous ETHREEOH-1842 method of caching web session 'ref counts' against tickets could cause tickets to unpredictably fall out of the transactional cache - Rolled back original ETHREEOH-1842 fix. Would be too much overhead to keep these ref counts consistent across a cluster. - Instead, avoid invalidating tickets on web session timeout and only do it on explicit log out. - Now tickets maintained in non-transactional shared cache so they can't drop out unpredictably - Logic for ticket inactivity timeout caching improved so that it should work across a cluster 20991: (RECORD ONLY) Incremented version label 20993: ALF-3789: Fixed Spring configuration backward compatibily issue with previous fix - Ticket cache bean name restored to ticketsCache. This is actually now a non-transactional cache. - Also externalized parameters so that they can now be controlled by alfresco-global.properties without any bean overrides authentication.ticket.ticketsExpire=false authentication.ticket.expiryMode=AFTER_FIXED_TIME authentication.ticket.validDuration=PT1H 20994: Eclipse classpath fixes for unit testing after ant build 21057: ALF-3592: PassthruCifsAuthenticator now auto-creates / imports users who do not already exist in Alfresco - At least one of the following properties must be true for this to happen synchronization.autoCreatePeopleOnLogin synchronization.syncWhenMissingPeopleLogIn - Also improved debug logging of unknown passthru domains 21063: Merged PATCHES/V3.2.r to V3.3 21037: ALF-3793: Final attempt at realigning saved XForm data with a modified Schema - removeRemovedNodes / insertUpdatedNodes / insertPrototypeNodes replaced by a one stop recursive process that builds a new instance tree from scratch - Nodes copied over in correct order - Missing nodes added in and extra nodes discarded - Prototype nodes appended at appropriate points 21038: (RECORD ONLY) Incremented version label git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@21065 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2010-07-11 14:22:26 +00:00
Dave Ward	8080fd96f1	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
Mark Rogers	8f0e7fddc1	Merge V2.2 to HEAD ... ALF-1801 - Empty category array throws NPE git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19895 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2010-04-19 13:26:29 +00:00
Steven Glover	ed4cfe544a	Merged BRANCHES/V3.2 to HEAD: ... 19406: Fix for ALF-649 - Web Service query() no longer returns metadata in 3.2 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19416 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2010-03-19 17:20:37 +00:00
Paul Holmes-Higgin	fc695fbabc	Updated files to LGPL ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18956 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2010-03-02 18:33:11 +00:00
Dave Ward	7f6435087f	Merged V3.2 to HEAD ... 17475: ETHREEOH-3295: Fix to AuthorityMigrationPatch - Forces transaction retry if worker thread reaches child authority before a parent authority - Tested on Kev's 3.1.1 repository with ~20,000 bulk loaded users and ~2,000 Share sites - Now completes in 5 minutes as opposed to 45 17461: ETHREEOH-3268: Added MutableAuthenticationService.isAuthenticationCreationAllowed () to allow conditional display of external user invitation UI 17450: ETHREEOH-2762: Correction to previous fix. Do not generate new name when working copy copied back on check in. 17440: ETHREEOH-3295: Fixed logging in FixNameCrcValuesPatch 17439: ETHREEOH-2762: Improved behaviour when a working copy is copied - Working copy aspect already removed the working copy aspect on copy - Now derives a new name from the node checked out from and a UUID, preserving the extension 17438: ETHREEOH-2690: Fix sequencing of jgroups system property setting - declared dependency between internalEHCacheManager and jgroupsPropertySetter 17436: ETHREEOH-3295: Further performance improvements to AuthorityMigrationPatch - authority created at same time as all its parent associations to save lots of reindexing, as per LDAP sync - multi-threaded BatchProcessor (as used by LDAP sync, FixNameCrcValuesPatch) used to process work in 2 threads in batches of 20, report progress every 100 entries and handle transaction retries - BatchProcessor now promoted to its own package 17394: Fix for license issue in local enterprise builds. - Replace Community with Enterprise in version.properties during enterprise war building 17365: ETHREEOH-3229: Visited and fixed all SearchService result set leaks 17362: ETHREEOH-3254: Eliminate needless ping to LDAP server in LDAPAuthenticationComponentImpl.implementationAllowsGuestLogin() 17348: ETHREEOH-3003: Fix NPE in Hyperic when LicenseDescriptor has null fields 17316: Merged V3.1 to V3.2 17315: ETHREEOH-3092: PersonService won't let you create duplicate persons anymore. 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. 17312: ETHREEOH-3219: Enable resolution of JMX server password file path on JBoss 5 17299: Merged V3.2 to V3.1 (Record only) 17297: ETHREEOH-1593: Changed name of username cookie and fixed login.jsp to decode it properly 17248: ETHREEOH-1593: alfUser cookie value should be base 64 encoded to allow for non-ASCII characters 17297: ETHREEOH-1593: Changed name of username cookie and fixed login.jsp to decode it properly - thanks Kev! 17292: ETHREEOH-1842: Ticket association with HttpSession IDs tracked so that we don't invalidate a ticket in use by multiple sessions prematurely - AuthenticationService validate, getCurrentTicket, etc. methods now take optional sessionId arguments 17269: Fix failing unit test - reinstate original behaviour of AbstractChainingAuthenticationService.getAuthenticationEnabled() 17268: Fix InvitationService - Runs as system to do privileged AuthenticationService actions git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18105 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2010-01-18 17:41:59 +00:00
Kevin Roast	050e279912	Merged V3.2E to HEAD ... 17246: ETHREEOH-3208: User profiles for users authenticated by immutable subsystems are now read only - Introduced MutableAuthenticationService interface, only implemented by Alfresco native authentication service - Split out those methods from AuthenticationService that mutate the user store and added isAuthenticationMutable() - Now both Alfresco Explorer and Share user profile / password edit link rendering is conditional on isAuthenticationMutable - Works with authentication chain containing mixture of internally and externally authenticated users 17247: Fix failing unit tests - rm-public-services-security-context.xml needed to be brought in line with public-services-security-context.xml (and will forever more!) 17248: ETHREEOH-1593: alfUser cookie value should be base 64 encoded to allow for non-ASCII characters 17253: *RECORD ONLY* ETHREEOH-2885: web.xml must conform to the schema to work on JBoss git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18098 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2010-01-18 15:32:57 +00:00
Dave Ward	505fe9c436	Merged V3.2 to HEAD ... 15828: ETHREEOH-2601: Users dialog won't delete users who have no authentication information - Moved the AuthenticationService.deleteAuthentication() call inside PersonService.deletePerson() and protected with try - catch so that if there is no authentication information (for an upgraded/moved user) the person can still be deleted - Removed a bunch of redundant deleteAuthentication() calls git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@15829 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2009-08-20 11:01:19 +00:00
Dave Ward	916774a1fe	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
Andrew Hind	0e56f7f40c	Search API updates. FTS fixes for range and dual tokenisation. ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14419 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2009-05-22 14:36:48 +00:00
Derek Hulley	7de9315818	Reversed out revisions 14366, 14361 and 14356 ... - Just prior to this, created dev branch DEV/ANDY_HEAD_ROLLBACKS - Andy: Switch to this branch on your local copy if you have changes to any of the files modified here git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14374 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2009-05-20 10:32:23 +00:00
Andrew Hind	3c067eca13	First pass at fixes/extensions/tidy ups to the search API - part of wiring FTS up as a query language MOB-568 ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14361 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2009-05-19 14:06:15 +00:00
Derek Hulley	fd5b57551f	Merged V3.1 to HEAD ... 13424: ETHREEOH-1242: Sample LDAP authentication config breaks site invites in Share 13427: Fixes for ETHREEOH-1157: Propagate exceptions using ReportedException 13428: Fix ETHREEOH-1493: Upgrade from 2.1-A to 3.1 uses incorrect patch id and fixes_to_schema 13429: Specific fix for ETHREEOH-1157: duplicate/triplicate users not properly prohibited 13436: Merged V2.2 to V3.1 13435: Merged V2.1 to V2.2 12307: Merged DEV/V2.1SP7 to 2.1 11927: ETWOONE-396 12112: ETWOONE-396 13437: Fixed ETHREEOH-1498: Mismatched closing XML tag in ehcache-custom.xml.sample.cluster 13439: Fix for ETHREEOH-1157: JSF Dialogs Absorbing Exceptions 13456: Fixed ETHREEOH-1472: Changes to systemBootstrap cause bootstrapping ACP's not to work 13469: Upgrade patch to update internal version2Store counter (follow-on fix for ETHREEOH-1540) 13491: Chaining example for DOC-84 13492: Fixed paths in zip file 13494: Fixed GenericBootstrapPatch when overriding bootstrap views 13495: Added @version javadoc 13496: Minor logging updates 13497: Fixed ETHREEOH-1431: Authentication case sensitivity switch doesn't work 13500: Temporary fix for Sharepoint issue raised last week 13502: ETHREEOH-1575: It's impossible to create Change Request task 13511: Fix for ETHREEOH-1549: Impossible to create HTML web content 13529: Fix for ETHREEOH-1595 13531: Fix for ETHREEOH-1607: Error on chaining example xml - malformed comment 13537: Build fix ... exclude the system user from auto creation 13538: Build Fix - further contraints to aviod auto-creation of guest ___________________________________________________________________ Modified: svn:mergeinfo Merged /alfresco/BRANCHES/V2.1:r12307 Merged /alfresco/BRANCHES/V2.2:r13435 Merged /alfresco/BRANCHES/V3.1:r 13424,13427-13429,13436-13437,13439,13442-13450,13452,13454-13456, 13469-13473,13475-13476,13479-13480,13491-13500,13502,13511,13529-13538 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13619 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2009-03-13 01:52:39 +00:00
Derek Hulley	5b8f58494e	Merged V3.1 to HEAD ... 12896: Merged DEV/LIVECYCLE-3.1 to V3.1 12859: Merged V2.1-A to DEV/LIVECYCLE-3.1 9040: Fixed WebService client code to take dynamic webapp name 12865: Merged V2.1-A to DEV/LIVECYCLE-3.1 9040 integration: Added 'repository.webapp' (defaults to 'alfresco') for Webservice clients 12868: JAWS-142: Adobe LC JGroups Clustering - JGroups communications and factories remain in 'repository' project - JGroups EHCache integration moved to 'enterpriserepository' project - Default factory for EHCache cluster config is aware of open-enterprise split - Default EHCache config still works as normal - JGroups EHCache config still enabled by setting 'alfresco.cluster.name' property 12887: Merged V2.1-A to DEV\LIVECYCLE-31 8619: Hard-coded "admin" usage in non-test classes only 12906: Re-deleted files after merge mix-up ___________________________________________________________________ Modified: svn:mergeinfo Merged /alfresco/BRANCHES/V3.1:r12896,12906 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13524 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2009-03-10 14:22:22 +00:00
Roy Wetherall	4ef9a86c62	Merged V2.1-A to HEAD ... 7710: Added spring configuration to administration web service to prevent management of user authentication details git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12716 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2009-01-13 17:56:00 +00:00
Kevin Roast	4fe9a4f345	Merged V3.0 to HEAD ... 12123: Merged V2.2 to V3.0 11466: Fixed sql-query DELETE syntax 11614: Flush after putChild, fix for ETWOTWO-777 11641: Merged V2.1 to V2.2 11632: Improvements for AVM index FULL and AUTO rebuild. 11646: Upgrade scripts tweaks: 11650: Added unit test to confirm fix of ETWOTWO-740 11674: Added missing EHCache definitions for QName, Namespace and Locale caches 11825: Fixed Eclipse classpath addition of path for Oracle JDBC driver 12125: ETHREEOH-899: Image transformations do not follow Options 12127: Merged V2.2 to V3.0 11675: Node DAO optimizations 11680: Full Fix for ETWOTWO-777 + more protection for nested write transactions beneath read transactions. 11729: AVM creates and deletes no longer update the directory mod time - ETWOTWO-801 11738: Fix for ETWOTWO - fixed check for TX propagation mode 11748: Fixed ETWOTWO-578: RepositoryWebService fetchMore() does not fetch last node 11749: Incorporate feedback from ACT-5440: MySQL-specific tweaks to the upgrade scripts 11750: Moved t_qnames_dyn section to after t_qnames 11752: Fixed ETWOTWO-734: ImporterComponent uses Lucene queries 11785: Build Fix:Remove auto created person TX commit fro DB 11853: Fix for ETWOTWO-687 - missed a case when generating lists of actions for modified files list 11940: Stress test main method for ETWOTWO-744 11950: Fixed ETWOTWO-909 and ETWOTWO-911 11987: Dirty checking for attribute related DAOs 12008: Fixed test for transaction-requiring AttributeService 12128: Merged V2.2 to V3.0 11530: Merged V2.1 to V2.2 11499: Defensive clear of the security context to avoid any ticket sharing for a given user - ETWOTWO-326 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12501 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2008-12-18 17:23:44 +00:00
David Caruana	86fa1c011f	Merge from SEAMIST3 ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10726 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2008-09-04 10:56:47 +00:00
Derek Hulley	e101f725cf	Merged V2.9 to HEAD ... 9018: MT: system-wide jobs should run across all stores/indexes 9204: Merged V2.2 to V2.9 8633: Merged V2.1 to V2.2 8629: Merged V2.1-A to V2.1 8493: Fixed ADB-51: ImporterBootstrap doesn't use transaction retrying 8494: EHCache and JGroup patches and upgrades 8546: ACT-1650: performance optimization 8550: Fixes to transactional cache handling 8553: Fixed tests: MLText is a Map, but will always have at least one entry, even that entry is null. 8583: ACT-954: IndexInfo files now reopen when they close (for whatever reason) 8640: Merged V2.1 to V2.2 8638: Used correct exception type for IO channel reopen logic 9102: Unit test to check that transactional cache size overrun is handled 9106: Merged V2.1 to V2.2 9043: Fixed AR-2291: SchemaBootstrap lock is only required before first SQL execution 9045: Fix AR-2291: SchemaBootstrap lock is only required before first SQL execution 9047: Fixed AR-2305: Index tracking in AUTO mode doesn't report anything on bootstrap 9048: Fixed AR-2300: Random-based GUID instead of time-based GUIDs 9049: Fix patches to only run once 9050 <Defered>: Changed getString() method to use the available buffer length rather than a hard coded value. 9060: Fixed ETWOONE-109 and ETWOONE-128: RetryingTransactionHelper fixes and improvements 9061: Fixed NodeRefPropertyMethodInterceptorTest 9075 <Defered>: Added delete permission check when marking a file for delete on close. ETWOONE-141/ACT-2416. 9080: Fixed EHCache source zip 9081: Fixed ETWOONE-118: Tomcat failed bootstrap doesn't clean up EHCache cluster structures 9085: Fixed ETWOONE-154: Added JSR107 Jar to WAR 9115: Fixed test: TransactionalCache uses LRU so repeatedly checking if a entry is there keeps it in the cache. 9206: Merged V2.2 to V2.9 8857: Improvements to ACL performance for large ACLs 8951: Always check permission entry changes are made at position 0 9219 <No change>: Made NTLMLogonDetails class Serializable, port of r8973. 9220: Added delete permission check when marking a file for delete on close. Port of r9075. 9222: Merged V2.1 to V2.9 8683: Early warning for nodes indexed in the wrong store (ACT-964) 8684: Enhanced tests 8685: Enhanced tests 8686: Additional tests 9223: Merged V2.2 to V2.9 9120: Merged V2.1 to V2.2 8740: Fix for AR-2173 - do no recheck case of the user name when validating tickets (it has been done) 9122: Additional unit test from support case. 9224: Merged V2.2 to V2.9 9076: Fixed ETWOTWO-426: Upgrading alfresco from 2.1.1 to 2.2 throws errors with Mysql 5.0.51 9104: Merged V2.1 to V2.2 9025: Fixed AR-2314, AR-2299: Optimizations after profiling 9105: Merged V2.1 to V2.2 8745: Fix AR-2233 (regression introduced by fix for AR-2221) 9121: Merged V2.1 to V2.2 9017: Fix index back up failing due to background index merge/deletions (inlcudes back port of CHK-2588) 9137: Incorporated additions from Will into AVM console (ETWOTWO-439) 9225: Merged V2.1 to V2.9 8641: Merged V2.1-A to V2.1 7729: Fix to Repository Web Service (queryAssociated) to allow reverse association lookup (ie. given target, get the source) 8673: Fix for AR-2098 - shorter URL form now has NTLM filter mapping example in web.xml 8682: Fix for AR-2005 8695: AR-2054. 8696: Improved sort test to include prefix form of field name 9226: Fix ALFCOM-994 (see also earlier change in r9223) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9233 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2008-05-22 12:40:46 +00:00
Roy Wetherall	8d0db44bc6	Merged V2.1-A to HEAD ... 7970: Added 'writeWithAttachment' method to the contentweb service API. 7972: Added unit test to check CML creation of files and folders with spaces in the names git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8663 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2008-04-02 16:56:09 +00:00
Roy Wetherall	9fb99816e4	Merged V2.1-A to HEAD ... 7698: Added transform method to content web service git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8662 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2008-04-02 16:34:20 +00:00
Roy Wetherall	780c74c4b5	Merged V2.1-A to HEAD ... 7686: Added authority management methods to AccessControl web service and associated unit tests git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8659 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2008-04-02 12:25:46 +00:00
Derek Hulley	9561a00e64	Merged V2.2 to HEAD ... 8146: Interim checkin for Oracle upgrade scripts. 8150: AR-1905 8151: AR-1956 8152: Correct I18N when reporting patch description 8153: QName script for Oracle along with fixes for unique constraints on assoc tables 8155: Upgrade scripts for Oracle V2.2 - almost there 8164: AWC-1633: Unable to edit rule added via web service 8166: V2.2 upgrade scripts for MySQL and Oracle 8170: AWC-1515: E-mail doesn't reach user's mail box, if it was created with the help of templates 8174: Fix for AWC-798 8180: Fix for AWC-1843 8183: Fixes for different unique index names on alf_child_assoc 8189: AWC-1719: Need to alllow Rules to account for a space being deleted 8249: Fixed handling of empty namespaces on Oracle 8259: Fixes for null namespaces in QName 8360: Modified alf_audit_date columns and added patch 8404: Fix AR-2133: Fix handling of empty namespaces during upgrade git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8481 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2008-03-10 15:32:55 +00:00
Derek Hulley	2b7b96eb45	Merged V2.2 to HEAD ... 8105: Fix for AR-1828 - multiple users being created from web siteregistration 8107: Merged V2.1 to v2.2 8106: Fixed fallout from MetadataExtractors setting properties to thecorrect data type 8109: Fix for AR-2016 8119: AR-1778: putContent method in the ContentUtils class fail to upload*.java, *.txt, *.xml 8120: AR-1895: fix to web service SDK sample 8125: Test added to prevent regression of AR-1707 8126: Enhanced exception message when non-marking InputStream is used. 8131: Merged V2.1 to V2.2 8129: Merged V1.4 to V2.1: 8128: Fix AR-2041: NPE checking voids during index tracking 8140: AR-1762 - correct generation of download servlet URL git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8477 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2008-03-10 13:35:04 +00:00
Derek Hulley	115a51965a	Merged V2.2 to HEAD ... 7534: Merged V2.1 to HEAD 7398: XPath metadata extractor selector handles malformed and empty XML files 7401: Fix AR-1879: JBPM Timer never fires 7413: Contribution: Integrity checker ignores exceptions that would normally trigger transaction retries. 7416: AR-1884.Unicode wildcard processing. 7417: Added filtering of pseudo files when a partial wildcard search path is used, such as '*.csv'. AR-1889. 7436: AR-1863: major version's can now be created via the web service API; 7451: Fix for handling of UTF-8 application/x-www-form-urlencoded encoded form arguments as raised in support ticket 242 7458: Fix for AR-1900 7520: Fix to Template API where content was not retrievable from custom d:content properties on a node git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8413 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2008-03-03 13:35:10 +00:00
Jan Vonka	b56284a70a	Dictionary optimisation: improve performance when getting sub classes and property defs ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6825 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2007-09-19 11:47:29 +00:00
Derek Hulley	adfe9d7230	Merged V2.1 to HEAD: ... 6556: AVM performance tweaks 6557: WCM-758. 6558: Fixes WCM-753. 6559: better handling of rename, copy and paste for form instance data and renditions. addresses WCM-752 and partially addresses WCM-559. 6560: Renamed JndiTest.java until we decide to keep it or not. 6561: Oops. 6562: probable fix WCM-669 6563: Build fix after the removal of flushing suport 6564: Fix for WCM-728 6566: Support for avm index clustering via tracking - WCM-762 6567: Test fix after flush changes 6568: Fixed AWC-1517: Can now create space based on existing top-level space 6569: misc IE fixes. 6570: Various changes to improve AVM import performance and submit performance. 6571: Session flushing is now deprecated and doesn't fail with an exception. 6572: Reduced the iteration count to stress nextResults calls a bit more 6573: WS query sessions put back into cache after more results have been fetched. 6574: AR-1347: RepositoryServiceSoapBindingStub.queryAssociated() returns nothing when direction=target 6575: Fixed AR-1680: XPath metadata extraction now handles Node, NodeList and String return values 6577: Fix for AWC-1518 (User Homes renaming issue, and unreported issue with client config overriding of users home location) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6745 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2007-09-11 02:37:29 +00:00
Derek Hulley	1b86085b7d	Merged V2.1 to HEAD ... 6535: adding in handlers for renames and deletes of webforms to update web project configurations. 6536: fix to monthpicker. 6537: Cluster sample config for ticketsCache defaults to replicating puts 6538: Invite web users wizard was not correctly initialising 6539: AWC-1474 - Email Space Users dialog - if no email recipients then show message 6540: Fixed remote classpath check for SDK projects 6541: AR-1544: Inbound Rules Being Fired on Name Property Update 6542: Fix for AWC-1216 - changed NavigationBean to spot when CIFS server is disabled (as the method has changed in repo) 6543: AR-1623: WebServices authentication errors during concurrent load test 6544: AWC-1253: AddContent action should be externally configurable/overridable 6545: Fixed AR-1586: Nicer message when installing older module or duplicate module 6546: AWC-1301: Access Denied viewing details of content with association 6547: AWC-1499: It is impossible to remove 'Complianceable' aspect with the help of Run action 6548: Missing file ... should fix build issues 6549: Missed file .. fixed build issue 6550: AWC-1092: sorting by version number in version history is alpha, not numeric 6551: AWC-1217: Cannot differentiate between two users with same name in user picker search results 6552: Fixed AR-1572: Export of ML-enabled documents can now be imported 6553: Removed tabs 6554: Fixed handling of SC_NOT_FOUND message 6555: Fixed AR-1627: Removed ability to flush transaction resources on demand git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6744 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2007-09-11 00:52:59 +00:00
Derek Hulley	0d728ed843	Merged V2.1 to HEAD ... 6515: Fix for AWC-1362 (system error page when clicking on space that doesn't exist in navigator) 6516: Fix for AR-1688 - Vista 6518: Fix for AWC-1479, AWC-1199 and AWC-426 (javascript insertion into forum posts security related fixes) limit to subset of safe tags for posting 6519: Fix AR-1690 Web Scripts url.args is missing even though it's documented in WIKI 6520: Fix for AWC-1271 (component generator config ignored for associations) 6521: Fix AWC-1492 Some included javascript files in template/webscripts use the wrong app context path i.e. /alfresco when the app is called /alfzip 6522: Build fix 6523: - Fix rendering of tasks with no description in office portlets 6524: Added thread pool for index merging (AR-1633, AR-1579) 6525: One more fix for rendering of tasks with no description in office portlets 6527: Renamed axis jar to reflect version number. 6528: WebServices query cache refactoring git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6741 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2007-09-10 23:44:07 +00:00
Derek Hulley	807349fab5	Merged V2.1 to HEAD ... 6500: Office 2003 Add-ins: Fix for AWC-1505 6501: Fix for AWC-1361 6502: Fixes for locking issues regrading expired content 6503: Fix for AR-1615 6504: WCM-444, WCM-288, WCM-735, WCM-480 6505: WCM-498 wasn't fully fixed 6506: Fix for AWC-1462 6507: Fix for WCM-741 (link validation report for staging sandbox can get stuck) 6508: AR-1650: WS Unit tests fail 6509: Fix for WCM-751 which also solves WCM-570 - also fixed issue to allow deletion of any "broken" webprojects created due to either of those bugs. 6510: Fix for WCM-546 (workflow history panel should be expanded by default) 6511: Fix AWC-1128 6512: Fixes to several to a couple of bugs found under concurrent load. 6513: Build fix for test using an invalid noderef (now stripped out as it does not exist) 6514: Add support for the QueryFile transact request to the IPC$ named pipe handler. Fix for AR-1687. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6740 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2007-09-10 23:30:53 +00:00
Derek Hulley	9e41dc105d	Merged V2.1 to HEAD ... 6327: Drops alfresco-deployment.zip in build/dist instead of build. 6328:Set AVM file name requirements as lenient as possible. 6329: Fixed DNS name restriction to allow 1-char host labels. 6330: Setting read-only flag for start up components (AR-1621 and AR-193) 6331: Minor formatting 6332: Implementation of a read-only, HTTP-based ContentStore. 6333: AR-1619: A debug message needed changing as the FileFolderService now supports adding children onto system nodes. 6334: Build fix 6335: Fix for AWC-1447 (Office Add-In - Create Collaboration Space) 6337: Fixed AR-1622: WebService requests must be wrapped in retries git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6721 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2007-09-10 13:09:30 +00:00
Derek Hulley	0d8df71921	More for AR-460: System concurrency ... There might be a few SDK projects that still use TransactionUtil, but this checkin gets rid of its use otherwise. I took a glance over the areas of the code that use UserTransaction directly and didn't see any transactionally wrapped code that desperately needed to be put into a retry loop (i.e. write transactions in a concurrent scenario). If you spot any that you think might qualify, let me know. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6220 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2007-07-12 04:15:28 +00:00
Derek Hulley	2c4637723f	Merged V2.0 to HEAD ... 5910: Web Services getUsers 5913: Web Services admin user password change 5956: LDAP anon simple bind test 6133: WCM-486 6158: Merged V1.4 to V2.0 5600: Split person bootstrap 5642: AR-439 NetBIOS adaptor status request 6160: VersionHistoryPerformance patch with no versionedNodeId git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6166 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2007-07-04 16:03:31 +00:00
Derek Hulley	ca4a711c69	Merged V2.0 to HEAD ... 5880, 5881: Script actio parameter git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6162 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2007-07-04 13:44:00 +00:00
Derek Hulley	559d92956c	Renamed TransactionComponent to TransactionServiceImpl ... Fixed naming convention to be 'transactionService', 'TransactionService', but kept an alias 'transactionComponent'. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5905 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2007-06-11 10:10:38 +00:00
Derek Hulley	d41c31b895	Merged V2.0 to HEAD ... 5146: AR-1122 5148: AR-1116 5149: RM-5 5152: AR-1167 5153: WCM-324 5154: WCM-325, WCM-301, WCM-258, WCM-25, WCM-320 5156: WCM-338 5158: AR-1164 5169: AR-1216 5177: WCM-328 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5327 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2007-03-07 12:01:58 +00:00
Derek Hulley	53ebbeb169	Merged V2.0 to HEAD ... 5091: AWC-1118 5092: pooledactor assignment 5100: AWC-1133 5103: CML copy and cm:name 5106: Bubble view discussion topics 5107: AWC-1030, AWC-1137, Console buttons git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5312 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2007-03-06 13:20:00 +00:00
Paul Holmes-Higgin	d064e03508	Updated copyright ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5186 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2007-02-19 17:17:36 +00:00
Derek Hulley	49ea3ef394	Merged V2.0 to HEAD ... svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5141 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@51352 . - FLOSS - Some files will need a follow-up -root/projects/repository/source/java/org/alfresco/repo/avm/wf/AVMRemoveWFStoreHandler.java (not yet on HEAD: 5094) -root/projects/repository/source/java/org/alfresco/filesys/server/state/FileStateLockManager.java (not yet on HEAD: 5093) -onContentUpdateRecord (not on HEAD) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5167 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2007-02-16 06:44:46 +00:00
Paul Holmes-Higgin	63236da1f5	Changed licence headers ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5081 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2007-02-08 18:59:58 +00:00
Roy Wetherall	05927316da	Added session id to the result of authentication call. Updated Java web service client to pass session id on cookieif present in authentication details. ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5075 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2007-02-08 11:05:21 +00:00
Roy Wetherall	7e64c93d6b	Update to web repository web service to add association filter. Module management tool can now install AMP from a given directory. ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5018 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2007-02-02 14:47:14 +00:00
Roy Wetherall	fd6e9643b9	Fix the path being set on the Reference objects as it wasn't a valid XPath. Added some unit tests to clear up AR-1186. ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4993 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2007-02-01 11:19:20 +00:00
Roy Wetherall	fccfa9fc65	Added module status to module.properties file saved in WAR for later use. Added contribution to return node path in Reference object. Fixed issues with web service caused by outdated Jars and incorrect AuthenticationService ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4980 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2007-01-31 11:56:02 +00:00
Derek Hulley	3ece5861e1	Merged 1.4 to HEAD ... svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4364 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4379 . git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4658 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2006-12-19 14:58:16 +00:00
Derek Hulley	bcddf8ba23	Merged 1.4 to HEAD ... svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4145 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4146 . svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4159 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4160 . svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4164 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4165 . svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4165 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4166 . svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4176 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4178 . svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4179 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4181 . svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4145 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4146 . git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4630 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2006-12-18 11:21:44 +00:00
Britt Park	1b1e912f39	Heinous merge from HEAD. Seems to basically work. Be on guard however. ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4137 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2006-10-18 02:24:36 +00:00
Britt Park	0847deba8f	Big honkin' merge from head. Sheesh! ... git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3617 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2006-08-27 01:01:30 +00:00
Britt Park	59f33f811b	Merge from HEAD into WCM-DEV2. Also fixes build breakage in ... jndi-client and catalina-virtual that I introduced earlier. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3393 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2006-07-24 18:27:41 +00:00