2 Commits

Author	SHA1	Message	Date
Dave Ward	6275a2c5e2	Merged V4.1-BUG-FIX to HEAD ... 40605: ALF-15273: Merged PATCHES/V4.0.1 to V4.1-BUG-FIX 40132: ALF-15376: Activiti schema updates fail when hibernate.default_schema is set with ORA-00942. - Corrected schema case to uppercase when database is Oracle. 40235: ALF-15367: Reverse merged the following revisions because the fix is deemed not robust enough. 40132: ALF-15376: Activiti schema updates fail when hibernate.default_schema is set with ORA-00942. - Corrected schema case to uppercase when database is Oracle. 40041: ALF-15376: Merged V4.1-BUG-FIX to PATCHES/V4.0.1 39969: Merged DEV/BELARUS-V4.1-BUG-FIX-2012_07_09 to V4.1-BUG-FIX: ALF-15273 : Activiti schema updates fail when hibernate.default_schema is set with ORA-00942. The Activiti database is now correctly initialized with the correct "hibernate.default_schema" 40470: ALF-15376: how to debug the creation of Activiti tables (ACT_) when upgrading to 4.X - added more logging to Activiti schema creation 40471: ALF-15376: Activiti schema updates fail when hibernate.default_schema is set with ORA-00942 - Ignore hibernate.default_schema and determine default schema from the Connection DatabaseMetaData - Provided the Activiti schema initializer with the default schema information - Provided countAppliedPatches() with default schema information 40501: ALF-15376: Improved webapp logging.properties to use a console handler so that it doesn't suppress absolutely everything and we can selectively turn on logging! 40608: Fix for ALF-4274 - JSF - Paste action does not work when browse.jsp is overrided 40611: GERMAN: Translation updates based on EN r40604 40612: SPANISH: Translation updates based on EN r40604 40613: FRENCH: Translation updates based on EN r40604 40614: ITALIAN: Translation updates based on EN r40604 40615: JAPANESE: Translation updates based on EN r40604 40616: DUTCH: Translation updates based on EN r40604 40617: CHINESE: Translation updates based on EN r40604 40629: ALF-15321: upgrade Activiti to fix logging 40632: Fix for ALF-15487 Search not working for queries containing 3-digit versions Fix for ALF-15356 SOLR doesn't support searching by cm:name of file with underscore and dots 40655: Fix for ALF-14752 - Collapse Links part at the WCM details page lead to error. 40662: Eclipse classpath fixes 40663: Merged DEV to V4.1-BUG-FIX 40661: ALF-15318 (part 2): It's possible to log in by disabled user (NTLM with SSO in a clustered env) The onValidateFailed() methods were moved to BaseSSOAuthenticationFilter to response with a 401 for a disabled user. 40665: ALF-15448: Merged V3.4-BUG-FIX (3.4.11) to V4.1-BUG-FIX (4.1.1) 40664: ALF-15578 CLONE 3.4.11: LibreOffice 3.6 startup on Mac fails 40685: Merged PATCHES/V4.0.2 to V4.1-BUG-FIX 39274: Merged DEV to V4.0.2 (4.0.2.4) << Unable to merge code as supplied as it introduced a change to a public API, which would break alfresco.log if the RM AMP was installed See RM-452 >> 39166: ALF-15583 / ALF-14584: autoVersionOnUpdateProps=true does not increment the version label after checkout/checkin 'VersionableAspectTest' has been modified in accordance with concept: several modifications of node in a single transaction are interpreted as a single version. Each operation in the test which should provide a new version have been made atomic 39089: ALF-15583 / ALF-14584: autoVersionOnUpdateProps=true does not increment the version label after checkout/checkin Check of lock has been corrected since 'cm:lockable' aspect doesn't indicate lock state: - 'LockService' service has been extended with 'isLocked(NodRef)' method which returns 'true' if document is locked and current user is not an owner of the lock; - new 'VersionableAspectTest' has been added to test the use-case described in the issue and to test whether 'VersionableAspect' changes version label of a locked document 39369: ALF-15583 / ALF-14584 autoVersionOnUpdateProps=true does not increment the version label after checkout/checkin - Test failures: A READ_ONLY lock was being set because we are adding a versionable aspect. This resulted in an Exception when attempting to update the version. Change made to the isLocked method (now called isLockedOrReadOnly) to reflect that a node is locked even for the owner and the lock type is not a WRITE lock. 39939: ALF-15584 / ALF-15001: Gracefully handle stale NodeRefs in query results in DMDiscoveryServicePort - SOLR makes this more likely to occur 40455: ALF-15585 / ALF-15383: Long-running Feed Cleaner - Part 1: Limit problems caused by missing indexes - Remove all count calls - Remove logic requiring calls to SiteService to list all sites - Added in an ID range limit to act as a hard-stop to entry growth (set to 1M) - TODO: use JobLockService 40461: ALF-15585 / ALF-15383: Long running Feed Cleaner - Part 2: Added JobLockService usage to ensure only one instance runs at a time 40463: ALF-15585 / ALF-15383: Long running Feed Cleaner - A bit more trace and debug 40526: ALF-15586: Fixed ALF-15540: CMIS: Synchronized block in service interceptor 40574: ALF-15585 / ALF-15383: Long running Feed Cleaner - Fix MySQL variant of activities-common-SqlMap 40579: ALF-15585: Fix fallout from rev 40455: ALF-15383: Long-running Feed Cleaner - MySQL dialect was duplicating ALL SQL statements - Split 'large' SQL selects into activities-select-SqlMap.xml containing 7 statements that are all overridden for MySQL - Fixed split in common file between different types of statements 40588: ALF-15587 / ALF-15385: Merged V3.4-BUG-FIX to PATCHES/V4.0.2 (Lost revision) 28830: ALF-7622 Refactored JScriptWorkflowTask. Now when setProperties() is called it properly updates the WorkflowTask properties via the WorflowService.updateTask() method. 40687: Merged V3.4-BUG-FIX to V4.1-BUG-FIX 40599: ALF-15567: Merged PATCHES/V3.4.10 to V3.4-BUG-FIX 40511: ALF-12008: Merged DEV to PATCHES/V3.4.10 Due to Windows Explorer's URL concatenation behaviour, we must present links as shortcuts to the real URL, rather than direct hrefs. This is at least consistent with the way the CIFS server handles links. See org.alfresco.filesys.repo.ContentDiskDriver.openFile(). 40518: ALF-12008: Fixed compilation error git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@40691 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2012-08-21 16:31:48 +00:00
Dave Ward	507c4d8bf8	Merged V4.0-BUG-FIX to HEAD ... 37207: BDE-69: Filter more tests for minimal build plan 37253: Fix for ALF-13634 Re-created category won't show up again on a node in Document Library. - also fixes deletion of secondary associations 37265: Merged V4.0 to V4.0-BUG-FIX 37224: ALF-14174: Part 14 for ALF-14237 Upgrades from 4.0.0.x/4..0.1.0 will not fix the timestamps on acl changesets - SOLR will skip ACLs set prior to upgrade - Fix syntax error on Oracle 37250: Fix for ALF-14174 The patch adding timestamps to acl_change_set breaks SOLR tracking - better cross DB fix 37298: ALF-14365 - added hazelcastConfig.xml.sample 37323: ALF-13247: Two nodes with the same primary path. -Fixed by initializing zone before parallel batch processing begins. 37326: ALF-13933 Alfresco needs to be able to support LibreOffice for transformations ALF-13452 Open office startup from Java not working on OSX - Added code to start LibreOffice 3.5 on Mac (requires different options to the command and ure-link is a directory rather than a file on mac) - Removes $DYLD_LIBRARY_PATH from the environment when starting either openoffice or libreoffice on mac so does not need to rely on the installer moving the soffice.bin process to .soffice.bin and then creating a soffice.bin shell script that removed $DYLD_LIBRARY_PATH - Indent TransformerDebug a bit more now we have fail over transformers at the top and lower levels (saves N.N.N.N.N.N getting mixed up with text) 37340: Merged V3.4-BUG-FIX (3.4.10) to V4.0-BUG-FIX (4.0.3) RECORD ONLY 37339: ALF-13452: Merged V4.0-BUG-FIX (4.0.3) to V3.4-BUG-FIX (3.4.10) 37326: ALF-13933 Alfresco needs to be able to support LibreOffice for transformations ALF-13452 Open office startup from Java not working on OSX - Added code to start LibreOffice 3.5 on Mac (requires different options to the command and ure-link is a directory rather than a file on mac) - Removes $DYLD_LIBRARY_PATH from the environment when starting either openoffice or libreoffice on mac so does not need to rely on the installer moving the soffice.bin process to .soffice.bin and then creating a soffice.bin shell script that removed $DYLD_LIBRARY_PATH - Indent TransformerDebug a bit more now we have fail over transformers at the top and lower levels (saves N.N.N.N.N.N getting mixed up with text) 36273: ALF-13933 Alfresco needs to be able to support LibreOffice for transformations - Return a dummy OpenOffice command even when there is no OpenOffice/LibreOffice installed or on the path. 36264: ALF-13933 Alfresco needs to be able to support LibreOffice for transformations - remove old jodconverter-core-3.0-beta-3.diff 36259: ALF-13933 Alfresco needs to be able to support LibreOffice for transformations << Developed on Windows 7. Might need more work on Linux to get LibreOffice to shut down, but should be okay with OpenOffice 3.2 which was used in the previous release. >> - Updated jodconverter to latest version jodconverter-core-3.0-SNAPSHOT-patched.jar 28/4/2012 which is newer than 3.0 beta-4 - Applied patch for http://code.google.com/p/jodconverter/issues/detail?id=103 to handle setting the env for LibreOffice 3.5 - Modified code to use partial GNU style options (not used for -env!) when using LibreOffice - Added OpenOfficeCommandLine to dynamically supply OpenOffice or LibreOffice command line args for OOoDirect - Tested to work with OpenOffice 3.4 and 3.2 on Windows 7 37353: Merged V3.4-BUG-FIX (3.4.10) to V4.0-BUG-FIX (4.0.3) 37352: ALF-13452, ALF-13933 Alfresco needs to be able to support LibreOffice for transformations - Build test failure 37359: New JUnit Rule to support automatic creation and cleanup of Share sites in test code. This is required for an imminent fix to ALF-14345, but I'm checking it in separately in order to merge this general utility. 37360: Fix for ALF-14345. Site Service list method does not recognise sub-types of st:site. 37364: Merged V3.4-BUG-FIX (3.4.10) to V4.0-BUG-FIX (4.0.3) RECORD ONLY (not needed in 4.0.x) 37363: ALF-13452, ALF-13933 Alfresco needs to be able to support LibreOffice for transformations - Build test failure x2 (reference to jodconverter*jar not needed in 4.0.x) 37370: Merged V3.4-BUG-FIX: ALF-11714: Updated WCMQS to ensure all FreeMarker variables output to HTML are protected with ?html to prevent XSS 37382: Translation (DE, IT, JA, NL) updates from Gloria, based on EN rev37081 37384: Fix for ALF-14219 SolrQueryHTTPClient unable to handle long queries (4096 bytes) 37386: Merged V4.0 to V4.0-BUG-FIX 37385: ALF-14238: Fix by Dmitry to correct iteration in ImapUnsubscribedAspectPatch git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@37387 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2012-06-02 07:56:08 +00:00