2 Commits

Author	SHA1	Message	Date
Dave Ward	9c563e35c6	Merged V3.4-BUG-FIX to HEAD ... 24662: 3.4.1 bug fix branch 24718: Merged V3.3 to V3.4-BUG-FIX 24717: Fix ALF-5555: It is impossible to edit review date from record's details page 24719: Fix for ALF-6106: Error on Check In operation with % symbol (SPP) 24733: Better fix for ALF-6106: Error on Check In operation with % symbol 24734: Fix for ALF-6089: Incorrect order of fields at 'Create Series', 'Create Category' and 'Create Folder' forms The name, title and description fields are now placed in their own group on the server, all other non custom rm fields are put in an 'other' group, the client side config then declares a set for each group and orders them appropriately. 24752: Merged V3.4 to V3.4-BUG-FIX 24751: Merged V3.3-BUG-FIX to V3.4 (RECORD ONLY) Restored V3.3-BUG-FIX mergeinfo, somehow truncated in revision 24274 24753: Merged V3.3-BUG-FIX to V3.4-BUG-FIX 23870: Merge Dev to V3.3_BUG_FIX ALF-4243: F5 load-balancer sending regular HTTP requests to Alfresco server causing Faces Servlet to throw java.lang.NullPointerException (MyFaces upgrade to from 1.1.5 to 1.1.7) 23897: Additional fixes and tweaks since introduction of MyFaces 1.1.7 library. 23919: More JSF component id related fixes. 23945: More MyFaces1.1.7 JSF page fix ups 23959: Another MyFaces 1.1.7 dup id issue fixed. 24008: ALF-4243 - Upgraded MyFaces from 1.1.7 to 1.1.8 to fix a bug seen in 1.1.7 - Added handling for the fact that valuebound properties that result in null now cause an exception where-as they were perfectly valid in 1.1.5. 24419: Merge from V3.3 to V3.3-BUG-FIX r.24418 Fix for ALF-6075. Running out of /tmp space on the server is causing uploads to fail. 24768: Fixes ALF-6295: Allows MySQL to not be installed via unattended installer invocation 24771: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX: 24767: Merged BRANCHES/V3.3 to BRANCHES/V3.4: 24765: ALF-6547: fix intermittent test failure (AssetServiceImplTest renameFile/renameFolder) - fallout from ALF-1948 24779: Merge V3.3 to V3.4-BUG-FIX 24497 : ALF-3092 - deployment service - catch Throwable from Begin. 24684 : Merge DEV/BELARUS/V3.3-BUG-FIX-2010_10_04 to V3.3 23498 : ALF-5498 In Windows XP, placing a Folder with a Name that already Exists Removes all Content of the Existing Folder 24749 : ALF-6174 - Transfer Service fails with double peer assoc custom content type 24766 : ALF-5603 - It is impossible to assign workflow from workflow console to non-admin user 24802: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX: 24801: Fix for ALF-3055: "SecurityTestSuite hangs when run in DOD5015 context - failed authentication audit hangs on DB connection" - do failed audits in a separate thread (from a thread pool) 24812: Fix ALF-6316: A new "spoof" multivalue text property (cm:tagScopeSummary) is now made available for TagScope nodes when accessed via the getProperty or getProperties operations on the standard node service. The values of this property take the form "<tagname>=<tagcount>". A new interceptor has been added to the node service to do this (TagScopePropertyMethodInterceptor). WQS has been tweaked to make use of this new property, and the now defunct behaviour has been removed. 24820: Work in progress refactoring transaction handling of transfer unit tests. 24822: Merged BRANCHES/V3.4 to BRANCHES/DEV/V3.4-BUG-FIX: 24821: Fix for ALF-3055: "SecurityTestSuite hangs when run in DOD5015 context - failed authentication audit hangs on DB connection" - fix up unit tests 24834: ALF-6468 - Update the scheduled actions folder bootstrap to use localisable names and descriptions, following the normal pattern 24836: Added system property 'system.cache.disableImmutableSharedCaches' (false by default) - Equivalent to disabling Hibernate L2 cache for *immutable* entities - Allows distinction between mutable and immutable cache entries 24850: Fix ALF-6562: Moved property that is used to label the WQS dashlet on the "configure site dashboard" page out of the Slingshot project and into the WQS Share Module project. Corrected its value to "Web Quick Start" rather than "WCM Quick Start". 24857: Merged V3.4 to V3.4-BUG-FIX 24853: Merged V3.3 to V3.4 24852: Fixed ALF-6573 "Incorrect name of subgroups on "Groups" page" 24870: Removed svn:mergeinfo from root 24873: Merged V3.3 to V3.4-BUG-FIX (RECORD ONLY) 21789: ALF-4333: Fix - Updated RepoPrimaryManifestProcessorImpl so it can handle deletions that are reported by either pre-delete noderef or archived noderef (previously only handled the latter). - Updated TransferManifestNodeFactory so that it handles the case where the status of the node to transfer is "deleted". - Updated UnitTestTransferManifestNodeFactory so that it handles the change to TransferManifestNodeFactory above. - Added new tests for deletion cases. 23259: Merged HEAD to V3.3 23256: Fix ALF-4573: Start Workflow action is absent for edited document and working copy in Share 23346: Brought WebQS module in (including build process but not installer elements yet) 23371: "Simply" added wcmqs to installer 23391: ALF-5367: Copy dlls into tomcat/bin as appropriate. 23485: Merged V3.4 to V3.3 (fix backported for V3.3.x lines) 23472: Fixed ALF-5408: SQL Server missing ON DELETE CASCADE declarations 23515: Merged PATCHES/V3.2.0 to V3.3 23514: ALF-5554: Merged HEAD to V3.2.0 23153: When updating tag scopes following system shutdown/restore, be smarter about quickly skipping tag scopes that another (new) thread is currently working on 23283: More debugging level logging for tagging updates, to help identify the problem with periodic multi-threaded test failures on bamboo 23535: Merged V3.4 to V3.3 (complements 23517: ALF-5552) 23508: Fixed ALF-5559: Permission interceptors can fail if Lucene returns invalid NodeRefs 23564: ALF-5600: Merged V3.4 to V3.3 23424: Fixes: ALF-2989 - Incorrect sideId reference in URL for event in Site Calendar Dashlet Adds support for displaying events that start in the past but finish in the future (previously only events that start in the future were shown) 23586: MERGED V3.4 to V3.3 22864: Fix for ALF-5005: "Create and edit functions on AWE become "confused"" 23042: Fix ALF-5127: Impossible to create an article/blog (WCMQS) [Must clear panel hideEvent handler if manually hiding a YUI panel] 23561: Fixes: ALF-4569 - Removes universal override of input width box and switches the editor form panel to adjust it's width based on content rather than window size. Fixes: ALF-4570 - Adds an override for the CSS 'top' property of the form dialogue to ensure it's always below the ribbon. (Was being set automatically by the YUI widget.panel call) 23569: Fixes: ALF-5606 - Ribbon wasn't resizing correctly after the form events. 23630: Backport of installer 23631: Added 64-bit & deployment installers 23664: Fixes ALF-5691: TransferService: Multi-byte characters are not encoded correctly 23681: Fixes ALF-5699: TransferService: Snapshot file from source repo never contains complete MLText properties 23695: Fixed bug exposed after fixing ALF-5699. Parsing of MLText properties out of the transfer snapshot file was incorrect, and that was causing multi-lingual property values to be duplicated 23709: ALF-5699: Fix NPE in ManifestIntegrationTest 23734: Merged V3.4 to V3.3 23731: Fixes for ALF-3098 and ALF-3097 - Share - Security check on Personal Dashboard - only the owning user can view a user dashboard page - Share - Security issue on Customize Site Dashboard - private and moderated site dashboard pages no longer visible to non-members, customise site and dashboard pages only accessible to SiteManager 23747: ALF-5696: Merged V3.4 to V3.3 23585: Fixed ALF-5372 "JavaScript error on Groups management dialog with IE8 : document.getElementById is null" 23790: Fixed ALF-3823 "Share: RSS feed can't be read: http://cds-srv.sun.com:8700/rss/update/public/sunalert_update.xml - ok with other RSS client." 23883: Fixes ALF-5759: WQS: Attempt to copy a website section fails 23907: Merged DEV/BELARUS/V3.3-BUG-FIX-2010_09_20 to V33 22750: ALF-4846: Update rules are firing on inbound actions 23931: Undid rev 23907 (Reverse-merged /alfresco/BRANCHES/DEV/BELARUS/V3.3-BUG-FIX-2010_09_20:r22750) 23961: Fixed ALF-5686 "Incorrect behaviour of "All" filter in "My Tasks" dashlet" - Variables assigned in a <#macro> shall always be assigned using <#local> (using <#assign> makes them globally available which might cause naming collisions) 24132: Disable intermittent failing unit test 24148: ALF-6007: Merged HEAD to V3.3 23049: Fixed ALF-5099: Error when trying to go back in Create Web Content Wizard (only with certain XSDs) 24263: Merged from V3.3-BUG-FIX to V3.3 24264: V3.3-BUG-FIX to V3.3 24262: Stress test code for ALF-5025: Support background processing of archiving 24287: Added missing import 24336: Merged V3.4 to V3.3 23205: Fix for ALF-2111 - Download URLS are different on different pages, authentication fails when URL sent 24353: Merged V3.4 to V3.3 24352: Fix SQL fallout from ALF-6078 24510: Merged V3.4 to V3.3 21960: First round of date refactoring: Document Library pages now expect XML dates (ISO8601) from Share data webscripts 21961: Share client-side I18N utility now emulates sever-side handling of doubled-up single quotes. 24526: Merged V3.4 to V3.3 24402: Fix for performance degredation related to ALF-3823. RSS feed processing in JavaScript relies on Rhino impl of regex - this is extreemly slow as Rhino regex is by far the slowest component of the library. Switched code to use the Java Regex libraries to improve performance and reduce memory usage. 24587: Merged V3.4 to V3.3 24564: Fix for ALF-3727: Custom permissions aren't visible in Explorer UI 24604: Merged V3.4 to V3.3 24602: Build fix for RM permission model loading - collateral damage for R 24564 24774: Merged BRANCHES/V3.4 to BRANCHES/V3.3: 23492: Fixed ALF-5550: DB2: Unable to insert values into alf_string_value 24813: Merged BRANCHES/V3.4 to BRANCHES/V3.3: 24750: Limit installer builds to 2 threads 24874: Merged V3.4 to V3.4-BUG-FIX 24667: Resolve ALF-6202 - MT: fix offline edit (Share) 24672: Fixes from Gloria for: ALF-6339 and ALF-6337 24673: Merge V3.3 to V3.4 24668 : Upgrade of large repository to latest 3.3 fails on excession of mysql table lock size 24674: Fixes ALF-6294: Remove illegal CLI option 24675: Fix ALF-6099: CLONE - IE6: Sometimes errors occur on almost actions in Office Add-ins. Removed linebreaks from JSON response template & prevented "undefined" entries in URL. 24680: ALF-6120 : Version notes are lost for versioned items migrated from 2.2 to 3.4.0 24681: Merged BRANCHES/DEV/BELARUS/V3.4-2010_12_14 to BRANCHES/V3.4: 24609: MT - ALF-3563 24640: MT - ALF-3563 (merged w/ minor improvement) 24685: Fixes ALF-6403: Change installer window height on Linux 24688: Fix ALF-6029 (part II) - MT: cannot "Show Folders" for "Data Dictionary" in Afresco Share - part II adds patch and removes workaround 24689: Fixes: ALF-6219 - Incorrectly formatted variable in translation 24691: MT: ALF-3263 - Explorer login now fails with consistent error message ("Unable to login - unknown username/password.") if tenant does not exist or is disabled 24692: Fixes: ALF-6370 and ALF-6225 among others - sweep of FR and DE resource bundles for quote escaping. 24694: Fixes ALF-6424. Erased erroneous equals sign 24695: Fixes: ALF-6320 - removed the country specific portion of the language pack suffixes for French, German and Spanish. This enables speakers of those languages outside of those countries to benefit from the language packs. 24696: Fix for ALF-6299: XSS attack on editing blog post with XSS data in IE6&IE7 24700: Swaps _it_IT for _it to make Italian language pack available to Italian speakers outside of Italy. 24703: Avoid DB2 query failure if someone passes in a made-up UUID - Test RunningActionRestApiTest was making up a long node UUID - DB2 fails to set the parameter with SQLSTATE=22001 24706: Merged V3.4-BUG-FIX to V3.4 24705: Fix for ALF-6365, ALF-6335 24708: Fix ALF-6386: View Details and Edit Metadata icons are incorrect for folder 24709: Missing first/last name handling. 24711: Merged V3.3 to V3.4 24710: ALF-5535 - Fix to correctly format json number values (not as numeric human readable strings) 24713: Fix ALF-5404: It is now possible to configure who receives notifications of "Contact Us" requests by setting a configuration property on the WQS website node, such as "feedbackAssignee.Contact Request=brian" Also added missing Spring MVC source to 3rd Party. 24715: Fix for ALF-6412. OOoDirect always tries to connect to port 8100. Formerly the ooo.port property did not exist for the OOoDirect connector. It was added in r.23182 for the soffice process, but not for the connector bean. Now added for the connector too. 24721: Fix for ALF-6351 - Simple search breaks if override config is used and does not contain new 'repository-search' element 24728: Fixes: ALF-5685 - Incorrect encoding of Japanese Characters 24732: Fixes ALF-6381 and others - calendar strings appearing incorrectly. Problem was an unicode encoded comma preventing the property string being broken up into different days of the weeks or months. 24739: Fix ALF-6545: DB2: SQLCODE=-302, SQLSTATE=22001 (testCreateMultiLingualCategoryRoots) - Shortened Japanese name to 14 characters 24740: Fixes: ALF-6413 (with some translations still pending). 24742: Update readmes. 24744: Merged HEAD to BRANCHES/V3.4: 24137: Fixes: ALF-5642, ALF-3892, ALF-5043 & Brings Add Event dialog in line with other forms in share by disabling the popup validation error box. 24746: Build/test fix: PostgreSQL -AssetServiceImplTest.renameFolder 24755: Merged V3.3 to V3.4 (RECORD ONLY) 21789: ALF-4333: Fix - Updated RepoPrimaryManifestProcessorImpl so it can handle deletions that are reported by either pre-delete noderef or archived noderef (previously only handled the latter). - Updated TransferManifestNodeFactory so that it handles the case where the status of the node to transfer is "deleted". - Updated UnitTestTransferManifestNodeFactory so that it handles the change to TransferManifestNodeFactory above. - Added new tests for deletion cases. 23259: Merged HEAD to V3.3 23256: Fix ALF-4573: Start Workflow action is absent for edited document and working copy in Share 23346: Brought WebQS module in (including build process but not installer elements yet) 23371: "Simply" added wcmqs to installer 23391: ALF-5367: Copy dlls into tomcat/bin as appropriate. 23485: Merged V3.4 to V3.3 (fix backported for V3.3.x lines) 23472: Fixed ALF-5408: SQL Server missing ON DELETE CASCADE declarations 23515: Merged PATCHES/V3.2.0 to V3.3 23514: ALF-5554: Merged HEAD to V3.2.0 23153: When updating tag scopes following system shutdown/restore, be smarter about quickly skipping tag scopes that another (new) thread is currently working on 23283: More debugging level logging for tagging updates, to help identify the problem with periodic multi-threaded test failures on bamboo 23535: Merged V3.4 to V3.3 (complements 23517: ALF-5552) 23508: Fixed ALF-5559: Permission interceptors can fail if Lucene returns invalid NodeRefs 23564: ALF-5600: Merged V3.4 to V3.3 23424: Fixes: ALF-2989 - Incorrect sideId reference in URL for event in Site Calendar Dashlet Adds support for displaying events that start in the past but finish in the future (previously only events that start in the future were shown) 23586: MERGED V3.4 to V3.3 22864: Fix for ALF-5005: "Create and edit functions on AWE become "confused"" 23042: Fix ALF-5127: Impossible to create an article/blog (WCMQS) [Must clear panel hideEvent handler if manually hiding a YUI panel] 23561: Fixes: ALF-4569 - Removes universal override of input width box and switches the editor form panel to adjust it's width based on content rather than window size. Fixes: ALF-4570 - Adds an override for the CSS 'top' property of the form dialogue to ensure it's always below the ribbon. (Was being set automatically by the YUI widget.panel call) 23569: Fixes: ALF-5606 - Ribbon wasn't resizing correctly after the form events. 23630: Backport of installer 23631: Added 64-bit & deployment installers 23664: Fixes ALF-5691: TransferService: Multi-byte characters are not encoded correctly 23681: Fixes ALF-5699: TransferService: Snapshot file from source repo never contains complete MLText properties 23695: Fixed bug exposed after fixing ALF-5699. Parsing of MLText properties out of the transfer snapshot file was incorrect, and that was causing multi-lingual property values to be duplicated 23709: ALF-5699: Fix NPE in ManifestIntegrationTest 23734: Merged V3.4 to V3.3 23731: Fixes for ALF-3098 and ALF-3097 - Share - Security check on Personal Dashboard - only the owning user can view a user dashboard page - Share - Security issue on Customize Site Dashboard - private and moderated site dashboard pages no longer visible to non-members, customise site and dashboard pages only accessible to SiteManager 23747: ALF-5696: Merged V3.4 to V3.3 23585: Fixed ALF-5372 "JavaScript error on Groups management dialog with IE8 : document.getElementById is null" 23790: Fixed ALF-3823 "Share: RSS feed can't be read: http://cds-srv.sun.com:8700/rss/update/public/sunalert_update.xml - ok with other RSS client." 23883: Fixes ALF-5759: WQS: Attempt to copy a website section fails 23907: Merged DEV/BELARUS/V3.3-BUG-FIX-2010_09_20 to V33 - 22750: ALF-4846: Update rules are firing on inbound actions 23931: Undid rev 23907 (Reverse-merged /alfresco/BRANCHES/DEV/BELARUS/V3.3-BUG-FIX-2010_09_20:r22750) 23961: Fixed ALF-5686 "Incorrect behaviour of "All" filter in "My Tasks" dashlet" - Variables assigned in a <#macro> shall always be assigned using <#local> (using <#assign> makes them globally available which might cause naming collisions) 24132: Disable intermittent failing unit test 24148: ALF-6007: Merged HEAD to V3.3 23049: Fixed ALF-5099: Error when trying to go back in Create Web Content Wizard (only with certain XSDs) 24263: Merged from V3.3-BUG-FIX to V3.3 24264: Merged V3.3-BUG-FIX to V3.3 24262: Stress test code for ALF-5025: Support background processing of archiving 24287: Added missing import 24336: Merged V3.4 to V3.3 23205: Fix for ALF-2111 - Download URLS are different on different pages, authentication fails when URL sent 24353: Merged V3.4 to V3.3 24352: Fix SQL fallout from ALF-6078 24510: Merged V3.4 to V3.3 21960: First round of date refactoring: Document Library pages now expect XML dates (ISO8601) from Share data webscripts 21961: Share client-side I18N utility now emulates sever-side handling of doubled-up single quotes. 24526: Merged V3.4 to V3.3 24402: Fix for performance degredation related to ALF-3823. RSS feed processing in JavaScript relies on Rhino impl of regex - this is extreemly slow as Rhino regex is by far the slowest component of the library. Switched code to use the Java Regex libraries to improve performance and reduce memory usage. 24587: Merged V3.4 to V3.3 24564: Fix for ALF-3727: Custom permissions aren't visible in Explorer UI 24604: Merged V3.4 to V3.3 24602: Build fix for RM permission model loading - collateral damage for R 24564 24775: Merged BRANCHES/V3.3 to BRANCHES/V3.4: (RECORD-ONLY) - already in V3.4 24774: (RECORD-ONLY) Merged BRANCHES/V3.4 to BRANCHES/V3.3: 23492: Fixed ALF-5550: DB2: Unable to insert values into alf_string_value 24788: Add evaluation use message for OSX installer 24790: Removed svn:mergeinfo on root 24791: Fixed ALF-6560: MIME type not detected (set to application/octet-stream) when content written via FileFolderService - First access of content on a new file (FileFolderService.getWriter) guesses a mimetype - The initial mimetype guess *was* done during create, but that was expensive. - Added unit test to cover regression 24803: Merged BRANCHES/DEV/dwebster/ to BRANCHES/V3.4: 24773: DE bug fixes received from translators 10th Jan. 24776: ES files received from translators 10th Jan 24793: FR files received from translators 10th Jan 24792: IT files received from translators 10th Jan 24804: Temporarily removing Japanese language bundle 24856: Merged BRANCHES/DEV/dwebster/ to BRANCHES/V3.4: 24848: Latest Language updates from Translators 24863: ALF-6029 (MT Share - repo' view after upg) 24880: Merged V3.3 to V3.4-BUG-FIX 24463: Fixed ALF-4398 "Path to rule set is not displayed" ($html alias was missing from a merge) 24465: Merge V3.3 to V3.4 (RECORD ONLY) 24463: Fixed ALF-4398 "Path to rule set is not displayed" ($html alias was missing from a merge) 24493: Fix for Mac OS X CIFS logon problem, change UID to start at one as zero has special meaning, plus other minor fixes. JLAN-112. 24569: Fix for ALF-5333: Webdav - Online editing of files in a folder with German umlauts does not report correct characters 24611: Fix broken build due to merge #fail (r24460 / ALF-4015) 24668: ALF-4557 - Upgrade of large repository to latest 3.3 fails on excession of mysql table lock size 24707: Fix for handling of null first/last name in wiki page list 24710: ALF-5535 - Fix to correctly format json number values (not as numeric human readable strings) 24794: Fix for ALF-4984 - Outdated custom-slingshot-application-context.xml.sample file for share 24798: Fix for ALF-5806: Lucene query does not return expected result. - Alfresco FTS now supports the prefixes ~ and = for phrase queries 24814: Build fix after r24798: Fix for ALF-5806: Lucene query does not return expected result. 24823: Synchronization improvements to RemoteClient and http proxy hosts 24825: Fixed #3 of ALF-6308 "Share data issues" - Share falls back to use "html uploader" (in all browsers except IE) when "JSESSIONID" cookie is unreachable from javascript (like when "HttpOnly cookies" is activated on the server. 24835: Fixed ALF-5484: Check-in does not update association - Copy code when copying over an existing target node was NOT processing associations - Fallout from refactor and subsequent fixes related to ALF-958 (Target associations aren't copied) - Some commented-out unit tests reintroduced 24842: Fix for ALF-6308 item #4 - validate the redirect URL to ensure it is a relative url 24845: Merged DEV/DAVEW/SAP to V3.3 23874: ALF-5822: Correct Lucene throttling mechanism to prevent build up of excessive committed deltas - Also correct BatchProcessor's mechanism for single-threading batches with cross dependencies - Single-threaded batches must be sequenced in order 23876: ALF-5822: Default lucene.indexer.mergerTargetOverlaysBlockingFactor to 2 for better write performance under load 24022: ALF-5822: Refinement of fix - Don't block a thread that has already entered the prepare phase with another indexer (e.g. a cross-store commit). Otherwise it could block indefinitely and never enter the commit phase - Also added extra debug diagnostics and handle all Throwables on failure 24023: ALF-5822: Minor correction to debug log message 24421: ALF-6134: Do not export org.hibernate.jmx.StatisticsService through JMX to avoid excessive blocking under load 24422: ALF-6135: Remove lock contention from concurrent Lucene searches - Added a RW Lock and Thread local-based solution to org.apache.lucene.store.FSDirectory.FSIndexInput.readInternal() to avoid contention during multiple parallel Lucene searches. This is already recognized as a bottleneck by the Lucene developers, who offer NIOFSDirectory as an alternative, which unfortunately doesn't work on Windows. - Added RW lock to org.apache.lucene.index.TermInfosReader.ensureIndexIsRead() - Threads no longer hanging in lucene searches during load tests. Woohoo! 24423: ALF-6136: Don't call through to org.apache.log4j.NDC unless debug is enabled as it's heavily synchronized. Also avoid dynamic method invocation by using a delegate. 24426: ALF-6138 (SURF - PARTIAL): 'Warm' the java.beans.Introspector cache for key Freemarker accessible bean classes on loading in static initializers 24428: ALF-6139 (SURF - PARTIAL): First log in to Share is expensive due to 'lazy' dashboard creation and excessive synchronization - Added AVMRemoteStore.createDocuments() for creating multiple XML documents at once, all embedded within the same master XML document in the request body - Added corresponding saveDocuments() methods to Store, RemoteStore, Model, ModelObjectManager and ModelObjectPersister on the Surf side - Used this in PresetsManager - Removed excessive synchronization from StoreModelObjectPersister 24429: ALF-6140 (SURF - PARTIAL): Surf tweaks to allow concurrent execution of web scripts - Use StrongCacheStorage instead of MruCacheStorage in RepositoryTemplateProcessor to avoid use of a synchronized cache - Tweak cache sizes in FreeMarkerProcessor - Use thread local object wrapper delegates in QNameAwareObjectWrapper and PresentationTemplateProcessor to work around synchronization in DefaultObjectWrapper - Swap in the same object wrapper to WrappingTemplateModel - Use a concurrent HashMap in ModelObjectCache and ModelHelper and remove excessive synchronization - Use RW locks rather than synchronized blocks in AbstractWebScript 24431: ALF-6141: Improvements to IBatis DAO performance under load - Use lazyLoadingEnabled="false", enhancementEnabled="false" to avoid unnecessary blocking and generation of CGI proxies in IBATIS DAOs - Use useTransactionAwareDataSource="false" to prevent Spring from agressively unwrapping DBCP connections and bypassing the prepared statement cache 24432: ALF-6142: Remove dependency between RepositoryAuthenticationDAO and Lucene - Reworked RepositoryAuthenticationDAO to use a node service lookup by child association QName - This required adding a patch to 'upgrade' the qnames of existing authentication nodes, which previously all had the same QName 24433: ALF-6143: Remove net.sf.ehcache.use.classic.lru setting from EhCacheManagerFactoryBean and InternalEhCacheManagerFactoryBean to prevent serialization of accesses to shared caches by multiple executing threads 24434: ALF-6144: DirtySessionMethodInterceptor was causing contention between multiple threads calling the same DAO. - Unfortunately method.getAnnotation() is a synchronized call, and thus causes concurrent calls to the same method to contended with each other. - Added a non-blocking cache so that DAOs can be accessed in multiple threads without contending. 24435: ALF-6145: Use RW Locks in Subsystem Framework - The operations relied on by the dynamic proxies wrapping subsystems were synchronized and thus caused contention when multiple threads were calling in to the same subsystem - Replaced synchronized blocks with use of read write locks, thus allowing multiple concurrent readers 24436: ALF-6146: Regulate PermissionModel accesses with RW locks, rather than synchronized blocks and an excessive number of concurrent hashmaps. 24438: ALF-6136: Fix build classpath 24439: ALF-6142: Fixed seeding of admin user password 24444: ALF-6142: Fix unit test fallout - InviteServiceTest needs a transaction - RepositoryAuthenticationDao must listen for Person username changes and update authentication node qname accordingly - Correction to MT handling in RepositoryAuthenticationDao - Repository Authentication Component must 'normalize' the username before passing it through the DAO 24445: ALF-6145: Correction to lock handling when propagating destroy() events 24446: ALF-6142: Add new dependencies to unit test 24448: ALF-6142: Further fix ups 24461: ALF-6142: Fix unit test 24664: ALF-6408: Prevent possible deadlock during reindexing - waitForHeadOfQueue() now only called in beforeCommit() phase rather than afterCommit() to prevent deadlocking with Lucene throttler - indexes are also flushed beforehand in beforeCommit() so that indexing work can still be parallelized - also prevent potential deadlock caused by clearing of IndexInfo.thisThreadPreparing in a nested transaction 24810: ALF-6653: Use read write lock in Hibernate ReadWriteCache to avoid needless contention on L2 cache reads 24817: ALF-4725: Avoid excessive lock contention in dbcp by upgrading to 1.4 - also upgraded commons pool 24818: ALF-6658: Remove synchronization from LockService - transaction local collections used anyway 24844: ALF-6681: Don't let the PostLookup job stack up in multiple threads - Now only executes in one thread at a time and skips scheduled slots where it is already running 24864: Fix for ALF-5904: Explorer - Space model rights not duplicated when creating a space based on a template - copy service no longer uses hasPermission - added tests for permission copy scenarios with assorted rights - this fix assumed there is nothing special about templates - ie that they should always carry permissions and is the "default" copy behaviour to copy permissions if possible 24865: ALF-6145: Fix failing unit test 24878: ALF-6146: Correction to write lock around requiredPermissionsCache 24881: Increment version revision git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@26792 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2011-04-11 15:57:26 +00:00
Dave Ward	a5f31cd37e	Merged V3.3 to HEAD ... 20167: Merged HEAD to BRANCHES/V3.3: (RECORD ONLY) 20166: Fix ALF-2765: Renditions created via 3.3 RenditionService are not exposed via OpenCMIS rendition API 20232: Fix problem opening AVM web project folders via FTP. ALF-2738. 20234: ALF-2352: Cannot create folders in Share doclib without admin user in authentication chain 20235: Fix for unable to create folders in web project via CIFS. ALF-2736. 20258: Reverse-merged rev 20254: 'When dropping the mysql database ...' 20262: Merged V3.3-BUG-FIX to V3.3 20251: Fix for ALF-2804 - Unable to browse into folders in Share Site in certain situations. - Browser history filter object in incorrect state after page refresh. 20264: Updated Oracle build support (to fix grants) 20282: Merged PATCHES/V3.2.0 to V3.3 20266: Test reproduction of ALF-2839 failure: Node pre-loading generates needless resultset rows 20280: Fixed ALF-2839: Node pre-loading generates needless resultset rows 20283: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3: 20194: AVMTestSuite - scale down unit tests (slightly) 20247: AVMServiceTest.testVersionByDate - build (add delay) 20290: Fixed ALF-2851 "Drag n Drop issues in IE6 & IE7" - Reordering rules-list with drag and drop didn't work at all because each rule was created using a template that had the "id"-attribute set, which made IE confused after using HTMLELement.clone() even though the id was resetted - Both customise-dashlets & rules-list got an error when "throwing" away the dashlet or rule instead of releasing it "carefully", reason was becuuase IE didnt capture the x:y-position which made the animation fail. Now no animation is done if x:y isn't found. 20296: Merged PATCHES/V3.1.0 to V3.3 (RECORD ONLY) 20249: Merged V3.1 to PATCHES/V3.1.0 14565: Updated version to include revision number (x.y.z) 20246: Merged V3.1 to PATCHES/V3.1.0 13841: Build fix 20245: Merged V3.1 to PATCHES/V3.1.0 16185: AbstractLuceneIndexerAndSearcherFactory.getTransactionId() must return null when there is no transaction 20241: Merged V3.1 to PATCHES/V3.1.0 14187: Fix for ETHREEOH-2023: LDAP import must lower case the local name of the association to person. 16167: ETHREEOH-2475: Fixed nested transaction handling in AbstractLuceneIndexerAndSearcherFactory to allow duplicate user processing in PersonServiceImpl to actually work 16168: ETHREEOH-2797: Force patch.db-V2.2-Person to apply one more time to fix up corrupt users created by LDAP Import - Problem due to ETHREEOH-2023, fixed in 3.1.1 - Also corrects ldap.synchronisation.defaultHomeFolderProvider to be userHomesHomeFolderProvider - Also requires fix to ETHREEOH-2475 to fix up duplicate users 20221:Merged PATCHES/V3.1.2 to PATCHES/V3.1.0 20217: Merged PATCHES/V3.2.0 to PATCHES/V3.1.2 19793: Merged HEAD to V3.2.0 19786: Refactor of previous test fix. I have pushed down the OOo-specific parts of the change from AbstractContentTransformerTest to OpenOfficeContentTransformerTest leaving an extension point in the base class should other transformations need to be excluded in the future. 19785: Fix for failing test OpenOfficeContentTransformerTest.testAllConversions. Various OOo-related transformations are returned as available but fail on our test server with OOo on it. Pending further work on these failings, I am disabling those transformations in test code whilst leaving them available in the product code. This is because in the wild a different OOo version may succeed with these transformations. I had previously explicitly disabled 3 transformations in the product and I am moving that restriction from product to test code for the same reason. 19707: Return value from isTransformationBlocked was inverted. Fixed now. 19705: Refinement of previous check-in re OOo transformations. I have pulled up the code that handles blocked transformations into a superclass so that the JodConverter-based transformer worker can inherit the same list of blocked transformations. To reiterate, blocked transformations are those that the OOo integration code believes should work but which are broken in practice. These are blocked by the transformers and will always be unavailable regardless of the OOo connection state. 19702: Fix for HEAD builds running on panda build server. OOo was recently installed on panda which has activated various OOo-related transformations/extractions in the test code. It appears that OOo does not support some transformations from Office 97 to Office 2007. Specifically doc to docx and xls to xlsx. These transformations have now been marked as unavailable. 20220: Created hotfix branch off TAGS/ENTERPRISE/V3.1.0 20297: Merged PATCHES/V3.1.2 to V3.3 (RECORD ONLY) 20268: Increment version number 20267: ALF-550: Merged V3.2 to PATCHES/V3.1.2 17768: Merged DEV/BELARUS/V3.2-2009_11_24 to V3.2 17758: ETHREEOH-3757: Oracle upgrade issue: failed "inviteEmailTemplate" patch - also causes subsequent patches to not be applied 20217: Merged PATCHES/V3.2.0 to PATCHES/V3.1.2 19793: Merged HEAD to V3.2.0 19786: Refactor of previous test fix. I have pushed down the OOo-specific parts of the change from AbstractContentTransformerTest to OpenOfficeContentTransformerTest leaving an extension point in the base class should other transformations need to be excluded in the future. 19785: Fix for failing test OpenOfficeContentTransformerTest.testAllConversions. Various OOo-related transformations are returned as available but fail on our test server with OOo on it. Pending further work on these failings, I am disabling those transformations in test code whilst leaving them available in the product code. This is because in the wild a different OOo version may succeed with these transformations. I had previously explicitly disabled 3 transformations in the product and I am moving that restriction from product to test code for the same reason. 19707: Return value from isTransformationBlocked was inverted. Fixed now. 19705: Refinement of previous check-in re OOo transformations. I have pulled up the code that handles blocked transformations into a superclass so that the JodConverter-based transformer worker can inherit the same list of blocked transformations. To reiterate, blocked transformations are those that the OOo integration code believes should work but which are broken in practice. These are blocked by the transformers and will always be unavailable regardless of the OOo connection state. 19702: Fix for HEAD builds running on panda build server. OOo was recently installed on panda which has activated various OOo-related transformations/extractions in the test code. It appears that OOo does not support some transformations from Office 97 to Office 2007. Specifically doc to docx and xls to xlsx. These transformations have now been marked as unavailable. 20204: Moved version label to '.6' 20298: Merged PATCHES/V3.2.0 to V3.3 (RECORD ONLY) 20281: Incremented version number to '10' 20272: Backports to help fix ALF-2839: Node pre-loading generates needless resultset rows Merged BRANCHES/V3.2 to PATCHES/V3.2.0: 18490: Added cache for alf_content_data Merged BRANCHES/DEV/V3.3-BUG-FIX to PATCHES/V3.2.0: 20231: Fixed ALF-2784: Degradation of performance between 3.1.1 and 3.2x (observed in JSF) 20299: Merged PATCHES/V3.2.1 to V3.3 (RECORD ONLY) 20279: Incremented version label 20211: Reinstated patch 'patch.convertContentUrls' (reversed rev 20205 ALF-2719) 20210: Incremented version label to '.3' 20206: Bumped version label to '.2' 20205: Workaround for ALF-2719 by disabling patch.convertContentUrls and ContentStoreCleaner 20149: Incremented version label 20101: Created hotfix branch off ENTERPRISE/V3.2.1 20300: Merged BRANCHES/DEV/BELARUS/HEAD-2010_04_28 to BRANCHES/V3.3: 20293: ALF-767: remove-AVM-issuer.sql upgrade does not account for column (mis-)order - fixed for MySQL, PostgreSQL and Oracle (DB2 & MS SQL Server already OK) 20301: Merged PATCHES/V3.2.1 to V3.3 20278: ALF-206: Make it possible to follow hyperlinks to document JSF client URLs from MS Office - A request parameter rather than a (potentially forgotten) session attribute is used to propagate the URL to redirect to after successful login 20303: Fixed ALF-2855: FixAuthorityCrcValuesPatch reports NPE during upgrade from 2.1.7 to 3.3E - Auto-unbox NPE on Long->long: Just used the Long directly for reporting 20319: Fixed ALF-2854: User Usage Queries use read-write methods on QNameDAO 20322: Fixed ALF-1998: contentStoreCleanerJob leads to foreign key exception - Possible concurrent modification of alf_content_url.orphan_time led to false orphan detection - Fixed queries to check for dereferencing AND use the indexed orphan_time column - More robust use of EagerContentStoreCleaner: On eager cleanup, ensure that URLs are deleted - Added optimistic lock checks on updates and deletes of alf_content_url 20335: Merged DEV/V3.3-BUG-FIX to V3.3 20334: ALF-2473: Changes for clean startup and shutdown of subsystems on Spring 3 - Removed previous SafeEventPublisher workaround for startup errors and associated changes - Replaced with SafeApplicationEventMulticaster which queues up events while an application context isn't started - Now all subsystems shut down cleanly - Fixes problem with FileContentStore visibility in JMX too! 20341: ALF-2517 Quick fix which means rules which compare the creation/modification date of content should now correctly be applied when content is uploaded to a folder. 20346: ALF-2839: Node pre-loading generates needless resultset rows - Added missing Criteria.list() call 20347: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3: 20231: Fixed ALF-2784: Degradation of performance between 3.1.1 and 3.2x (observed in JSF) 20356: Merged DEV/BELARUS/HEAD-2010_03_30 to V3.3 (with corrections) 19735: ALF-686: Alfresco cannot start if read/write mode in Sysadmin subsystem is configured 1. org.alfresco.repo.module.ModuleComponentHelper was modified to allow “System” user run write operations in read-only system. 2. Startup of “Synchronization” subsystem failed with the same error as was occurred in issue during modules start. org.alfresco.repo.security.sync.ChainingUserRegistrySynchronizer was also modified to allow “System” user run write operations in read-only mode. 20361: Merged HEAD to BRANCHES/V3.3: (RECORD ONLY) 20345: Fix ALF-2319: CMIS 'current' version mapping is not compliant with spec 20354: Update test to reflect changes to CMIS version mapping. 20363: Merge from V3.2 to V3.2 (all record-only) c. 19448 OOoJodConverter worker bean correctly handles isAvailable() when subsystem is disabled. c. 19484 JodConverter-backed thumbnailing test now explicitly sets OOoDirect and OOoJodconverter enabled-ness back to default settings in tearDown c. 20175 Fix for ALF-2773 JMX configuration of enterprise logging broken 20376: Altered URL of online help to point at http://www.alfresco.com/help/33/enterprise/webeditor/ 20395: set google docs off 20398: Fixed ALF-2890: Upgrade removes content if transaction retries are triggered - Setting ContentData that was derived outside of the current transaction opened up a window for the post-rollback code to delete the underlying binary. The binaries are only registered for writers fetched via the ContentService now; the low-level DAO no longer does management because it can't assume that a new content URL indicates a new underlying binary. - The contentUrlConverter was creating new URLs and thus the low-level DAO cleaned up live content when retrying collisions took place. The cleanup is no longer on the stack for the patch. - Removes the ALF-558 changes around ContentData.reference() 20399: Remove googledocs aspect option 20400: PurgeTestP (AVM) - increase wait cycles 20422: Added ooo converter properties 20425: Merge V3.3-BUG-FIX to V3.3 20392 : ALF-2716 - imap mail metadata extraction fails when alfresco server locale is non English 20365 : Merge DEV to V3.3-BUG_FIX 18011 : ETHREEOH-3804 - IMAP message body doesn't appears in IMAP folder when message subject is equal to the attachment name 20332 : Build fix - rework to the ImapServiceUnit tests. 20325 : build fix 20318 : MERGE DEV TO V3.3-BUG-FIX 20287 : ALF-2754: Alfresco IMAP and Zimbra Desktop Client. 20317 : ALF-2716 - imap mail metadata extraction fails when alfresco server locale is non English This change reworks the received date metadata extraction. 20316 : ALF-1912 : Problem with IMAP Sites visibility Now only IMAP favouries are shown. Also major rework to the way that this service uses the FileFolderService. 20315 : ALF-1912 Updates to the FileFolderService to support the Imap Service - add listDeepFolders - remove "makeFolders" which moves to its own Utility class. - update to JavaDoc 20429: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3: 20171: 3.3SP1 bug fix branch 20174: Fix for ALF-960 and ALFCOM-1980: WCM - File Picker Restriction relative to folder not web project 20179: ALF-2629 Now when a workflow timer signals a transition it also ends the associated task. 20433: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3: 20184: ALF-2772: Added new test case to RepoTransferReceiverImplTest and fixed the fault in the primary manifest processor. 20196: Temporary fix to SandboxServiceImplTest, which reverses the fix to ALF-2529. 20434: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3: (RECORD ONLY) 20213: (RECORD ONLY) Merge from V3.3 to V3.3-BUG-FIX r20176 Merge from V3.2 to V3.3. r20175. JMX configuration of enterprise logging broken (fix). 20215: (RECORD ONLY) Merge from V3.3 to V3.3-BUG-FIX r20178 JodConverter loggers are now exposed in JMX. 20218: (RECORD ONLY) Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.3-BUG-FIX: 20195: Form fields for numbers are now rendered much smaller that ... 20248: (RECORD ONLY) Merging HEAD into V3.3 20284: (RECORD ONLY) Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.3-BUG-FIX: 20177: Add 'MaxPermSize' setting for DOD JUnit tests 20305: (RECORD ONLY) Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.3-BUG-FIX: 20236: Add Oracle support for creating/dropping "databases" (users) in continuous.xml 20264: Updated Oracle build support (to fix grants) 20435: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3: 20233: Part fix for ALF-2811: DOD5015 module breaks CMIS tck 20239: Final part of fix for ALF-2811: DOD5015 module breaks CMIS tck 20250: Merge from DEV/BELARUS/HEAD-2010_04_28 to V3.3-BUG-FIX 20230 ALF-2450: latin/utf-8 HTML file cannot be text-extracted. 20253: ALF-2629 Now tasks should correctly be ended when an associated timer is triggered. Should no longer cause WCM workflows to fail. 20254: ALF-2579 Changed teh status code on incorrect password to '401' to reflect that it is an authorisation error. 20263: Fix for ALF-2500: query with a ! in contains search make it strange 20265: Fix for ALF-1495. Reindexing of OOo-transformed content after OOo crash. 20436: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3: 20292: (RECORD ONLY) Latest SpringSurf libs: 20308: (RECORD ONLY) Latest SpringSurf libs: 20366: (RECORD ONLY) Latest SpringSurf libs: 20415: Latest SpringSurf libs: 20437: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3: 20270: Build times: SearchTestSuite 20273: Fix for ALF-2125 - Accessing a deleted page in Share does not return an error page, instead the document-details page breaks 20274: Fix for ALF-2518: It's impossible to find user by user name in Add User or Group window at Manage permissions page (also allows users to be found by username in the Share Admin Console). 20277: Fix for ALF-2417: Create Web Content Wizard if cancelling/aborting Step Two - Author Web Content, any asset being uploaded gets locked 20291: Reduce build time: Added security test suite to cover 17 security tests 20439: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3: 20302: Fixed ALF-727: Oracle iBatis fails on PropertyValueDAOTest Double.MAX_VALUE 20307: VersionStore - minor fixes if running deprecated V1 20310: Fixed a bug in UIContentSelector which was building lucene search queries incorrectly. 20314: Fix for ALF-2789 - DispatcherServlet not correctly retrieving Object ID from request parameters 20320: Merged DEV/TEMPORARY to V3.3-BUG-FIX 20313: ALF-2507: Not able to email space users even if the user owns the space 20324: Fixed ALF-2078 "Content doesn't make checked in after applying 'Check-in' rule in Share" 20327: Fix Quickr project to compile in Eclipse 20367: ALF-2829: Avoid reading entire result set into memory in FixNameCrcValuesPatch 20368: Work-around for ALF-2366: patch.updateDmPermissions takes too long to complete 20369: Part 1 of fix for ALF-2943: Update incorrect mimetypes (Excel and Powerpoint) 20370: Version Migrator (ALF-1000) - use common batch processor to enable multiple workers 20373: Version Migrator (ALF-1000) - resolve runtime conflict (w/ r20334) 20378: Merged BRANCHES/DEV/BELARUS/HEAD-2010_04_28 to BRANCHES/DEV/V3.3-BUG-FIX: 20312: ALF-2162: Error processing WCM form: XFormsBindingException: property 'constraint' already present at model item 20381: Fixed ALF-2943: Update incorrect mimetypes (Excel and Powerpoint) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20571 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2010-06-09 14:01:07 +00:00